diff options
author | kan <kan@FreeBSD.org> | 2004-07-28 03:11:36 +0000 |
---|---|---|
committer | kan <kan@FreeBSD.org> | 2004-07-28 03:11:36 +0000 |
commit | 5e00ec74d8ce58f99801200d4d3d0412c7cc1b28 (patch) | |
tree | 052f4bb635f2bea2c5e350bd60c902be100a0d1e /contrib/gcc/c-semantics.c | |
parent | 87b8398a7d9f9bf0e28bbcd54a4fc27db2125f38 (diff) | |
download | FreeBSD-src-5e00ec74d8ce58f99801200d4d3d0412c7cc1b28.zip FreeBSD-src-5e00ec74d8ce58f99801200d4d3d0412c7cc1b28.tar.gz |
Gcc 3.4.2 20040728.
Diffstat (limited to 'contrib/gcc/c-semantics.c')
-rw-r--r-- | contrib/gcc/c-semantics.c | 536 |
1 files changed, 357 insertions, 179 deletions
diff --git a/contrib/gcc/c-semantics.c b/contrib/gcc/c-semantics.c index 8559fa1..38c4021 100644 --- a/contrib/gcc/c-semantics.c +++ b/contrib/gcc/c-semantics.c @@ -1,7 +1,7 @@ /* This file contains the definitions and documentation for the common tree codes used in the GNU C and C++ compilers (see c-common.def - for the standard codes). - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + for the standard codes). + Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Written by Benjamin Chelf (chelf@codesourcery.com). This file is part of GCC. @@ -23,12 +23,18 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "function.h" #include "splay-tree.h" #include "varray.h" #include "c-common.h" #include "except.h" +/* In order for the format checking to accept the C frontend + diagnostic framework extensions, you must define this token before + including toplev.h. */ +#define GCC_DIAG_STYLE __gcc_cdiag__ #include "toplev.h" #include "flags.h" #include "ggc.h" @@ -37,23 +43,29 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "output.h" #include "timevar.h" #include "predict.h" +#include "tree-inline.h" /* If non-NULL, the address of a language-specific function for expanding statements. */ -void (*lang_expand_stmt) PARAMS ((tree)); +void (*lang_expand_stmt) (tree); /* If non-NULL, the address of a language-specific function for expanding a DECL_STMT. After the language-independent cases are handled, this function will be called. If this function is not defined, it is assumed that declarations other than those for variables and labels do not require any RTL generation. */ -void (*lang_expand_decl_stmt) PARAMS ((tree)); +void (*lang_expand_decl_stmt) (tree); + +static tree find_reachable_label_1 (tree *, int *, void *); +static tree find_reachable_label (tree); +static bool expand_unreachable_if_stmt (tree); +static tree expand_unreachable_stmt (tree, int); +static void genrtl_do_stmt_1 (tree, tree); /* Create an empty statement tree rooted at T. */ void -begin_stmt_tree (t) - tree *t; +begin_stmt_tree (tree *t) { /* We create a trivial EXPR_STMT so that last_tree is never NULL in what follows. We remove the extraneous statement in @@ -67,8 +79,7 @@ begin_stmt_tree (t) /* T is a statement. Add it to the statement-tree. */ tree -add_stmt (t) - tree t; +add_stmt (tree t) { if (input_filename != last_expr_filename) { @@ -86,15 +97,11 @@ add_stmt (t) /* Add T to the statement-tree. */ TREE_CHAIN (last_tree) = t; last_tree = t; - + /* 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 (last_tree) = stmts_are_full_exprs_p (); - /* Keep track of the number of statements in this function. */ - if (current_function_decl) - ++DECL_NUM_STMTS (current_function_decl); - return t; } @@ -102,14 +109,13 @@ add_stmt (t) DECL. */ void -add_decl_stmt (decl) - tree decl; +add_decl_stmt (tree decl) { tree decl_stmt; /* We need the type to last until instantiation time. */ decl_stmt = build_stmt (DECL_STMT, decl); - add_stmt (decl_stmt); + add_stmt (decl_stmt); } /* Add a scope-statement to the statement-tree. BEGIN_P indicates @@ -123,9 +129,7 @@ add_decl_stmt (decl) SCOPE_BEGIN_P set. */ tree -add_scope_stmt (begin_p, partial_p) - int begin_p; - int partial_p; +add_scope_stmt (int begin_p, int partial_p) { tree *stack_ptr = current_scope_stmt_stack (); tree ss; @@ -144,6 +148,8 @@ add_scope_stmt (begin_p, partial_p) } else { + if (partial_p != SCOPE_PARTIAL_P (TREE_PURPOSE (top))) + abort (); TREE_VALUE (top) = ss; *stack_ptr = TREE_CHAIN (top); } @@ -157,11 +163,10 @@ add_scope_stmt (begin_p, partial_p) /* Finish the statement tree rooted at T. */ void -finish_stmt_tree (t) - tree *t; +finish_stmt_tree (tree *t) { tree stmt; - + /* Remove the fake extra statement added in begin_stmt_tree. */ stmt = TREE_CHAIN (*t); *t = stmt; @@ -171,7 +176,7 @@ finish_stmt_tree (t) { /* The line-number recorded in the outermost statement in a function is the line number of the end of the function. */ - STMT_LINENO (stmt) = lineno; + STMT_LINENO (stmt) = input_line; STMT_LINENO_FOR_FN_P (stmt) = 1; } } @@ -183,23 +188,23 @@ finish_stmt_tree (t) in the grammar. */ tree -build_stmt VPARAMS ((enum tree_code code, ...)) +build_stmt (enum tree_code code, ...) { tree t; int length; int i; + va_list p; - VA_OPEN (p, code); - VA_FIXEDARG (p, enum tree_code, code); + va_start (p, code); t = make_node (code); length = TREE_CODE_LENGTH (code); - STMT_LINENO (t) = lineno; + STMT_LINENO (t) = input_line; for (i = 0; i < length; i++) TREE_OPERAND (t, i) = va_arg (p, tree); - VA_CLOSE (p); + va_end (p); return t; } @@ -209,23 +214,21 @@ build_stmt VPARAMS ((enum tree_code code, ...)) as the condition is returned. Otherwise, T itself is returned. */ tree -expand_cond (t) - tree t; +expand_cond (tree t) { if (t && TREE_CODE (t) == TREE_LIST) { expand_stmt (TREE_PURPOSE (t)); return TREE_VALUE (t); } - else + else return t; } /* Create RTL for the local static variable DECL. */ void -make_rtl_for_local_static (decl) - tree decl; +make_rtl_for_local_static (tree decl) { const char *asmspec = NULL; @@ -260,8 +263,7 @@ make_rtl_for_local_static (decl) /* Let the back-end know about DECL. */ void -emit_local_var (decl) - tree decl; +emit_local_var (tree decl) { /* Create RTL for this variable. */ if (!DECL_RTL_SET_P (decl)) @@ -276,45 +278,47 @@ emit_local_var (decl) expand_decl (decl); } - /* Actually do the initialization. */ - if (stmts_are_full_exprs_p ()) - expand_start_target_temps (); + if (DECL_INITIAL (decl)) + { + /* Actually do the initialization. */ + if (stmts_are_full_exprs_p ()) + expand_start_target_temps (); - expand_decl_init (decl); + expand_decl_init (decl); - if (stmts_are_full_exprs_p ()) - expand_end_target_temps (); + if (stmts_are_full_exprs_p ()) + expand_end_target_temps (); + } } /* Helper for generating the RTL at the beginning of a scope. */ void -genrtl_do_pushlevel () +genrtl_do_pushlevel (void) { - emit_line_note (input_filename, lineno); + emit_line_note (input_location); clear_last_expr (); } /* Generate the RTL for DESTINATION, which is a GOTO_STMT. */ void -genrtl_goto_stmt (destination) - tree destination; +genrtl_goto_stmt (tree destination) { if (TREE_CODE (destination) == IDENTIFIER_NODE) abort (); - + /* We warn about unused labels with -Wunused. That means we have to mark the used labels as used. */ if (TREE_CODE (destination) == LABEL_DECL) TREE_USED (destination) = 1; - - emit_line_note (input_filename, lineno); - + + emit_line_note (input_location); + if (TREE_CODE (destination) == LABEL_DECL) { label_rtx (destination); - expand_goto (destination); + expand_goto (destination); } else expand_computed_goto (destination); @@ -325,8 +329,7 @@ genrtl_goto_stmt (destination) used for new code. */ void -genrtl_expr_stmt (expr) - tree expr; +genrtl_expr_stmt (tree expr) { genrtl_expr_stmt_value (expr, -1, 1); } @@ -338,21 +341,19 @@ genrtl_expr_stmt (expr) MAYBE_LAST is nonzero if this EXPR_STMT might be the last statement in expression statement. */ -void -genrtl_expr_stmt_value (expr, want_value, maybe_last) - tree expr; - int want_value, maybe_last; +void +genrtl_expr_stmt_value (tree expr, int want_value, int maybe_last) { if (expr != NULL_TREE) { - emit_line_note (input_filename, lineno); - + emit_line_note (input_location); + if (stmts_are_full_exprs_p ()) expand_start_target_temps (); - + if (expr != error_mark_node) expand_expr_stmt_value (expr, want_value, maybe_last); - + if (stmts_are_full_exprs_p ()) expand_end_target_temps (); } @@ -361,11 +362,10 @@ genrtl_expr_stmt_value (expr, want_value, maybe_last) /* Generate the RTL for T, which is a DECL_STMT. */ void -genrtl_decl_stmt (t) - tree t; +genrtl_decl_stmt (tree t) { tree decl; - emit_line_note (input_filename, lineno); + emit_line_note (input_location); decl = DECL_STMT_DECL (t); /* If this is a declaration for an automatic local variable, initialize it. Note that we might also see a @@ -373,7 +373,7 @@ genrtl_decl_stmt (t) `extern'). We don't have to handle the initialization of those objects here; they can only be declarations, rather than definitions. */ - if (TREE_CODE (decl) == VAR_DECL + if (TREE_CODE (decl) == VAR_DECL && !TREE_STATIC (decl) && !DECL_EXTERNAL (decl)) { @@ -381,12 +381,12 @@ genrtl_decl_stmt (t) if (!anon_aggr_type_p (TREE_TYPE (decl))) emit_local_var (decl); else - expand_anon_union_decl (decl, NULL_TREE, + expand_anon_union_decl (decl, NULL_TREE, DECL_ANON_UNION_ELEMS (decl)); } else if (TREE_CODE (decl) == VAR_DECL && TREE_STATIC (decl)) make_rtl_for_local_static (decl); - else if (TREE_CODE (decl) == LABEL_DECL + else if (TREE_CODE (decl) == LABEL_DECL && C_DECLARED_LABEL_FLAG (decl)) declare_nonlocal_label (decl); else if (lang_expand_decl_stmt) @@ -396,20 +396,29 @@ genrtl_decl_stmt (t) /* Generate the RTL for T, which is an IF_STMT. */ void -genrtl_if_stmt (t) - tree t; +genrtl_if_stmt (tree t) { tree cond; genrtl_do_pushlevel (); cond = expand_cond (IF_COND (t)); - emit_line_note (input_filename, lineno); + emit_line_note (input_location); expand_start_cond (cond, 0); if (THEN_CLAUSE (t)) - expand_stmt (THEN_CLAUSE (t)); + { + tree nextt = THEN_CLAUSE (t); + + if (cond && integer_zerop (cond)) + nextt = expand_unreachable_stmt (nextt, warn_notreached); + expand_stmt (nextt); + } + if (ELSE_CLAUSE (t)) { + tree nextt = ELSE_CLAUSE (t); expand_start_else (); - expand_stmt (ELSE_CLAUSE (t)); + if (cond && integer_nonzerop (cond)) + nextt = expand_unreachable_stmt (nextt, warn_notreached); + expand_stmt (nextt); } expand_end_cond (); } @@ -417,33 +426,33 @@ genrtl_if_stmt (t) /* Generate the RTL for T, which is a WHILE_STMT. */ void -genrtl_while_stmt (t) - tree t; +genrtl_while_stmt (tree t) { - tree cond; - emit_nop (); - emit_line_note (input_filename, lineno); - expand_start_loop (1); - genrtl_do_pushlevel (); + tree cond = WHILE_COND (t); - cond = expand_cond (WHILE_COND (t)); - emit_line_note (input_filename, lineno); - expand_exit_loop_top_cond (0, cond); + emit_line_note (input_location); + expand_start_loop (1); genrtl_do_pushlevel (); - + + if (cond && !integer_nonzerop (cond)) + { + cond = expand_cond (cond); + emit_line_note (input_location); + expand_exit_loop_top_cond (0, cond); + genrtl_do_pushlevel (); + } + expand_stmt (WHILE_BODY (t)); expand_end_loop (); } -/* Generate the RTL for T, which is a DO_STMT. */ +/* Generate the RTL for a DO_STMT with condition COND and loop BODY + body. This is reused for expanding unreachable WHILE_STMTS. */ -void -genrtl_do_stmt (t) - tree t; +static void +genrtl_do_stmt_1 (tree cond, tree body) { - tree cond = DO_COND (t); - /* Recognize the common special-case of do { ... } while (0) and do not emit the loop widgetry in this case. In particular this avoids cluttering the rtl with dummy loop notes, which can affect @@ -452,30 +461,46 @@ genrtl_do_stmt (t) if (!cond || integer_zerop (cond)) { expand_start_null_loop (); - expand_stmt (DO_BODY (t)); + expand_stmt (body); expand_end_null_loop (); } + else if (integer_nonzerop (cond)) + { + emit_line_note (input_location); + expand_start_loop (1); + + expand_stmt (body); + + emit_line_note (input_location); + expand_end_loop (); + } else { - emit_nop (); - emit_line_note (input_filename, lineno); + emit_line_note (input_location); expand_start_loop_continue_elsewhere (1); - expand_stmt (DO_BODY (t)); + expand_stmt (body); expand_loop_continue_here (); cond = expand_cond (cond); - emit_line_note (input_filename, lineno); + emit_line_note (input_location); expand_exit_loop_if_false (0, cond); expand_end_loop (); } } +/* Generate the RTL for T, which is a DO_STMT. */ + +void +genrtl_do_stmt (tree t) +{ + genrtl_do_stmt_1 (DO_COND (t), DO_BODY (t)); +} + /* Build the node for a return statement and return it. */ tree -build_return_stmt (expr) - tree expr; +build_return_stmt (tree expr) { return (build_stmt (RETURN_STMT, expr)); } @@ -483,14 +508,13 @@ build_return_stmt (expr) /* Generate the RTL for STMT, which is a RETURN_STMT. */ void -genrtl_return_stmt (stmt) - tree stmt; +genrtl_return_stmt (tree stmt) { tree expr; expr = RETURN_STMT_EXPR (stmt); - emit_line_note (input_filename, lineno); + emit_line_note (input_location); if (!expr) expand_null_return (); else @@ -504,12 +528,10 @@ genrtl_return_stmt (stmt) /* Generate the RTL for T, which is a FOR_STMT. */ void -genrtl_for_stmt (t) - tree t; +genrtl_for_stmt (tree t) { - tree cond; - const char *saved_filename; - int saved_lineno; + tree cond = FOR_COND (t); + location_t saved_loc; if (NEW_FOR_SCOPE_P (t)) genrtl_do_pushlevel (); @@ -517,40 +539,44 @@ genrtl_for_stmt (t) expand_stmt (FOR_INIT_STMT (t)); /* Expand the initialization. */ - emit_nop (); - emit_line_note (input_filename, lineno); - expand_start_loop_continue_elsewhere (1); + emit_line_note (input_location); + if (FOR_EXPR (t)) + expand_start_loop_continue_elsewhere (1); + else + expand_start_loop (1); genrtl_do_pushlevel (); - cond = expand_cond (FOR_COND (t)); /* Save the filename and line number so that we expand the FOR_EXPR we can reset them back to the saved values. */ - saved_filename = input_filename; - saved_lineno = lineno; + saved_loc = input_location; /* Expand the condition. */ - emit_line_note (input_filename, lineno); - if (cond) - expand_exit_loop_top_cond (0, cond); + if (cond && !integer_nonzerop (cond)) + { + cond = expand_cond (cond); + emit_line_note (input_location); + expand_exit_loop_top_cond (0, cond); + genrtl_do_pushlevel (); + } /* Expand the body. */ - genrtl_do_pushlevel (); expand_stmt (FOR_BODY (t)); /* Expand the increment expression. */ - input_filename = saved_filename; - lineno = saved_lineno; - emit_line_note (input_filename, lineno); - expand_loop_continue_here (); + input_location = saved_loc; + emit_line_note (input_location); if (FOR_EXPR (t)) - genrtl_expr_stmt (FOR_EXPR (t)); + { + expand_loop_continue_here (); + genrtl_expr_stmt (FOR_EXPR (t)); + } expand_end_loop (); } /* Build a break statement node and return it. */ tree -build_break_stmt () +build_break_stmt (void) { return (build_stmt (BREAK_STMT)); } @@ -558,17 +584,17 @@ build_break_stmt () /* Generate the RTL for a BREAK_STMT. */ void -genrtl_break_stmt () +genrtl_break_stmt (void) { - emit_line_note (input_filename, lineno); + emit_line_note (input_location); if ( ! expand_exit_something ()) - error ("break statement not within loop or switch"); + abort (); } /* Build a continue statement node and return it. */ tree -build_continue_stmt () +build_continue_stmt (void) { return (build_stmt (CONTINUE_STMT)); } @@ -576,18 +602,17 @@ build_continue_stmt () /* Generate the RTL for a CONTINUE_STMT. */ void -genrtl_continue_stmt () +genrtl_continue_stmt (void) { - emit_line_note (input_filename, lineno); + emit_line_note (input_location); if (! expand_continue_loop (0)) - error ("continue statement not within a loop"); + abort (); } /* Generate the RTL for T, which is a SCOPE_STMT. */ void -genrtl_scope_stmt (t) - tree t; +genrtl_scope_stmt (tree t) { tree block = SCOPE_STMT_BLOCK (t); @@ -600,10 +625,8 @@ genrtl_scope_stmt (t) } else if (!SCOPE_NULLIFIED_P (t)) { - rtx note = emit_note (NULL, - (SCOPE_BEGIN_P (t) - ? NOTE_INSN_BLOCK_BEG - : NOTE_INSN_BLOCK_END)); + rtx note = emit_note (SCOPE_BEGIN_P (t) + ? NOTE_INSN_BLOCK_BEG : NOTE_INSN_BLOCK_END); NOTE_BLOCK (note) = block; } @@ -615,9 +638,10 @@ genrtl_scope_stmt (t) for (fn = BLOCK_VARS (block); fn; fn = TREE_CHAIN (fn)) { - if (TREE_CODE (fn) == FUNCTION_DECL + if (TREE_CODE (fn) == FUNCTION_DECL && DECL_CONTEXT (fn) == current_function_decl && DECL_SAVED_INSNS (fn) + && DECL_SAVED_INSNS (fn)->saved_for_inline && !TREE_ASM_WRITTEN (fn) && TREE_ADDRESSABLE (fn)) { @@ -632,31 +656,27 @@ genrtl_scope_stmt (t) /* Generate the RTL for T, which is a SWITCH_STMT. */ void -genrtl_switch_stmt (t) - tree t; +genrtl_switch_stmt (tree t) { tree cond; genrtl_do_pushlevel (); - + cond = expand_cond (SWITCH_COND (t)); if (cond == error_mark_node) /* The code is in error, but we don't want expand_end_case to crash. */ - cond = boolean_false_node; + cond = truthvalue_false_node; - emit_line_note (input_filename, lineno); + emit_line_note (input_location); expand_start_case (1, cond, TREE_TYPE (cond), "switch statement"); - expand_stmt (SWITCH_BODY (t)); + expand_stmt (expand_unreachable_stmt (SWITCH_BODY (t), warn_notreached)); expand_end_case_type (cond, SWITCH_TYPE (t)); } /* Create a CASE_LABEL tree node and return it. */ tree -build_case_label (low_value, high_value, label_decl) - tree low_value; - tree high_value; - tree label_decl; +build_case_label (tree low_value, tree high_value, tree label_decl) { return build_stmt (CASE_LABEL, low_value, high_value, label_decl); } @@ -664,9 +684,8 @@ build_case_label (low_value, high_value, label_decl) /* Generate the RTL for a CASE_LABEL. */ -void -genrtl_case_label (case_label) - tree case_label; +void +genrtl_case_label (tree case_label) { tree duplicate; tree cleanup; @@ -675,7 +694,7 @@ genrtl_case_label (case_label) if (cleanup) { static int explained = 0; - warning ("destructor needed for `%#D'", (TREE_PURPOSE (cleanup))); + warning ("destructor needed for `%D'", (TREE_PURPOSE (cleanup))); warning ("where case label appears here"); if (!explained) { @@ -684,15 +703,14 @@ genrtl_case_label (case_label) } } - add_case_node (CASE_LOW (case_label), CASE_HIGH (case_label), + add_case_node (CASE_LOW (case_label), CASE_HIGH (case_label), CASE_LABEL_DECL (case_label), &duplicate); } /* Generate the RTL for T, which is a COMPOUND_STMT. */ void -genrtl_compound_stmt (t) - tree t; +genrtl_compound_stmt (tree t) { #ifdef ENABLE_CHECKING struct nesting *n = current_nesting_level (); @@ -710,14 +728,8 @@ genrtl_compound_stmt (t) /* Generate the RTL for an ASM_STMT. */ void -genrtl_asm_stmt (cv_qualifier, string, output_operands, - input_operands, clobbers, asm_input_p) - tree cv_qualifier; - tree string; - tree output_operands; - tree input_operands; - tree clobbers; - int asm_input_p; +genrtl_asm_stmt (tree cv_qualifier, tree string, tree output_operands, + tree input_operands, tree clobbers, int asm_input_p) { if (cv_qualifier != NULL_TREE && cv_qualifier != ridpointers[(int) RID_VOLATILE]) @@ -727,23 +739,23 @@ genrtl_asm_stmt (cv_qualifier, string, output_operands, cv_qualifier = NULL_TREE; } - emit_line_note (input_filename, lineno); + emit_line_note (input_location); if (asm_input_p) expand_asm (string, cv_qualifier != NULL_TREE); else - c_expand_asm_operands (string, output_operands, input_operands, + c_expand_asm_operands (string, output_operands, input_operands, clobbers, cv_qualifier != NULL_TREE, - input_filename, lineno); + input_location); } -/* Generate the RTL for a DECL_CLEANUP. */ +/* Generate the RTL for a CLEANUP_STMT. */ -void -genrtl_decl_cleanup (t) - tree t; +void +genrtl_cleanup_stmt (tree t) { tree decl = CLEANUP_DECL (t); - if (!decl || (DECL_SIZE (decl) && TREE_TYPE (decl) != error_mark_node)) + if (!decl || !DECL_P (decl) + || (DECL_SIZE (decl) && TREE_TYPE (decl) != error_mark_node)) expand_decl_cleanup_eh (decl, CLEANUP_EXPR (t), CLEANUP_EH_ONLY (t)); } @@ -751,11 +763,10 @@ genrtl_decl_cleanup (t) for the substitution. */ void -prep_stmt (t) - tree t; +prep_stmt (tree t) { if (!STMT_LINENO_FOR_FN_P (t)) - lineno = STMT_LINENO (t); + input_line = STMT_LINENO (t); current_stmt_tree ()->stmts_are_full_exprs_p = STMT_IS_FULL_EXPR_P (t); } @@ -763,8 +774,7 @@ prep_stmt (t) other statements at its nesting level. */ void -expand_stmt (t) - tree t; +expand_stmt (tree t) { while (t && t != error_mark_node) { @@ -782,7 +792,8 @@ expand_stmt (t) case RETURN_STMT: genrtl_return_stmt (t); - break; + t = expand_unreachable_stmt (TREE_CHAIN (t), warn_notreached); + goto process_t; case EXPR_STMT: genrtl_expr_stmt_value (EXPR_STMT_EXPR (t), TREE_ADDRESSABLE (t), @@ -817,11 +828,13 @@ expand_stmt (t) case BREAK_STMT: genrtl_break_stmt (); - break; + t = expand_unreachable_stmt (TREE_CHAIN (t), warn_notreached); + goto process_t; case CONTINUE_STMT: genrtl_continue_stmt (); - break; + t = expand_unreachable_stmt (TREE_CHAIN (t), warn_notreached); + goto process_t; case SWITCH_STMT: genrtl_switch_stmt (t); @@ -841,12 +854,13 @@ expand_stmt (t) && TREE_CODE (GOTO_DESTINATION (t)) == LABEL_DECL && flag_guess_branch_prob) { - rtx note = emit_note (NULL, NOTE_INSN_PREDICTION); + rtx note = emit_note (NOTE_INSN_PREDICTION); NOTE_PREDICTION (note) = NOTE_PREDICT (PRED_GOTO, NOT_TAKEN); } genrtl_goto_stmt (GOTO_DESTINATION (t)); - break; + t = expand_unreachable_stmt (TREE_CHAIN (t), warn_notreached); + goto process_t; case ASM_STMT: genrtl_asm_stmt (ASM_CV_QUAL (t), ASM_STRING (t), @@ -859,22 +873,186 @@ expand_stmt (t) break; case CLEANUP_STMT: - genrtl_decl_cleanup (t); + genrtl_cleanup_stmt (t); break; default: if (lang_expand_stmt) (*lang_expand_stmt) (t); - else + else abort (); break; } + /* Go on to the next statement in this scope. */ + t = TREE_CHAIN (t); + + process_t: /* Restore saved state. */ current_stmt_tree ()->stmts_are_full_exprs_p = saved_stmts_are_full_exprs_p; + } +} + +/* If *TP is a potentially reachable label, return nonzero. */ - /* Go on to the next statement in this scope. */ +static tree +find_reachable_label_1 (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED) +{ + switch (TREE_CODE (*tp)) + { + case LABEL_STMT: + case CASE_LABEL: + return *tp; + + default: + break; + } + return NULL_TREE; +} + +/* Determine whether expression EXP contains a potentially + reachable label. */ +static tree +find_reachable_label (tree exp) +{ + location_t saved_loc = input_location; + tree ret = walk_tree_without_duplicates + (&exp, find_reachable_label_1, NULL); + input_location = saved_loc; + return ret; +} + +/* Expand an unreachable if statement, T. This function returns + true if the IF_STMT contains a potentially reachable code_label. */ +static bool +expand_unreachable_if_stmt (tree t) +{ + tree n; + + if (find_reachable_label (IF_COND (t)) != NULL_TREE) + { + genrtl_if_stmt (t); + return true; + } + + if (THEN_CLAUSE (t) && ELSE_CLAUSE (t)) + { + n = expand_unreachable_stmt (THEN_CLAUSE (t), 0); + + if (n != NULL_TREE) + { + rtx label; + expand_stmt (n); + label = gen_label_rtx (); + emit_jump (label); + expand_stmt (expand_unreachable_stmt (ELSE_CLAUSE (t), 0)); + emit_label (label); + return true; + } + else + n = expand_unreachable_stmt (ELSE_CLAUSE (t), 0); + } + else if (THEN_CLAUSE (t)) + n = expand_unreachable_stmt (THEN_CLAUSE (t), 0); + else if (ELSE_CLAUSE (t)) + n = expand_unreachable_stmt (ELSE_CLAUSE (t), 0); + else + n = NULL_TREE; + + expand_stmt (n); + + return n != NULL_TREE; +} + +/* Expand an unreachable statement list. This function skips all + statements preceding the first potentially reachable label and + then returns the label (or, in same cases, the statement after + one containing the label). */ +static tree +expand_unreachable_stmt (tree t, int warn) +{ + int saved; + + while (t && t != error_mark_node) + { + if (warn) + switch (TREE_CODE (t)) + { + case BREAK_STMT: + case CONTINUE_STMT: + case EXPR_STMT: + case GOTO_STMT: + case IF_STMT: + case RETURN_STMT: + if (!STMT_LINENO_FOR_FN_P (t)) + input_line = STMT_LINENO (t); + warning("will never be executed"); + warn = false; + break; + + default: + break; + } + + switch (TREE_CODE (t)) + { + case GOTO_STMT: + case CONTINUE_STMT: + case BREAK_STMT: + break; + + case FILE_STMT: + input_filename = FILE_STMT_FILENAME (t); + break; + + case RETURN_STMT: + if (find_reachable_label (RETURN_STMT_EXPR (t)) != NULL_TREE) + return t; + break; + + case EXPR_STMT: + if (find_reachable_label (EXPR_STMT_EXPR (t)) != NULL_TREE) + return t; + break; + + case IF_STMT: + if (expand_unreachable_if_stmt (t)) + return TREE_CHAIN (t); + break; + + case WHILE_STMT: + /* If the start of a while statement is unreachable, there is + no need to rotate the loop, instead the WHILE_STMT can be + expanded like a DO_STMT. */ + genrtl_do_stmt_1 (WHILE_COND (t), WHILE_BODY (t)); + return TREE_CHAIN (t); + + case COMPOUND_STMT: + { + tree n; + n = expand_unreachable_stmt (COMPOUND_BODY (t), warn); + if (n != NULL_TREE) + { + expand_stmt (n); + return TREE_CHAIN (t); + } + warn = false; + break; + } + + case SCOPE_STMT: + saved = stmts_are_full_exprs_p (); + prep_stmt (t); + genrtl_scope_stmt (t); + current_stmt_tree ()->stmts_are_full_exprs_p = saved; + break; + + default: + return t; + } t = TREE_CHAIN (t); } + return NULL_TREE; } |