re PR c++/39639 (no diagnostic for ill-formed pack expansion)

2009-04-22  Dodji Seketeli  <dodji@redhat.com>

    gcc/cp/ChangeLog:
    	PR c++/39639
    	* parser.c (cp_parser_template_argument_list): Display an error
    	when an ellipsis is not preceded by a parameter pack. Also, warn
    	about variadic templates usage without -std=c++0x.

    gcc/testsuite/ChangeLog:
    	PR c++/39639
    	* g++.dg/cpp0x/pr39639.C: New test.

From-SVN: r146610

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b560aa871f0feaf61e3ea6fd336bc1059bc5ec14..9f0db7b1e4300e363258803a1d870a35a08cbc6c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-22  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/39639
+       * parser.c (cp_parser_template_argument_list): Display an error
+       when an ellipsis is not preceded by a parameter pack. Also, warn
+       about variadic templates usage without -std=c++0x.
+
 2009-04-21  Taras Glek <tglek@mozilla.com>
 
        * cp-tree.h: Update GTY annotations to new syntax.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 806d6f9645aa35ecc87548c2cb63a0a443c2b9e5..d98cfddd60f67af2cdf6f9f068a5e4c9e2ca249d 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -10470,6 +10470,12 @@ cp_parser_template_argument_list (cp_parser* parser)
          argument pack. */
       if (cp_lexer_next_token_is (parser->lexer, CPP_ELLIPSIS))
         {
+         if (argument == error_mark_node)
+           {
+             cp_token *token = cp_lexer_peek_token (parser->lexer);
+             error ("%Hexpected parameter pack before %<...%>",
+                    &token->location);
+           }
           /* Consume the `...' token. */
           cp_lexer_consume_token (parser->lexer);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 758cedb04ba2efa027ab86737da58ffe2008c3f8..e5c70106164fc03df2b7a29bc369731f101a700d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-22  Dodji Seketeli  <dodji@redhat.com>
+
+       PR c++/39639
+       * g++.dg/cpp0x/pr39639.C: New test.
+
 2009-04-22  Mark Heffernan  <meheff@google.com>
 
        * gcc.dg/profile-generate-3.c: New test.

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr39639.C b/gcc/testsuite/g++.dg/cpp0x/pr39639.C
new file mode 100644 (file)
index 0000000..abd3bcf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr39639.C
@@ -0,0 +1,20 @@
+// Contributed by Dodji Seketeli <dodji@redhat.com>
+// Origin: PR c++/39639
+// { dg-options "-std=c++0x" }
+// { dg-do "compile" }
+
+template <class... Types>
+struct S
+  : S<...Types>, // { dg-error "expected parameter pack before '...'" }
+    S<...Types...>, // { dg-error "expected parameter pack before '...'" }
+    S<...> // { dg-error "expected parameter pack before '...'" }
+{
+  static int f () { return 1;}
+};
+
+int
+main ()
+{
+  return S<void>::f ();
+}
+