From 545f261bef70b517ea65b5a827444c41b4bba4cd Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Thu, 14 Apr 2011 17:05:58 +0000 Subject: [PATCH] cp-tree.def (IF_STMT): Add an extra operand. * cp-tree.def (IF_STMT): Add an extra operand. * cp-objcp-common.c (cp_common_init_ts): Mark it as TS_TYPED. * cp-tree.h (IF_SCOPE): Define. * semantics.c (begin_if_stmt): Pass scope to build_stmt. (finish_if_stmt): Use IF_SCOPE instead of TREE_CHAIN. From-SVN: r172437 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/cp-objcp-common.c | 2 +- gcc/cp/cp-tree.def | 4 ++-- gcc/cp/cp-tree.h | 1 + gcc/cp/semantics.c | 8 ++++---- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 719b1a1c5a7..6226030f513 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2011-04-14 Nathan Froyd + + * cp-tree.def (IF_STMT): Add an extra operand. + * cp-objcp-common.c (cp_common_init_ts): Mark it as TS_TYPED. + * cp-tree.h (IF_SCOPE): Define. + * semantics.c (begin_if_stmt): Pass scope to build_stmt. + (finish_if_stmt): Use IF_SCOPE instead of TREE_CHAIN. + 2011-04-14 Nathan Froyd * cp-tree.def (FOR_STMT, RANGE_FOR_STMT): Add an extra operand. diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c index 38d341595d9..6aa24053f26 100644 --- a/gcc/cp/cp-objcp-common.c +++ b/gcc/cp/cp-objcp-common.c @@ -238,7 +238,6 @@ cp_common_init_ts (void) MARK_TS_COMMON (TEMPLATE_INFO); MARK_TS_COMMON (TYPENAME_TYPE); MARK_TS_COMMON (TYPEOF_TYPE); - MARK_TS_COMMON (IF_STMT); MARK_TS_COMMON (BASELINK); MARK_TS_COMMON (SWITCH_STMT); MARK_TS_COMMON (TYPE_PACK_EXPANSION); @@ -247,6 +246,7 @@ cp_common_init_ts (void) MARK_TS_COMMON (BOUND_TEMPLATE_TEMPLATE_PARM); MARK_TS_COMMON (UNBOUND_CLASS_TEMPLATE); + MARK_TS_TYPED (IF_STMT); MARK_TS_TYPED (FOR_STMT); MARK_TS_TYPED (RANGE_FOR_STMT); MARK_TS_TYPED (AGGR_INIT_EXPR); diff --git a/gcc/cp/cp-tree.def b/gcc/cp/cp-tree.def index fdfe9b5110e..59f89b8630a 100644 --- a/gcc/cp/cp-tree.def +++ b/gcc/cp/cp-tree.def @@ -284,10 +284,10 @@ DEFTREECODE (MUST_NOT_THROW_EXPR, "must_not_throw_expr", tcc_expression, 1) DEFTREECODE (CLEANUP_STMT, "cleanup_stmt", tcc_statement, 3) /* Represents an 'if' statement. The operands are IF_COND, - THEN_CLAUSE, and ELSE_CLAUSE, respectively. */ + THEN_CLAUSE, and ELSE_CLAUSE, and the current scope, respectively. */ /* ??? It is currently still necessary to distinguish between IF_STMT and COND_EXPR for the benefit of templates. */ -DEFTREECODE (IF_STMT, "if_stmt", tcc_statement, 3) +DEFTREECODE (IF_STMT, "if_stmt", tcc_statement, 4) /* Used to represent a `for' statement. The operands are FOR_INIT_STMT, FOR_COND, FOR_EXPR, and FOR_BODY, respectively. */ diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index aab05b62e2d..076754c2a8e 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3792,6 +3792,7 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter) #define IF_COND(NODE) TREE_OPERAND (IF_STMT_CHECK (NODE), 0) #define THEN_CLAUSE(NODE) TREE_OPERAND (IF_STMT_CHECK (NODE), 1) #define ELSE_CLAUSE(NODE) TREE_OPERAND (IF_STMT_CHECK (NODE), 2) +#define IF_SCOPE(NODE) TREE_OPERAND (IF_STMT_CHECK (NODE), 3) /* WHILE_STMT accessors. These give access to the condition of the while statement and the body of the while statement, respectively. */ diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index b0dcb2b775a..6e717331ad7 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -662,8 +662,8 @@ begin_if_stmt (void) { tree r, scope; scope = do_pushlevel (sk_block); - r = build_stmt (input_location, IF_STMT, NULL_TREE, NULL_TREE, NULL_TREE); - TREE_CHAIN (r) = scope; + r = build_stmt (input_location, IF_STMT, NULL_TREE, + NULL_TREE, NULL_TREE, scope); begin_cond (&IF_COND (r)); return r; } @@ -711,8 +711,8 @@ finish_else_clause (tree if_stmt) void finish_if_stmt (tree if_stmt) { - tree scope = TREE_CHAIN (if_stmt); - TREE_CHAIN (if_stmt) = NULL; + tree scope = IF_SCOPE (if_stmt); + IF_SCOPE (if_stmt) = NULL; add_stmt (do_poplevel (scope)); finish_stmt (); } -- 2.30.2