diff options
| author | Nathan Froyd <froydnj@codesourcery.com> | 2011-05-27 17:43:44 +0000 |
|---|---|---|
| committer | Nathan Froyd <froydnj@gcc.gnu.org> | 2011-05-27 17:43:44 +0000 |
| commit | 38e01f9ec96801f325e382746ba2d424adea5eee (patch) | |
| tree | 308837cc489c3a37ca81ae52d342d7b9bd43b7c7 /gcc/cp/init.c | |
| parent | e330aa5b3568877fb26267fa0f277de320821b14 (diff) | |
| download | gcc-38e01f9ec96801f325e382746ba2d424adea5eee.zip gcc-38e01f9ec96801f325e382746ba2d424adea5eee.tar.gz gcc-38e01f9ec96801f325e382746ba2d424adea5eee.tar.bz2 | |
move TS_STATEMENT_LIST to be a substructure of TS_TYPED
move TS_STATEMENT_LIST to be a substructure of TS_TYPED
gcc/
* c-decl.c (c_push_function_context): Copy the current statement
list stack.
(add_stmt): Check building_stmt_list_p and push_stmt if necessary.
(finish_struct): Call building_stmt_list_p instead of checking
cur_stmt_list.
* c-parser.c (c_parser_postfix_expression): Likewise.
* c-typeck.c (c_end_compound_stmt): Likewise.
* print-tree.c (print_node) [STATEMENT_LIST]: Don't print TREE_CHAIN.
* tree-iterator.c (stmt_list_cache): Change to a VEC.
(alloc_stmt_list): Adjust for stmt_list_cache's new type.
(free_stmt_list): Likewise.
* tree.h (struct tree_statement_list): Include typed_tree instead
of tree_common.
* tree.c (initialize_tree_contains_struct): Mark TS_STATEMENT_LIST
as TS_TYPED instead of TS_COMMON.
gcc/c-family/
* c-common.h (struct stmt_tree_s) [x_cur_stmt_list]: Change to a VEC.
(stmt_list_stack): Define.
(cur_stmt_list): Adjust for new type of x_cur_stmt_list.
* c-semantics.c (push_stmt_list, pop_stmt_list): Likewise.
gcc/cp/
* cp-tree.h (building_stmt_tree): Delete.
* decl.c (save_function_data): Tweak initializer for x_cur_stmt_list.
(build_aggr_init_full_exprs): Call building_stmt_list_p
instead of building_stmt_tree.
(initialize_local_var): Likewise.
(finish_function): Likewise.
* decl2.c (finish_anon_union): Likewise.
* init.c (begin_init_stmts): Likewise.
(finish_init_stmts): Likewise.
(expand_aggr_init_1): Likewise.
* name-lookup.c (do_local_using_decl): Likewise.
(do_namespace_alias): Likewise.
(do_using_directive): Likewise.
(cp_emit_debug_info_for_using): Likewise.
* semantics.c (add_stmt): Assert that stmt_list_stack is non-empty.
From-SVN: r174343
Diffstat (limited to 'gcc/cp/init.c')
| -rw-r--r-- | gcc/cp/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 6336dd7..d92dacc 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -61,7 +61,7 @@ static int diagnose_uninitialized_cst_or_ref_member_1 (tree, tree, bool, bool); static bool begin_init_stmts (tree *stmt_expr_p, tree *compound_stmt_p) { - bool is_global = !building_stmt_tree (); + bool is_global = !building_stmt_list_p (); *stmt_expr_p = begin_stmt_expr (); *compound_stmt_p = begin_compound_stmt (BCS_NO_SCOPE); @@ -79,7 +79,7 @@ finish_init_stmts (bool is_global, tree stmt_expr, tree compound_stmt) stmt_expr = finish_stmt_expr (stmt_expr, true); - gcc_assert (!building_stmt_tree () == is_global); + gcc_assert (!building_stmt_list_p () == is_global); return stmt_expr; } @@ -1552,7 +1552,7 @@ expand_aggr_init_1 (tree binfo, tree true_exp, tree exp, tree init, int flags, tree type = TREE_TYPE (exp); gcc_assert (init != error_mark_node && type != error_mark_node); - gcc_assert (building_stmt_tree ()); + gcc_assert (building_stmt_list_p ()); /* Use a function returning the desired type to initialize EXP for us. If the function is a constructor, and its first argument is |