> There still seem to be problems printing the scope: > > namespace N > { > template <class T> using U = T*; > }; > > void f(N::U<int>) { blah; } > > ------------ > wa.C: In function ‘void N::f(U<int>)’: > wa.C:6:21: error: ‘blah’ was not declared in this scope > > Note how the N:: is attached to the function rather than the parameter > type. I wonder how that happens...
I think it is because start_decl (in cp_parser_alias_declaration) needs to be matched with a call to pop_scoped on the scope it yields. start_decl pushes the scope represented by the context of the DECL that it builds (here the namespace N). If that scope is not popped by the caller of start_decl subsequent DECLs appear as if they are members of that scope as well. Also, while printing the alias specialization, I obviously don't print the context. The patch below addresses these two issues. A bootstrap and testing is currently running on x86_64-unknown-linux-gnu against trunk. > But this patch is close enough; go ahead and check it in as is and > fix this issue afterwards. Thanks. I have committed the patches you have accepted, FWIW. From: Dodji Seketeli <do...@redhat.com> Date: Tue, 8 Nov 2011 02:41:06 +0100 Subject: [PATCH] Fix context handling of alias declaration gcc/cp/ * decl.c (start_decl): Update comment. * error.c (dump_alias_template_specialization): Dump the context of the specialization. * parser.c (cp_parser_alias_declaration): Call pop_scope on the pushed scope yielded by start_decl. gcc/testsuite * g++.dg/cpp0x/alias-decl-11.C: New test. --- gcc/cp/decl.c | 7 +++++-- gcc/cp/error.c | 2 ++ gcc/cp/parser.c | 7 +++++-- gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C | 8 ++++++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e4b91cc..1c33776 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4295,8 +4295,11 @@ groktypename (cp_decl_specifier_seq *type_specifiers, deleted function, but 0 (SD_UNINITIALIZED) if this is a variable implicitly initialized via a default constructor. ATTRIBUTES and PREFIX_ATTRIBUTES are GNU attributes associated with this declaration. - *PUSHED_SCOPE_P is set to the scope entered in this function, if any; if - set, the caller is responsible for calling pop_scope. */ + + The scope represented by the context of the returned DECL is pushed + (if it is not the global namespace) and is assigned to + *PUSHED_SCOPE_P. The caller is then responsible for calling + pop_scope on *PUSHED_SCOPE_P if it is set. */ tree start_decl (const cp_declarator *declarator, diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 841366f..d2b6a62 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -341,6 +341,8 @@ dump_alias_template_specialization (tree t, int flags) gcc_assert (alias_template_specialization_p (t)); + if (!(flags & TFF_UNQUALIFIED_NAME)) + dump_scope (CP_DECL_CONTEXT (TYPE_NAME (t)), flags); name = TYPE_IDENTIFIER (t); pp_cxx_tree_identifier (cxx_pp, name); dump_template_parms (TYPE_TEMPLATE_INFO (t), diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index fa0117e..1f8d5d9 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -14884,7 +14884,7 @@ cp_parser_using_declaration (cp_parser* parser, static tree cp_parser_alias_declaration (cp_parser* parser) { - tree id, type, decl, dummy, attributes; + tree id, type, decl, pushed_scope = NULL_TREE, attributes; location_t id_location; cp_declarator *declarator; cp_decl_specifier_seq decl_specs; @@ -14918,12 +14918,15 @@ cp_parser_alias_declaration (cp_parser* parser) NULL_TREE, attributes); else decl = start_decl (declarator, &decl_specs, 0, - attributes, NULL_TREE, &dummy); + attributes, NULL_TREE, &pushed_scope); if (decl == error_mark_node) return decl; cp_finish_decl (decl, NULL_TREE, 0, NULL_TREE, 0); + if (pushed_scope) + pop_scope (pushed_scope); + /* If decl is a template, return its TEMPLATE_DECL so that it gets added into the symbol table; otherwise, return the TYPE_DECL. */ if (DECL_LANG_SPECIFIC (decl) diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C new file mode 100644 index 0000000..43ef7ba --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-11.C @@ -0,0 +1,8 @@ +// { dg-options "-std=c++0x" } + +namespace N +{ + template <class T> using U = T*; +}; + +void f(N::U<int>) { blah; } // { dg-error "void f(N::U<int>)|not declared" } -- 1.7.6.4 -- Dodji