summaryrefslogtreecommitdiff
path: root/gcc/auto-inc-dec.c
diff options
context:
space:
mode:
authorSteven Bosscher <steven@gcc.gnu.org>2010-01-03 13:13:03 +0000
committerSteven Bosscher <steven@gcc.gnu.org>2010-01-03 13:13:03 +0000
commitb0de17ef396499ebc675c7c902927984625c1752 (patch)
tree637750849d7de92afc2bfea49d5fe684aeb3e776 /gcc/auto-inc-dec.c
parenta8685e159ea52ae6507622f2a81e73f00ace490f (diff)
downloadgcc-b0de17ef396499ebc675c7c902927984625c1752.tar.gz
postreload-gcse.c (insert_expr_in_table): Replace BLOCK_NUM with BLOCK_FOR_INSN.
* 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. From-SVN: r155586
Diffstat (limited to 'gcc/auto-inc-dec.c')
-rw-r--r--gcc/auto-inc-dec.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/auto-inc-dec.c b/gcc/auto-inc-dec.c
index 830fc5e09f0..7d48f4227c1 100644
--- a/gcc/auto-inc-dec.c
+++ b/gcc/auto-inc-dec.c
@@ -470,7 +470,7 @@ attempt_change (rtx new_addr, rtx inc_reg)
passes are for. The two cases where we have an inc insn will be
handled mov free. */
- basic_block bb = BASIC_BLOCK (BLOCK_NUM (mem_insn.insn));
+ basic_block bb = BLOCK_FOR_INSN (mem_insn.insn);
rtx mov_insn = NULL;
int regno;
rtx mem = *mem_insn.mem_loc;
@@ -746,7 +746,7 @@ get_next_ref (int regno, basic_block bb, rtx *next_array)
rtx insn = next_array[regno];
/* Lazy about cleaning out the next_arrays. */
- if (insn && BASIC_BLOCK (BLOCK_NUM (insn)) != bb)
+ if (insn && BLOCK_FOR_INSN (insn) != bb)
{
next_array[regno] = NULL;
insn = NULL;
@@ -969,7 +969,7 @@ static bool
find_inc (bool first_try)
{
rtx insn;
- basic_block bb = BASIC_BLOCK (BLOCK_NUM (mem_insn.insn));
+ basic_block bb = BLOCK_FOR_INSN (mem_insn.insn);
rtx other_insn;
df_ref *def_rec;
@@ -986,7 +986,7 @@ find_inc (bool first_try)
/* Find the next use that is an inc. */
insn = get_next_ref (REGNO (mem_insn.reg0),
- BASIC_BLOCK (BLOCK_NUM (mem_insn.insn)),
+ BLOCK_FOR_INSN (mem_insn.insn),
reg_next_inc_use);
if (!insn)
return false;
@@ -1042,7 +1042,7 @@ find_inc (bool first_try)
/* Make sure that there is no insn that assigns to inc_insn.res
between the mem_insn and the inc_insn. */
rtx other_insn = get_next_ref (REGNO (inc_insn.reg_res),
- BASIC_BLOCK (BLOCK_NUM (mem_insn.insn)),
+ BLOCK_FOR_INSN (mem_insn.insn),
reg_next_def);
if (other_insn != inc_insn.insn)
{
@@ -1053,7 +1053,7 @@ find_inc (bool first_try)
}
other_insn = get_next_ref (REGNO (inc_insn.reg_res),
- BASIC_BLOCK (BLOCK_NUM (mem_insn.insn)),
+ BLOCK_FOR_INSN (mem_insn.insn),
reg_next_use);
if (other_insn
&& (other_insn != inc_insn.insn)