re PR c++/57673 (pack sizeof ... groups ellipsis with preceding expression)

/cp
2013-07-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57673
	* parser.c (cp_parser_cache_defarg): In an NSDMI don't stop when
	token->type == CPP_ELLIPSIS.

/testsuite
2013-07-30  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/57673
	* g++.dg/cpp0x/nsdmi-sizeof.C: New.

From-SVN: r201354

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b0c9dcd6448bf8beb1e00d2bdeecd8984cc079a5..cc2cc541c676df601b6c5f8ce7b96cf9b6339126 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/57673
+       * parser.c (cp_parser_cache_defarg): In an NSDMI don't stop when
+       token->type == CPP_ELLIPSIS.
+
 2013-07-30  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/57947

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 56a017fdb7ef5f8ea8023705ee5db542529d4441..7f4ad1c7dbaf64a5f01a16eaa9d384b877fde1e4 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -24145,7 +24145,9 @@ cp_parser_cache_defarg (cp_parser *parser, bool nsdmi)
        case CPP_SEMICOLON:
        case CPP_CLOSE_BRACE:
        case CPP_CLOSE_SQUARE:
-         if (depth == 0)
+         if (depth == 0
+             /* Handle correctly int n = sizeof ... ( p );  */
+             && !(nsdmi && token->type == CPP_ELLIPSIS))
            done = true;
          /* Update DEPTH, if necessary.  */
          else if (token->type == CPP_CLOSE_PAREN

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 22e1a1fd7f4538eb30b791a399ab83f69ed03455..905518d168d92da7b9c9b678a6350ed3ad7d8af9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-30  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/57673
+       * g++.dg/cpp0x/nsdmi-sizeof.C: New.
+
 2013-07-30  Steve Ellcey  <sellcey@mips.com>
 
        * gcc.target/mips/code-readable-1.c: Increase switch size.

diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-sizeof.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-sizeof.C
new file mode 100644 (file)
index 0000000..fac979b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-sizeof.C
@@ -0,0 +1,7 @@
+// PR c++/57673
+// { dg-do compile { target c++11 } }
+
+template< int ... p >
+struct d {
+  int n = sizeof ... ( p );
+};