diff options
| author | Richard Henderson <rth@redhat.com> | 2004-06-16 10:59:07 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2004-06-16 10:59:07 -0700 |
| commit | 894ca2c9ff6321673af96c42b1028db992b98943 (patch) | |
| tree | dd5662f9db85cb749d8b6177430ec74783e363cc | |
| parent | e751adc3b1b146663267485a2dcf1ebe239a5c3d (diff) | |
| download | gcc-894ca2c9ff6321673af96c42b1028db992b98943.zip gcc-894ca2c9ff6321673af96c42b1028db992b98943.tar.gz gcc-894ca2c9ff6321673af96c42b1028db992b98943.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/for2.C | 13 |
3 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c8a1a1e..d700297 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-06-16 Richard Henderson <rth@redhat.com> + + 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 <rth@redhat.com> * call.c (initialize_reference): Don't build CLEANUP_STMT here. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index eeb66c5..ef82cb1 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 0000000..d66fea3 --- /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<int> void foo() +{ + for (int i=0 ;;) ; + int i; +} + +void bar() +{ + foo<0>(); +} |