From 59276295d6017de1e98bd9f359771daf0ca7216a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 9 Nov 2011 17:25:12 -0500 Subject: [PATCH] re PR c++/51046 ([C++0x] ICE by unexpanded template param pack in range-based for) PR c++/51046 * parser.c (cp_parser_range_for): check_for_bare_parameter_packs. From-SVN: r181239 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/parser.c | 2 ++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/variadic119.C | 13 +++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic119.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a545511f79e..8dad5704980 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2011-11-09 Jason Merrill + PR c++/51046 + * parser.c (cp_parser_range_for): check_for_bare_parameter_packs. + PR c++/51029 * class.c (build_base_path): Don't ICE in fold_non_dependent_expr. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 3cb6dbf61a0..fc8f3c82bac 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -9292,6 +9292,8 @@ cp_parser_range_for (cp_parser *parser, tree scope, tree init, tree range_decl) at instantiation. If not, it is done just ahead. */ if (processing_template_decl) { + if (check_for_bare_parameter_packs (range_expr)) + 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) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b92292b1193..5de54110de6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-11-09 Jason Merrill + + PR c++/51046 + * g++.dg/cpp0x/variadic119.C: New. + 2011-11-09 Jakub Jelinek PR target/50911 diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic119.C b/gcc/testsuite/g++.dg/cpp0x/variadic119.C new file mode 100644 index 00000000000..78cd23e2051 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic119.C @@ -0,0 +1,13 @@ +// PR c++/51046 +// { dg-do compile { target c++11 } } + +template +void f() +{ + for (int i : IS); // { dg-error "not expanded" } +} + +int main() +{ + f<0, 1, 2>(); +} -- 2.30.2