diff options
| author | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-03 13:13:03 +0000 |
|---|---|---|
| committer | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-03 13:13:03 +0000 |
| commit | 90bd219d592763880997f95fe5f2243d4b7b3570 (patch) | |
| tree | 637750849d7de92afc2bfea49d5fe684aeb3e776 /gcc/ifcvt.c | |
| parent | 951311d4f27cabdda81edf28000d4b4d33588703 (diff) | |
| download | gcc-90bd219d592763880997f95fe5f2243d4b7b3570.tar.gz | |
* postreload-gcse.c (insert_expr_in_table): Replace BLOCK_NUM
with BLOCK_FOR_INSN.
* auto-inc-dec.c (attempt_change, get_next_ref, find_inc): Likewise.
* ifcvt.c (noce_get_alt_condition, noce_try_abs,
noce_process_if_block): Likewise.
* gcse.c (compute_local_properties, insert_expr_in_table,
insert_set_in_table, canon_list_insert, find_avail_set,
pre_insert_copy_insn): Likewise.
* basic-block.h (BLOCK_NUM): Move from here...
* sched-int.h (BLOCK_NUM): ... to here to localize it in the scheduler.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155586 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ifcvt.c')
| -rw-r--r-- | gcc/ifcvt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 348c0cca8bf..9efd27d999f 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -1553,7 +1553,8 @@ noce_get_alt_condition (struct noce_if_info *if_info, rtx target, /* First, look to see if we put a constant in a register. */ prev_insn = prev_nonnote_insn (if_info->cond_earliest); if (prev_insn - && BLOCK_NUM (prev_insn) == BLOCK_NUM (if_info->cond_earliest) + && BLOCK_FOR_INSN (prev_insn) + == BLOCK_FOR_INSN (if_info->cond_earliest) && INSN_P (prev_insn) && GET_CODE (PATTERN (prev_insn)) == SET) { @@ -1810,7 +1811,7 @@ noce_try_abs (struct noce_if_info *if_info) { rtx set, insn = prev_nonnote_insn (earliest); if (insn - && BLOCK_NUM (insn) == BLOCK_NUM (earliest) + && BLOCK_FOR_INSN (insn) == BLOCK_FOR_INSN (earliest) && (set = single_set (insn)) && rtx_equal_p (SET_DEST (set), c)) { @@ -2291,7 +2292,7 @@ noce_process_if_block (struct noce_if_info *if_info) COND_EARLIEST to JUMP. Make sure the relevant data is still intact. */ if (! insn_b - || BLOCK_NUM (insn_b) != BLOCK_NUM (if_info->cond_earliest) + || BLOCK_FOR_INSN (insn_b) != BLOCK_FOR_INSN (if_info->cond_earliest) || !NONJUMP_INSN_P (insn_b) || (set_b = single_set (insn_b)) == NULL_RTX || ! rtx_equal_p (x, SET_DEST (set_b)) |