diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-08-25 20:45:08 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2014-08-25 20:45:08 +0000 |
| commit | 95c43227c5170be95578e3209419c06b41d17fb4 (patch) | |
| tree | 9830f6f34a5652a0c7846c548b3436ea07f5bb78 /gcc/cfgrtl.c | |
| parent | 6bb9bf637ae44ae9d07012fac08e35a446d11ea4 (diff) | |
| download | gcc-95c43227c5170be95578e3209419c06b41d17fb4.zip gcc-95c43227c5170be95578e3209419c06b41d17fb4.tar.gz gcc-95c43227c5170be95578e3209419c06b41d17fb4.tar.bz2 | |
Add rtx_jump_table_data::get_labels method
gcc/
* rtl.h (rtx_jump_table_data::get_labels): New method.
* cfgbuild.c (make_edges): Replace hand-coded lookup of labels
with use of the new rtx_jump_table_data::get_labels method.
(purge_dead_tablejump_edges): Strengthen param "table" from rtx
to rtx_jump_table_data *. Simplify by using get_labels method.
* cfgrtl.c (delete_insn): Replace use of JUMP_TABLE_DATA_P with
a dyn_cast, introducing local "table", using it to replace
label-lookup logic with a get_labels method call.
(patch_jump_insn): Simplify using get_labels method.
* dwarf2cfi.c (create_trace_edges): Likewise.
* rtlanal.c (label_is_jump_target_p): Likewise.
From-SVN: r214476
Diffstat (limited to 'gcc/cfgrtl.c')
| -rw-r--r-- | gcc/cfgrtl.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 14454fb..ee98660 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -197,16 +197,15 @@ delete_insn (rtx insn) remove_note (insn, note); } - if (JUMP_TABLE_DATA_P (insn)) + if (rtx_jump_table_data *table = dyn_cast <rtx_jump_table_data *> (insn)) { - rtx pat = PATTERN (insn); - int diff_vec_p = GET_CODE (PATTERN (insn)) == ADDR_DIFF_VEC; - int len = XVECLEN (pat, diff_vec_p); + rtvec vec = table->get_labels (); + int len = GET_NUM_ELEM (vec); int i; for (i = 0; i < len; i++) { - rtx label = XEXP (XVECEXP (pat, diff_vec_p, i), 0); + rtx label = XEXP (RTVEC_ELT (vec, i), 0); /* When deleting code in bulk (e.g. removing many unreachable blocks) we can delete a label that's a target of the vector @@ -1186,10 +1185,7 @@ patch_jump_insn (rtx_insn *insn, rtx_insn *old_label, basic_block new_bb) if (new_bb == EXIT_BLOCK_PTR_FOR_FN (cfun)) return false; - if (GET_CODE (PATTERN (table)) == ADDR_VEC) - vec = XVEC (PATTERN (table), 0); - else - vec = XVEC (PATTERN (table), 1); + vec = table->get_labels (); for (j = GET_NUM_ELEM (vec) - 1; j >= 0; --j) if (XEXP (RTVEC_ELT (vec, j), 0) == old_label) |