diff options
| author | Jason Merrill <jason@redhat.com> | 2013-04-01 17:18:05 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2013-04-01 17:18:05 -0400 |
| commit | 570e2ca01e8a80aadd18eb0b85c982077e76aef4 (patch) | |
| tree | 95fd9ea2d5dcbf958c70ddc714c2b883948216a3 | |
| parent | 123d7a94342b49153722fe385b60dfd54a216aaa (diff) | |
| download | gcc-570e2ca01e8a80aadd18eb0b85c982077e76aef4.zip gcc-570e2ca01e8a80aadd18eb0b85c982077e76aef4.tar.gz gcc-570e2ca01e8a80aadd18eb0b85c982077e76aef4.tar.bz2 | |
re PR c++/56794 (C++11 Error in range-based for with parameter pack array)
PR c++/56794
* parser.c (cp_parser_range_for): Don't try to do auto deduction
in a template if the type of the range is incomplete.
From-SVN: r197324
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/range-for24.C | 15 |
3 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ac22dc2..c7e140e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2013-04-01 Jason Merrill <jason@redhat.com> + PR c++/56794 + * parser.c (cp_parser_range_for): Don't try to do auto deduction + in a template if the type of the range is incomplete. + * call.c (add_function_candidate): Take the address of 'this' here. (build_over_call): And here. (build_new_method_call_1, build_op_call_1): Not here. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index f29e80d..05c03f4 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -9615,7 +9615,10 @@ cp_parser_range_for (cp_parser *parser, tree scope, tree init, tree range_decl) range_expr = error_mark_node; stmt = begin_range_for_stmt (scope, init); finish_range_for_decl (stmt, range_decl, range_expr); - if (!type_dependent_expression_p (range_expr) + if (range_expr != error_mark_node + && !type_dependent_expression_p (range_expr) + /* The length of an array might be dependent. */ + && COMPLETE_TYPE_P (TREE_TYPE (range_expr)) /* do_auto_deduction doesn't mess with template init-lists. */ && !BRACE_ENCLOSED_INITIALIZER_P (range_expr)) do_range_for_auto_deduction (range_decl, range_expr); diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for24.C b/gcc/testsuite/g++.dg/cpp0x/range-for24.C new file mode 100644 index 0000000..b4a5b18 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/range-for24.C @@ -0,0 +1,15 @@ +// PR c++/56794 +// { dg-require-effective-target c++11 } + +template<int... values> +static void Colors() +{ + static const int colors[] = { values... }; + + for(auto c: colors) { } +} + +int main() +{ + Colors<0,1,2> (); +} |