diff options
Diffstat (limited to 'gcc/cp/semantics.c')
| -rw-r--r-- | gcc/cp/semantics.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 0ae00e4..dc81568 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -882,21 +882,13 @@ finish_for_expr (tree expr, tree for_stmt) void finish_for_stmt (tree for_stmt) { - bool scoped; - if (TREE_CODE (for_stmt) == RANGE_FOR_STMT) - { - RANGE_FOR_BODY (for_stmt) = do_poplevel (RANGE_FOR_BODY (for_stmt)); - scoped = true; - } + RANGE_FOR_BODY (for_stmt) = do_poplevel (RANGE_FOR_BODY (for_stmt)); else - { - FOR_BODY (for_stmt) = do_poplevel (FOR_BODY (for_stmt)); - scoped = flag_new_for_scope > 0; - } + FOR_BODY (for_stmt) = do_poplevel (FOR_BODY (for_stmt)); /* Pop the scope for the body of the loop. */ - if (scoped) + if (flag_new_for_scope > 0) { tree scope = TREE_CHAIN (for_stmt); TREE_CHAIN (for_stmt) = NULL; @@ -913,10 +905,12 @@ tree begin_range_for_stmt (void) { tree r; + r = build_stmt (input_location, RANGE_FOR_STMT, NULL_TREE, NULL_TREE, NULL_TREE); - /* We can ignore flag_new_for_scope here. */ - TREE_CHAIN (r) = do_pushlevel (sk_for); + + if (flag_new_for_scope > 0) + TREE_CHAIN (r) = do_pushlevel (sk_for); return r; } |