diff options
author | Trevor Saunders <tbsaunde+gcc@tbsaunde.org> | 2016-10-21 12:32:56 +0000 |
---|---|---|
committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2016-10-21 12:32:56 +0000 |
commit | 04a121a757f20a4807d47e1d0c7418145b147d69 (patch) | |
tree | 4a775485f6f8a9a86ec778a975da372fc9d35d4b /gcc/reload.c | |
parent | 1d64ceb0579f2da8fec5f26932d5b182653c60d7 (diff) | |
download | gcc-04a121a757f20a4807d47e1d0c7418145b147d69.zip gcc-04a121a757f20a4807d47e1d0c7418145b147d69.tar.gz gcc-04a121a757f20a4807d47e1d0c7418145b147d69.tar.bz2 |
make LABEL_REF_LABEL a rtx_insn *
While changing LABEL_REF_LABEL it might as well become an inline
function, so that its clearer what types are involved. Unfortunately
because it is still possible to use XEXP and related macros on a
LABEL_REF rtx you can still set the field to be a non insn rtx. The
other unfortunate thing is that the generators actually create LABEL_REF
rtx that refer to MATCH_x rtx, so there we actually need to use XEXP to
bypass the checking this patch adds.
gcc/ChangeLog:
2016-10-21 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* rtl.h (label_ref_label): New function.
(set_label_ref_label): New function.
(LABEL_REF_LABEL): Delete.
* alias.c (rtx_equal_for_memref_p): Adjust.
* cfgbuild.c (make_edges): Likewise.
(purge_dead_tablejump_edges): Likewise.
* cfgexpand.c (convert_debug_memory_address): Likewise.
* cfgrtl.c (patch_jump_insn): Likewise.
* combine.c (distribute_notes): Likewise.
* cse.c (hash_rtx_cb): Likewise.
(exp_equiv_p): Likewise.
(fold_rtx): Likewise.
(check_for_label_ref): Likewise.
* cselib.c (rtx_equal_for_cselib_1): Likewise.
(cselib_hash_rtx): Likewise.
* emit-rtl.c (mark_label_nuses): Likewise.
* explow.c (convert_memory_address_addr_space_1): Likewise.
* final.c (output_asm_label): Likewise.
(output_addr_const): Likewise.
* gcse.c (add_label_notes): Likewise.
* genconfig.c (walk_insn_part): Likewise.
* genrecog.c (validate_pattern): Likewise.
* ifcvt.c (cond_exec_get_condition): Likewise.
(noce_emit_store_flag): Likewise.
(noce_get_alt_condition): Likewise.
(noce_get_condition): Likewise.
* jump.c (maybe_propagate_label_ref): Likewise.
(mark_jump_label_1): Likewise.
(redirect_exp_1): Likewise.
(rtx_renumbered_equal_p): Likewise.
* lra-constraints.c (operands_match_p): Likewise.
* print-rtl.c (print_value): Likewise.
* reload.c (find_reloads): Likewise.
* reload1.c (set_label_offsets): Likewise.
* reorg.c (get_branch_condition): Likewise.
* rtl-tests.c (test_uncond_jump): Likewise.
* rtl.c (rtx_equal_p_cb): Likewise.
(rtx_equal_p): Likewise.
* rtlanal.c (reg_mentioned_p): Likewise.
(rtx_referenced_p): Likewise.
(get_condition): Likewise.
* varasm.c (const_hash_1): Likewise.
(compare_constant): Likewise.
(const_rtx_hash_1): Likewise.
(output_constant_pool_1): Likewise.
From-SVN: r241401
Diffstat (limited to 'gcc/reload.c')
-rw-r--r-- | gcc/reload.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/reload.c b/gcc/reload.c index 6517552..3ec4b31 100644 --- a/gcc/reload.c +++ b/gcc/reload.c @@ -2318,7 +2318,7 @@ operands_match_p (rtx x, rtx y) return 0; case LABEL_REF: - return LABEL_REF_LABEL (x) == LABEL_REF_LABEL (y); + return label_ref_label (x) == label_ref_label (y); case SYMBOL_REF: return XSTR (x, 0) == XSTR (y, 0); @@ -4218,17 +4218,17 @@ find_reloads (rtx_insn *insn, int replace, int ind_levels, int live_known, this instruction. */ if (GET_CODE (substitution) == LABEL_REF && !find_reg_note (insn, REG_LABEL_OPERAND, - LABEL_REF_LABEL (substitution)) + label_ref_label (substitution)) /* For a JUMP_P, if it was a branch target it must have already been recorded as such. */ && (!JUMP_P (insn) - || !label_is_jump_target_p (LABEL_REF_LABEL (substitution), + || !label_is_jump_target_p (label_ref_label (substitution), insn))) { add_reg_note (insn, REG_LABEL_OPERAND, - LABEL_REF_LABEL (substitution)); - if (LABEL_P (LABEL_REF_LABEL (substitution))) - ++LABEL_NUSES (LABEL_REF_LABEL (substitution)); + label_ref_label (substitution)); + if (LABEL_P (label_ref_label (substitution))) + ++LABEL_NUSES (label_ref_label (substitution)); } } |