diff options
author | Richard Sandiford <richard.sandiford@arm.com> | 2020-12-17 00:15:03 +0000 |
---|---|---|
committer | Richard Sandiford <richard.sandiford@arm.com> | 2020-12-17 00:15:03 +0000 |
commit | 21335c48576d0968126add51adef9a4ce0dddf07 (patch) | |
tree | ce59eab22b31ef573526f7e9df9696120bbef94a /gcc/cfgrtl.c | |
parent | d4b520d88ee5b4cd446ef001c8fdddd9af8d681c (diff) | |
download | gcc-21335c48576d0968126add51adef9a4ce0dddf07.zip gcc-21335c48576d0968126add51adef9a4ce0dddf07.tar.gz gcc-21335c48576d0968126add51adef9a4ce0dddf07.tar.bz2 |
Split update_cfg_for_uncondjump out of combine
Later patches want to reuse combine's update_cfg_for_uncondjump,
so this patch makes it a public cfgrtl.c function.
gcc/
* cfgrtl.h (update_cfg_for_uncondjump): Declare.
* combine.c (update_cfg_for_uncondjump): Move to...
* cfgrtl.c: ...here.
Diffstat (limited to 'gcc/cfgrtl.c')
-rw-r--r-- | gcc/cfgrtl.c | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 4d02495..79f38b7a 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -3419,6 +3419,53 @@ fixup_abnormal_edges (void) return inserted; } +/* Delete the unconditional jump INSN and adjust the CFG correspondingly. + Note that the INSN should be deleted *after* removing dead edges, so + that the kept edge is the fallthrough edge for a (set (pc) (pc)) + but not for a (set (pc) (label_ref FOO)). */ + +void +update_cfg_for_uncondjump (rtx_insn *insn) +{ + basic_block bb = BLOCK_FOR_INSN (insn); + gcc_assert (BB_END (bb) == insn); + + purge_dead_edges (bb); + + if (current_ir_type () != IR_RTL_CFGLAYOUT) + { + if (!find_fallthru_edge (bb->succs)) + { + auto barrier = next_nonnote_nondebug_insn (insn); + if (!barrier || !BARRIER_P (barrier)) + emit_barrier_after (insn); + } + return; + } + + delete_insn (insn); + if (EDGE_COUNT (bb->succs) == 1) + { + rtx_insn *insn; + + single_succ_edge (bb)->flags |= EDGE_FALLTHRU; + + /* Remove barriers from the footer if there are any. */ + for (insn = BB_FOOTER (bb); insn; insn = NEXT_INSN (insn)) + if (BARRIER_P (insn)) + { + if (PREV_INSN (insn)) + SET_NEXT_INSN (PREV_INSN (insn)) = NEXT_INSN (insn); + else + BB_FOOTER (bb) = NEXT_INSN (insn); + if (NEXT_INSN (insn)) + SET_PREV_INSN (NEXT_INSN (insn)) = PREV_INSN (insn); + } + else if (LABEL_P (insn)) + break; + } +} + /* Cut the insns from FIRST to LAST out of the insns stream. */ rtx_insn * |