From ed3d0b14125f1ff9f29d6cb14f6734ceeed6f622 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 28 May 2005 01:38:11 +0000 Subject: [PATCH] c-decl.c (add_stmt): Add C frontend specific version. ./: * c-decl.c (add_stmt): Add C frontend specific version. (stmts_are_full_exprs_p): Remove. * c-common.h (STMT_IS_FULL_EXPR_P): Remove. (stmts_are_full_exprs_p): Don't declare. * c-semantics.c (add_stmt): Remove. cp/: * semantics.c (add_stmt): Add C++ frontend specific version. * cp-tree.h (STMT_IS_FULL_EXPR_P): Define. (stmts_are_full_exprs_p): Declare. From-SVN: r100289 --- gcc/ChangeLog | 8 ++++++++ gcc/c-common.h | 8 -------- gcc/c-decl.c | 35 +++++++++++++++++++++++++---------- gcc/c-semantics.c | 27 --------------------------- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/cp-tree.h | 7 +++++++ gcc/cp/semantics.c | 26 ++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 45 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 586f7626fb5d..5530706a50b0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2005-05-27 Ian Lance Taylor + + * c-decl.c (add_stmt): Add C frontend specific version. + (stmts_are_full_exprs_p): Remove. + * c-common.h (STMT_IS_FULL_EXPR_P): Remove. + (stmts_are_full_exprs_p): Don't declare. + * c-semantics.c (add_stmt): Remove. + 2005-05-27 Kaveh R. Ghazi * config/mips/mips-protos.h (mips_declare_object): Add printf diff --git a/gcc/c-common.h b/gcc/c-common.h index 4b860e2adeda..04b434616b22 100644 --- a/gcc/c-common.h +++ b/gcc/c-common.h @@ -31,7 +31,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA IDENTIFIER_MARKED (used by search routines). DECL_PRETTY_FUNCTION_P (in VAR_DECL) 1: C_DECLARED_LABEL_FLAG (in LABEL_DECL) - STMT_IS_FULL_EXPR_P (in _STMT) STATEMENT_LIST_STMT_EXPR (in STATEMENT_LIST) 2: unused 3: STATEMENT_LIST_HAS_LABEL (in STATEMENT_LIST) @@ -704,12 +703,6 @@ extern void finish_file (void); /* These macros provide convenient access to the various _STMT nodes. */ -/* Nonzero if this statement should be considered a full-expression, - i.e., if temporaries created during this statement should have - their destructors run at the end of this statement. (In C, this - will always be false, since there are no destructors.) */ -#define STMT_IS_FULL_EXPR_P(NODE) TREE_LANG_FLAG_1 ((NODE)) - /* Nonzero if a given STATEMENT_LIST represents the outermost binding if a statement expression. */ #define STATEMENT_LIST_STMT_EXPR(NODE) \ @@ -735,7 +728,6 @@ enum c_tree_code { #undef DEFTREECODE -extern int stmts_are_full_exprs_p (void); extern int anon_aggr_type_p (tree); /* For a VAR_DECL that is an anonymous union, these are the various diff --git a/gcc/c-decl.c b/gcc/c-decl.c index d5e13abca878..d36ceb563d2a 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -418,6 +418,31 @@ static tree grokdeclarator (const struct c_declarator *, static tree grokparms (struct c_arg_info *, bool); static void layout_array_type (tree); +/* T is a statement. Add it to the statement-tree. This is the + C/ObjC version--C++ has a slightly different version of this + function. */ + +tree +add_stmt (tree t) +{ + enum tree_code code = TREE_CODE (t); + + if (EXPR_P (t) && code != LABEL_EXPR) + { + if (!EXPR_HAS_LOCATION (t)) + SET_EXPR_LOCATION (t, input_location); + } + + if (code == LABEL_EXPR || code == CASE_LABEL_EXPR) + STATEMENT_LIST_HAS_LABEL (cur_stmt_list) = 1; + + /* Add T to the statement-tree. Non-side-effect statements need to be + recorded during statement expressions. */ + append_to_statement_list_force (t, &cur_stmt_list); + + return t; +} + /* States indicating how grokdeclarator() should handle declspecs marked with __attribute__((deprecated)). An object declared as __attribute__((deprecated)) suppresses warnings of uses of other @@ -6717,16 +6742,6 @@ c_dup_lang_specific_decl (tree decl) functions are not called from anywhere in the C front end, but as these changes continue, that will change. */ -/* Returns nonzero if the current statement is a full expression, - i.e. temporaries created during that statement should be destroyed - at the end of the statement. */ - -int -stmts_are_full_exprs_p (void) -{ - return 0; -} - /* Returns the stmt_tree (if any) to which statements are currently being added. If there is no active statement-tree, NULL is returned. */ diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c index f7757c6ff82b..d2f9650a957a 100644 --- a/gcc/c-semantics.c +++ b/gcc/c-semantics.c @@ -101,33 +101,6 @@ pop_stmt_list (tree t) return t; } -/* T is a statement. Add it to the statement-tree. */ - -tree -add_stmt (tree t) -{ - enum tree_code code = TREE_CODE (t); - - if (EXPR_P (t) && code != LABEL_EXPR) - { - if (!EXPR_HAS_LOCATION (t)) - SET_EXPR_LOCATION (t, input_location); - - /* When we expand a statement-tree, we must know whether or not the - statements are full-expressions. We record that fact here. */ - STMT_IS_FULL_EXPR_P (t) = stmts_are_full_exprs_p (); - } - - if (code == LABEL_EXPR || code == CASE_LABEL_EXPR) - STATEMENT_LIST_HAS_LABEL (cur_stmt_list) = 1; - - /* Add T to the statement-tree. Non-side-effect statements need to be - recorded during statement expressions. */ - append_to_statement_list_force (t, &cur_stmt_list); - - return t; -} - /* Build a generic statement based on the given type of node and arguments. Similar to `build_nt', except that we set EXPR_LOCATION to be the current source location. */ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 29bd60037f50..2a9b21681226 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2005-05-27 Ian Lance Taylor + + * semantics.c (add_stmt): Add C++ frontend specific version. + * cp-tree.h (STMT_IS_FULL_EXPR_P): Define. + (stmts_are_full_exprs_p): Declare. + 2005-05-27 Roger Sayle Giovanni Bajo diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index fc0e20ce37c1..f4f5a12c79bb 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -59,6 +59,7 @@ struct diagnostic_context; ICS_ELLIPSIS_FLAG (in _CONV) DECL_INITIALIZED_P (in VAR_DECL) TYPENAME_IS_CLASS_P (in TYPENAME_TYPE) + STMT_IS_FULL_EXPR_P (in _STMT) 2: IDENTIFIER_OPNAME_P (in IDENTIFIER_NODE) ICS_THIS_FLAG (in _CONV) DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (in VAR_DECL) @@ -259,6 +260,11 @@ typedef struct ptrmem_cst * ptrmem_cst_t; #define STATEMENT_LIST_TRY_BLOCK(NODE) \ TREE_LANG_FLAG_2 (STATEMENT_LIST_CHECK (NODE)) +/* Nonzero if this statement should be considered a full-expression, + i.e., if temporaries created during this statement should have + their destructors run at the end of this statement. */ +#define STMT_IS_FULL_EXPR_P(NODE) TREE_LANG_FLAG_1 ((NODE)) + /* Marks the result of a statement expression. */ #define EXPR_STMT_STMT_EXPR_RESULT(NODE) \ TREE_LANG_FLAG_0 (EXPR_STMT_CHECK (NODE)) @@ -4063,6 +4069,7 @@ extern tree get_deferred_access_checks (void); extern void pop_to_parent_deferring_access_checks (void); extern void perform_deferred_access_checks (void); extern void perform_or_defer_access_check (tree, tree); +extern int stmts_are_full_exprs_p (void); extern void init_cp_semantics (void); extern tree do_poplevel (tree); extern void add_decl_expr (tree); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 1316ef348888..d969a2463791 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -340,6 +340,32 @@ stmts_are_full_exprs_p (void) return current_stmt_tree ()->stmts_are_full_exprs_p; } +/* T is a statement. Add it to the statement-tree. This is the C++ + version. The C/ObjC frontends have a slightly different version of + this function. */ + +tree +add_stmt (tree t) +{ + enum tree_code code = TREE_CODE (t); + + if (EXPR_P (t) && code != LABEL_EXPR) + { + if (!EXPR_HAS_LOCATION (t)) + SET_EXPR_LOCATION (t, input_location); + + /* When we expand a statement-tree, we must know whether or not the + statements are full-expressions. We record that fact here. */ + STMT_IS_FULL_EXPR_P (t) = stmts_are_full_exprs_p (); + } + + /* Add T to the statement-tree. Non-side-effect statements need to be + recorded during statement expressions. */ + append_to_statement_list_force (t, &cur_stmt_list); + + return t; +} + /* Returns the stmt_tree (if any) to which statements are currently being added. If there is no active statement-tree, NULL is returned. */