diff options
| author | David Malcolm <dmalcolm@redhat.com> | 2014-09-11 20:47:39 +0000 |
|---|---|---|
| committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2014-09-11 20:47:39 +0000 |
| commit | a827d9b1943e966713fbc5cd8f56722791f524aa (patch) | |
| tree | 99f089d03c5999d04f7bdff5d44e2a6ef6a2568b /gcc/varasm.c | |
| parent | e4fb6f093c1657d590e37f39f832652d133dcb3b (diff) | |
| download | gcc-a827d9b1943e966713fbc5cd8f56722791f524aa.zip gcc-a827d9b1943e966713fbc5cd8f56722791f524aa.tar.gz gcc-a827d9b1943e966713fbc5cd8f56722791f524aa.tar.bz2 | |
Introduce LABEL_REF_LABEL
gcc/ChangeLog:
2014-09-11 David Malcolm <dmalcolm@redhat.com>
* rtl.h (LABEL_REF_LABEL): New macro.
* alias.c (rtx_equal_for_memref_p): Use LABEL_REF_LABEL in place
of XEXP (, 0), where we know that we have a LABEL_REF.
* 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): 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.
* reload.c (operands_match_p): Likewise.
(find_reloads): Likewise.
* reload1.c (set_label_offsets): Likewise.
* reorg.c (get_branch_condition): 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.
* sched-vis.c (print_value): Likewise.
* varasm.c (const_hash_1): Likewise.
(compare_constant): Likewise.
(const_rtx_hash_1): Likewise.
(output_constant_pool_1): Likewise.
From-SVN: r215190
Diffstat (limited to 'gcc/varasm.c')
| -rw-r--r-- | gcc/varasm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/varasm.c b/gcc/varasm.c index de4479c..cd4a230 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -2922,7 +2922,8 @@ const_hash_1 (const tree exp) break; case LABEL_REF: - hi = value.offset + CODE_LABEL_NUMBER (XEXP (value.base, 0)) * 13; + hi = (value.offset + + CODE_LABEL_NUMBER (LABEL_REF_LABEL (value.base)) * 13); break; default: @@ -3112,8 +3113,8 @@ compare_constant (const tree t1, const tree t2) break; case LABEL_REF: - ret = (CODE_LABEL_NUMBER (XEXP (value1.base, 0)) - == CODE_LABEL_NUMBER (XEXP (value2.base, 0))); + ret = (CODE_LABEL_NUMBER (LABEL_REF_LABEL (value1.base)) + == CODE_LABEL_NUMBER (LABEL_REF_LABEL (value2.base))); break; default: @@ -3547,7 +3548,7 @@ const_rtx_hash_1 (const_rtx x) break; case LABEL_REF: - h = h * 251 + CODE_LABEL_NUMBER (XEXP (x, 0)); + h = h * 251 + CODE_LABEL_NUMBER (LABEL_REF_LABEL (x)); break; case UNSPEC: @@ -3835,7 +3836,7 @@ output_constant_pool_1 (struct constant_descriptor_rtx *desc, /* FALLTHRU */ case LABEL_REF: - tmp = XEXP (tmp, 0); + tmp = LABEL_REF_LABEL (tmp); gcc_assert (!INSN_DELETED_P (tmp)); gcc_assert (!NOTE_P (tmp) || NOTE_KIND (tmp) != NOTE_INSN_DELETED); |