diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-06 20:20:52 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-12-06 20:20:52 +0000 |
| commit | dbea931d0cb3388d2d8f516bf27e41151615fbfb (patch) | |
| tree | 73fc3e327b7d09892b08340e6b25d1b5fa51f3d7 /gcc/cp | |
| parent | dbf27f01fa7e35c9c9e12ecbccbf306f2b82c681 (diff) | |
| download | gcc-dbea931d0cb3388d2d8f516bf27e41151615fbfb.tar.gz | |
PR c++/54913
* semantics.c (finish_qualified_id_expr): convert_from_reference
after building a SCOPE_REF.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194266 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d228fe2b2e9..28f8c674d76 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 24832673386..491d97c581a 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; |