diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-07-30 22:38:52 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-07-30 22:38:52 +0000 |
| commit | e77da14a5383b3ed50a9313545b709cf52261cca (patch) | |
| tree | 164b3d0643a8c28043947032d5a8bff6f04a7f48 /gcc | |
| parent | df4f7bb8db9cb08afaa2afc2aea122adb92efb8d (diff) | |
| download | gcc-e77da14a5383b3ed50a9313545b709cf52261cca.zip gcc-e77da14a5383b3ed50a9313545b709cf52261cca.tar.gz gcc-e77da14a5383b3ed50a9313545b709cf52261cca.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nsdmi-sizeof.C | 7 |
4 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b0c9dcd..cc2cc54 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 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 * call.c (is_std_init_list): Return false if cxx_dialect == cxx98. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 56a017f..7f4ad1c 100644 --- 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 22e1a1f..905518d 100644 --- 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 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 ); +}; |