diff options
| author | Michael Meissner <meissner@redhat.com> | 2000-08-19 22:32:11 +0000 |
|---|---|---|
| committer | Michael Meissner <meissner@gcc.gnu.org> | 2000-08-19 22:32:11 +0000 |
| commit | f1e42c8110b5089084f9739211b8f303cf884600 (patch) | |
| tree | c16a7470bdf0c180c60769ef08a4923773b8f3b7 | |
| parent | 9d6c2770a0999516d86100d90855ac6fd2212df6 (diff) | |
| download | gcc-f1e42c8110b5089084f9739211b8f303cf884600.zip gcc-f1e42c8110b5089084f9739211b8f303cf884600.tar.gz gcc-f1e42c8110b5089084f9739211b8f303cf884600.tar.bz2 | |
Do not consider a THEN block ending in an indirect jump for conditional compilation; Fix d30v warning
From-SVN: r35812
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/d30v/d30v-protos.h | 1 | ||||
| -rw-r--r-- | gcc/config/d30v/d30v.h | 2 | ||||
| -rw-r--r-- | gcc/ifcvt.c | 14 |
4 files changed, 24 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 453be4c..d17aaf1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2000-08-19 Michael Meissner <meissner@redhat.com> + + * ifcvt.c (find_if_block): Do not consider a THEN block that ends + in a indirect jump as a potential for conditional execution. + + * d30v.h (d30v_init_expanders): Don't declare here. + * d30v-protos.h (d30v_init_expanders): Declare here with a valid + prototype. + Sat 19-Aug-2000 21:11:45 BST Neil Booth <NeilB@earthling.net> * cpp.texi: Add @section for assertions. diff --git a/gcc/config/d30v/d30v-protos.h b/gcc/config/d30v/d30v-protos.h index 6e774fd..27d1f03 100644 --- a/gcc/config/d30v/d30v-protos.h +++ b/gcc/config/d30v/d30v-protos.h @@ -132,6 +132,7 @@ extern void d30v_machine_dependent_reorg PARAMS ((rtx)); extern int d30v_adjust_cost PARAMS ((rtx, rtx, rtx, int)); extern rtx d30v_return_addr PARAMS ((void)); #endif +extern void d30v_init_expanders PARAMS ((void)); /* External variables referenced */ diff --git a/gcc/config/d30v/d30v.h b/gcc/config/d30v/d30v.h index 12f7027..defdc49 100644 --- a/gcc/config/d30v/d30v.h +++ b/gcc/config/d30v/d30v.h @@ -1953,7 +1953,7 @@ typedef struct d30v_stack { once for every function before code is generated. */ #define INIT_EXPANDERS d30v_init_expanders () -extern void d30v_init_expanders (); + /* Stack Checking. */ diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 54ad8a7..3215f6c 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -1500,11 +1500,23 @@ find_if_block (test_bb, then_edge, else_edge) /* If the THEN block has no successors, conditional execution can still make a conditional call. Don't do this unless the ELSE block has - only one incoming edge -- the CFG manipulation is too ugly otherwise. */ + only one incoming edge -- the CFG manipulation is too ugly otherwise. + Check for the last insn of the THEN block being an indirect jump, which + is listed as not having any successors, but confuses the rest of the CE + code processing. XXX we should fix this in the future. */ if (then_succ == NULL) { if (else_bb->pred->pred_next == NULL_EDGE) { + rtx last_insn = then_bb->end; + + if (GET_CODE (last_insn) == NOTE) + last_insn = prev_nonnote_insn (last_insn); + + if (GET_CODE (last_insn) == JUMP_INSN + && ! simplejump_p (last_insn)) + return FALSE; + join_bb = else_bb; else_bb = NULL_BLOCK; } |