re PR c++/57471 (Bizarre error for template parameter pack)

	PR c++/57471
	* parser.c (cp_parser_sizeof_pack): Clear parser scopes.

From-SVN: r200852

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 88ba7696732de4b0f1cb624c8fe8381c37894371..1bc0b6f88c64fc1da0fc96eab0ce6b4e9d2680e0 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2013-07-09  Jason Merrill  <jason@redhat.com>
 
+       PR c++/57471
+       * parser.c (cp_parser_sizeof_pack): Clear parser scopes.
+
        PR c++/57658
        * semantics.c (finish_id_expression): Return the id for an
        unevaluated outer variable.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 614cf4364b805e20e014424a6a69ba0792ca1c48..4b683bfbace3456f208380996d64591d6d12e939 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -23136,6 +23136,10 @@ cp_parser_sizeof_pack (cp_parser *parser)
 
   cp_token *token = cp_lexer_peek_token (parser->lexer);
   tree name = cp_parser_identifier (parser);
+  /* The name is not qualified.  */
+  parser->scope = NULL_TREE;
+  parser->qualifying_scope = NULL_TREE;
+  parser->object_scope = NULL_TREE;
   tree expr = cp_parser_lookup_name_simple (parser, name, token->location);
   if (expr == error_mark_node)
     cp_parser_name_lookup_error (parser, name, expr, NLE_NULL,

diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-sizeof2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-sizeof2.C
new file mode 100644 (file)
index 0000000..dfc245d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic-sizeof2.C
@@ -0,0 +1,14 @@
+// PR c++/57471
+// { dg-require-effective-target c++11 }
+
+struct A
+{
+  static constexpr bool value = true;
+};
+
+template<typename... Types>
+struct B
+{
+  static_assert(A::value, "");
+  static_assert(sizeof...(Types) == 0, "");
+};