diff options
author | Richard Henderson <rth@redhat.com> | 2004-06-24 23:12:30 +0000 |
---|---|---|
committer | Richard Henderson <rth@redhat.com> | 2004-06-24 23:12:30 +0000 |
commit | d6327f19ce577288ceb531b4424ed5657f7ac48d (patch) | |
tree | 1fab0ddb0ef43b779ede7dfbfbd2254c84c942e4 /gcc/c-semantics.c | |
parent | 47d8f3f3ba8fd987c17f581dd2e68ce2a76a1038 (diff) |
* c-decl.c (c_in_iteration_stmt, c_in_case_stmt): Remove.
(c_break_label, c_cont_label): New.
(start_function): Update initializations.
(c_push_function_context): Update saves.
(c_pop_function_context): Update restores.
* c-parse.in: Update expected conflicts.
(stmt_count, compstmt_count): Remove. Remove all updates.
(if_prefix, simple_if, do_stmt_start): Remove.
(lineno_labeled_stmt): Remove.
(lineno_labels): New.
(c99_block_lineno_labeled_stmt): Use it.
(lineno_stmt, lineno_label): Don't clear EXPR_LOCUS before calling
annotate_with_locus.
(select_or_iter_stmt): Replace by ...
(condition, if_statement_1, if_statement_2, if_statement,
start_break, start_continue, while_statement, do_statement,
for_cond_expr, for_incr_expr, for_statement, switch_statement): New.
(stmt): Split out ...
(stmt_nocomp): ... this. Use c_finish_bc_stmt, c_finish_goto_label,
c_finish_goto_ptr.
* c-semantics.c (add_stmt): Don't add line numbers to labels.
* c-tree.h: Update prototypes.
(struct language_function): Remove x_in_iteration_stmt, x_in_case_stmt;
add x_break_label, x_cont_label, x_switch_stack.
(c_switch_stack): Declare.
* c-typeck.c (c_finish_goto_label, c_finish_goto_ptr): New.
(c_finish_return): Return the statement.
(c_switch_stack): Rename from switch_stack; export.
(if_elt, if_stack, if_stack_space, if_stack_pointer): Remove.
(c_begin_if_stmt, c_finish_if_cond, c_finish_then, c_begin_else,
c_finish_else): Remove.
(c_finish_if_stmt): Rewrite to perform the entire operation.
(c_begin_while_stmt, c_finish_while_stmt_cond, c_finish_while_stmt,
c_begin_for_stmt, c_finish_for_stmt_init, c_finish_for_stmt_cond,
c_finish_for_stmt_incr, c_finish_for_stmt): Remove.
(c_finish_loop): New.
(c_finish_bc_stmt): New.
(c_finish_expr_stmt): Return the statement. Split out...
(c_process_expr_stmt): ... this. Don't add locus to error marks.
* gimplify.c (gimplify_cond_expr): Accept NULL type statements.
* tree-gimple.c (is_gimple_stmt): Likewise.
* tree-pretty-print.c (dump_generic_node <COND_EXPR>): Likewise.
(print_struct_decl): Delete empty compound statement.
* objc/objc-act.c (objc_build_throw_stmt): Return the statement.
* objc/objc-act.h: Update decl.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@83620 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-semantics.c')
-rw-r--r-- | gcc/c-semantics.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c index ee04417ad08..9512947216c 100644 --- a/gcc/c-semantics.c +++ b/gcc/c-semantics.c @@ -128,7 +128,9 @@ pop_stmt_list (tree t) tree add_stmt (tree t) { - if (EXPR_P (t) || STATEMENT_CODE_P (TREE_CODE (t))) + enum tree_code code = TREE_CODE (t); + + if ((EXPR_P (t) || STATEMENT_CODE_P (code)) && code != LABEL_EXPR) { if (!EXPR_LOCUS (t)) annotate_with_locus (t, input_location); |