diff options
| author | Jason Merrill <jason@redhat.com> | 2014-02-21 09:01:29 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-02-21 09:01:29 -0500 |
| commit | 9e01a71f1a4c619244805af0b6bfe0d296c9fe87 (patch) | |
| tree | 435bf39138b711084e8bdef5403629ac546201e2 /gcc | |
| parent | e429bc3555e7c3cbbc3b03ee0dbf78b3b9a4c198 (diff) | |
| download | gcc-9e01a71f1a4c619244805af0b6bfe0d296c9fe87.zip gcc-9e01a71f1a4c619244805af0b6bfe0d296c9fe87.tar.gz gcc-9e01a71f1a4c619244805af0b6bfe0d296c9fe87.tar.bz2 | |
re PR c++/60250 ([c++1y] ICE using lambda for array size)
PR c++/60250
* parser.c (cp_parser_direct_declarator): Don't wrap a
type-dependent expression in a NOP_EXPR.
From-SVN: r207996
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/vla12.C | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e175768..9f04144 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-02-21 Jason Merrill <jason@redhat.com> + PR c++/60250 + * parser.c (cp_parser_direct_declarator): Don't wrap a + type-dependent expression in a NOP_EXPR. + PR c++/60251 * lambda.c (is_normal_capture_proxy): Handle VLA capture. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index e067a02..6f19ae2 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -17233,7 +17233,8 @@ cp_parser_direct_declarator (cp_parser* parser, "array bound is not an integer constant"); bounds = error_mark_node; } - else if (processing_template_decl) + else if (processing_template_decl + && !type_dependent_expression_p (bounds)) { /* Remember this wasn't a constant-expression. */ bounds = build_nop (TREE_TYPE (bounds), bounds); diff --git a/gcc/testsuite/g++.dg/cpp1y/vla12.C b/gcc/testsuite/g++.dg/cpp1y/vla12.C new file mode 100644 index 0000000..df47f26 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/vla12.C @@ -0,0 +1,7 @@ +// PR c++/60250 +// { dg-options "-std=c++1y -pedantic-errors" } + +template<typename> void foo() +{ + typedef int T[ ([](){ return 1; }()) ]; // { dg-error "runtime bound" } +} |