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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181152
138bc75d-0d04-0410-961f-
82ee72b054a4
+2011-11-08 Dodji Seketeli <dodji@redhat.com>
+
+ Fix context handling of alias-declaration
+ * 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.
+
2011-11-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50864
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,
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),
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;
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)
+2011-11-08 Dodji Seketeli <dodji@redhat.com>
+
+ Fix context handling of alias-declaration
+ * g++.dg/cpp0x/alias-decl-11.C: New test.
+
2011-11-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50864
--- /dev/null
+// { 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" }