From 894ca2c9ff6321673af96c42b1028db992b98943 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 16 Jun 2004 10:59:07 -0700 Subject: [PATCH] re PR c++/16012 (trouble with scope in for statements in templates) PR c++/16012 * semantics.c (begin_for_stmt, begin_for_stmt): Do put the init statement in FOR_INIT_STMT for templates. From-SVN: r83253 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/semantics.c | 5 +++++ gcc/testsuite/g++.dg/init/for2.C | 13 +++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/g++.dg/init/for2.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c8a1a1e5e9c..d700297e831 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-06-16 Richard Henderson + + PR c++/16012 + * semantics.c (begin_for_stmt, begin_for_stmt): Do put the init + statement in FOR_INIT_STMT for templates. + 2004-06-15 Richard Henderson * call.c (initialize_reference): Don't build CLEANUP_STMT here. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index eeb66c59559..ef82cb1bcb8 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -652,6 +652,9 @@ begin_for_stmt (void) if (flag_new_for_scope > 0) TREE_CHAIN (r) = do_pushlevel (sk_for); + if (processing_template_decl) + FOR_INIT_STMT (r) = push_stmt_list (); + return r; } @@ -661,6 +664,8 @@ begin_for_stmt (void) void finish_for_init_stmt (tree for_stmt) { + if (processing_template_decl) + FOR_INIT_STMT (for_stmt) = pop_stmt_list (FOR_INIT_STMT (for_stmt)); add_stmt (for_stmt); FOR_BODY (for_stmt) = do_pushlevel (sk_block); FOR_COND (for_stmt) = push_stmt_list (); diff --git a/gcc/testsuite/g++.dg/init/for2.C b/gcc/testsuite/g++.dg/init/for2.C new file mode 100644 index 00000000000..d66fea30ef2 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/for2.C @@ -0,0 +1,13 @@ +// { dg-do compile } +// PR 16012: Got the scope of I incorrect in templates only. + +template void foo() +{ + for (int i=0 ;;) ; + int i; +} + +void bar() +{ + foo<0>(); +} -- 2.30.2