diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/scope3.C | 15 |
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bb800f1..bb4ec8d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2009-10-07 Jason Merrill <jason@redhat.com> + + PR c++/41038 + * tree.c (build_qualified_name): Call convert_from_reference. + 2009-10-06 Jason Merrill <jason@redhat.com> Fix lookup of initialized captures in unevaluated context. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 1cd2bf5..156a09e 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1284,6 +1284,8 @@ build_qualified_name (tree type, tree scope, tree name, bool template_p) return error_mark_node; t = build2 (SCOPE_REF, type, scope, name); QUALIFIED_NAME_IS_TEMPLATE (t) = template_p; + if (type) + t = convert_from_reference (t); return t; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea24c57..a7b7a16 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2009-10-07 Jason Merrill <jason@redhat.com> + + * g++.dg/template/scope3.C: New. + 2009-10-07 Jakub Jelinek <jakub@redhat.com> * gcc.dg/debug/dwarf2/inline3.c: New test. diff --git a/gcc/testsuite/g++.dg/template/scope3.C b/gcc/testsuite/g++.dg/template/scope3.C new file mode 100644 index 0000000..c191c79 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/scope3.C @@ -0,0 +1,15 @@ +// PR c++/41038 + +struct S +{ + int size() const; +}; + +template<typename T> +struct Packer +{ + int foo() { + return Packer::var.size(); + } + const S& var; +}; |