diff options
| author | Jason Merrill <jason@redhat.com> | 2010-03-30 17:19:23 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-03-30 17:19:23 -0400 |
| commit | fb077955541f329953d7f1e4e6c026e62faa30a8 (patch) | |
| tree | 22d722eb9df61b144415c5522e89d9e303d6247a | |
| parent | 5847e8da2f62aa638ca037e2e02ef6f2de2975a0 (diff) | |
| download | gcc-fb077955541f329953d7f1e4e6c026e62faa30a8.zip gcc-fb077955541f329953d7f1e4e6c026e62faa30a8.tar.gz gcc-fb077955541f329953d7f1e4e6c026e62faa30a8.tar.bz2 | |
re PR c++/41185 (size of array ... has non-integral type ...)
PR c++/41185
PR c++/41786
* parser.c (cp_parser_direct_declarator): Don't allow VLAs in
function parameter context. Don't print an error if parsing
tentatively.
From-SVN: r157838
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 10 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/ambig5.C | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/varmod1.C | 2 |
5 files changed, 25 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eb42b0b..2f6ae04 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2010-03-30 Jason Merrill <jason@redhat.com> + PR c++/41185 + PR c++/41786 + * parser.c (cp_parser_direct_declarator): Don't allow VLAs in + function parameter context. Don't print an error if parsing + tentatively. + PR c++/43559 * pt.c (more_specialized_fn): Don't control cv-qualifier check with same_type_p. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 693d6cd..6b119b6 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -14106,11 +14106,13 @@ cp_parser_direct_declarator (cp_parser* parser, bounds = fold_non_dependent_expr (bounds); /* Normally, the array bound must be an integral constant expression. However, as an extension, we allow VLAs - in function scopes. */ - else if (!parser->in_function_body) + in function scopes as long as they aren't part of a + parameter declaration. */ + else if (!parser->in_function_body + || current_binding_level->kind == sk_function_parms) { - error_at (token->location, - "array bound is not an integer constant"); + cp_parser_error (parser, + "array bound is not an integer constant"); bounds = error_mark_node; } else if (processing_template_decl && !error_operand_p (bounds)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a7af1c6..a561219 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-30 Jason Merrill <jason@redhat.com> + + PR c++/41786 + * g++.dg/parse/ambig5.C: New. + 2010-03-30 Jakub Jelinek <jakub@redhat.com> PR debug/43593 diff --git a/gcc/testsuite/g++.dg/parse/ambig5.C b/gcc/testsuite/g++.dg/parse/ambig5.C new file mode 100644 index 0000000..e554d96 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/ambig5.C @@ -0,0 +1,7 @@ +// PR c++/41786 + +struct A { A(int, char const*); }; +int main() { + int i = 0, *b = &i; + A a(int(b[i]), "hello"); +} diff --git a/gcc/testsuite/g++.dg/parse/varmod1.C b/gcc/testsuite/g++.dg/parse/varmod1.C index 8f7b4eb..d64f04b 100644 --- a/gcc/testsuite/g++.dg/parse/varmod1.C +++ b/gcc/testsuite/g++.dg/parse/varmod1.C @@ -2,6 +2,6 @@ int main(int argc, char** argv) { int nx = 2; void theerror(double a[][nx+1]); // { dg-message "" } double** a; - theerror(a); // { dg-error "" } + theerror(a); return 0; } |