commit fde00723eeea410df8f677fe6753c68e7277796d
Author: Jason Merrill <jason@redhat.com>
Date: Thu Dec 6 10:31:52 2012 -0500
PR c++/54913
* semantics.c (finish_qualified_id_expr): convert_from_reference
after building a SCOPE_REF.
@@ -1778,8 +1778,6 @@ finish_qualified_id_expr (tree qualifying_class,
;
else
{
- expr = convert_from_reference (expr);
-
/* In a template, return a SCOPE_REF for most qualified-ids
so that we can check access at instantiation time. But if
we're looking at a member of the current instantiation, we
@@ -1790,6 +1788,8 @@ finish_qualified_id_expr (tree qualifying_class,
expr = build_qualified_name (TREE_TYPE (expr),
qualifying_class, expr,
template_p);
+
+ expr = convert_from_reference (expr);
}
return expr;
new file mode 100644
@@ -0,0 +1,14 @@
+// PR c++/54913
+
+struct E
+{
+ static const int& e;
+};
+
+template<typename>
+struct R
+{
+ R() { E::e; }
+};
+
+R<int> r;