diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2010-11-17 14:02:31 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2010-11-17 14:02:31 +0100 |
| commit | 073d7052e568286ab54cf68583340cf0c1d70ebe (patch) | |
| tree | 1e89d1229ecf0cb5ad8729761520910b3d4127b2 /gcc/combine.c | |
| parent | f79616a446e17b2e69769a57939cf9b1c65064f2 (diff) | |
| download | gcc-073d7052e568286ab54cf68583340cf0c1d70ebe.zip gcc-073d7052e568286ab54cf68583340cf0c1d70ebe.tar.gz gcc-073d7052e568286ab54cf68583340cf0c1d70ebe.tar.bz2 | |
re PR rtl-optimization/46440 (ICE: in rtl_verify_flow_info, at cfgrtl.c:2165 with -fstack-protector-all -fno-tree-dominator-opts -fno-tree-fre)
PR rtl-optimization/46440
* combine.c (update_cfg_for_uncondjump): When changing
an indirect jump into unconditional jump, remove BARRIERs
from bb's footer.
* gcc.dg/pr46440.c: New test.
From-SVN: r166867
Diffstat (limited to 'gcc/combine.c')
| -rw-r--r-- | gcc/combine.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/gcc/combine.c b/gcc/combine.c index d55ce31..c557e8c 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -2460,7 +2460,25 @@ update_cfg_for_uncondjump (rtx insn) delete_insn (insn); if (at_end && EDGE_COUNT (bb->succs) == 1) - single_succ_edge (bb)->flags |= EDGE_FALLTHRU; + { + rtx insn; + + single_succ_edge (bb)->flags |= EDGE_FALLTHRU; + + /* Remove barriers from the footer if there are any. */ + for (insn = bb->il.rtl->footer; insn; insn = NEXT_INSN (insn)) + if (BARRIER_P (insn)) + { + if (PREV_INSN (insn)) + NEXT_INSN (PREV_INSN (insn)) = NEXT_INSN (insn); + else + bb->il.rtl->footer = NEXT_INSN (insn); + if (NEXT_INSN (insn)) + PREV_INSN (NEXT_INSN (insn)) = PREV_INSN (insn); + } + else if (LABEL_P (insn)) + break; + } } /* Try to combine the insns I0, I1 and I2 into I3. |