diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/qualified-id6.C | 14 |
3 files changed, 22 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d228fe2..28f8c67 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-12-06 Jason Merrill <jason@redhat.com> + + PR c++/54913 + * semantics.c (finish_qualified_id_expr): convert_from_reference + after building a SCOPE_REF. + 2012-12-06 Jakub Jelinek <jakub@redhat.com> PR c++/54207 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 2483267..491d97c 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -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; diff --git a/gcc/testsuite/g++.dg/template/qualified-id6.C b/gcc/testsuite/g++.dg/template/qualified-id6.C new file mode 100644 index 0000000..83be874 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/qualified-id6.C @@ -0,0 +1,14 @@ +// PR c++/54913 + +struct E +{ + static const int& e; +}; + +template<typename> +struct R +{ + R() { E::e; } +}; + +R<int> r; |