OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cse.c (is_dead_reg): Change argument to const_rtx. 

gcc/
	* cse.c (is_dead_reg): Change argument to const_rtx.
	(dead_debug_insn_data): Delete.
	(is_dead_debug_insn): Expand commentary.  Turn from being a
	for_each_rtx callback to being a function that examines
	each subrtx itself.  Take the fields of dead_debug_insn_data
	as argument.
	(delete_trivially_dead_insns): Update call accordingly.

From-SVN: r214630
This commit is contained in:
Richard Sandiford 2014-08-28 06:22:38 +00:00 committed by Richard Sandiford
parent f000294852
commit a5b9bc172a
2 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2014-08-28 Richard Sandiford <rdsandiford@googlemail.com>
* cse.c (is_dead_reg): Change argument to const_rtx.
(dead_debug_insn_data): Delete.
(is_dead_debug_insn): Expand commentary. Turn from being a
for_each_rtx callback to being a function that examines
each subrtx itself. Take the fields of dead_debug_insn_data
as argument.
(delete_trivially_dead_insns): Update call accordingly.
2014-08-28 Richard Sandiford <rdsandiford@googlemail.com> 2014-08-28 Richard Sandiford <rdsandiford@googlemail.com>
* cse.c (check_for_label_ref): Move earlier in file. Turn from * cse.c (check_for_label_ref): Move earlier in file. Turn from

54
gcc/cse.c
View File

@ -6784,7 +6784,7 @@ count_reg_usage (rtx x, int *counts, rtx dest, int incr)
/* Return true if X is a dead register. */ /* Return true if X is a dead register. */
static inline int static inline int
is_dead_reg (rtx x, int *counts) is_dead_reg (const_rtx x, int *counts)
{ {
return (REG_P (x) return (REG_P (x)
&& REGNO (x) >= FIRST_PSEUDO_REGISTER && REGNO (x) >= FIRST_PSEUDO_REGISTER
@ -6871,30 +6871,29 @@ count_stores (rtx x, const_rtx set ATTRIBUTE_UNUSED, void *data)
counts[REGNO (x)]++; counts[REGNO (x)]++;
} }
struct dead_debug_insn_data /* Return if DEBUG_INSN pattern PAT needs to be reset because some dead
pseudo doesn't have a replacement. COUNTS[X] is zero if register X
is dead and REPLACEMENTS[X] is null if it has no replacemenet.
Set *SEEN_REPL to true if we see a dead register that does have
a replacement. */
static bool
is_dead_debug_insn (const_rtx pat, int *counts, rtx *replacements,
bool *seen_repl)
{ {
int *counts; subrtx_iterator::array_type array;
rtx *replacements; FOR_EACH_SUBRTX (iter, array, pat, NONCONST)
bool seen_repl;
};
/* Return if a DEBUG_INSN needs to be reset because some dead
pseudo doesn't have a replacement. Callback for for_each_rtx. */
static int
is_dead_debug_insn (rtx *loc, void *data)
{
rtx x = *loc;
struct dead_debug_insn_data *ddid = (struct dead_debug_insn_data *) data;
if (is_dead_reg (x, ddid->counts))
{ {
if (ddid->replacements && ddid->replacements[REGNO (x)] != NULL_RTX) const_rtx x = *iter;
ddid->seen_repl = true; if (is_dead_reg (x, counts))
else {
return 1; if (replacements && replacements[REGNO (x)] != NULL_RTX)
*seen_repl = true;
else
return true;
}
} }
return 0; return false;
} }
/* Replace a dead pseudo in a DEBUG_INSN with replacement DEBUG_EXPR. /* Replace a dead pseudo in a DEBUG_INSN with replacement DEBUG_EXPR.
@ -7038,22 +7037,19 @@ delete_trivially_dead_insns (rtx_insn *insns, int nreg)
if (MAY_HAVE_DEBUG_INSNS) if (MAY_HAVE_DEBUG_INSNS)
{ {
struct dead_debug_insn_data ddid;
ddid.counts = counts;
ddid.replacements = replacements;
for (insn = get_last_insn (); insn; insn = PREV_INSN (insn)) for (insn = get_last_insn (); insn; insn = PREV_INSN (insn))
if (DEBUG_INSN_P (insn)) if (DEBUG_INSN_P (insn))
{ {
/* If this debug insn references a dead register that wasn't replaced /* If this debug insn references a dead register that wasn't replaced
with an DEBUG_EXPR, reset the DEBUG_INSN. */ with an DEBUG_EXPR, reset the DEBUG_INSN. */
ddid.seen_repl = false; bool seen_repl = false;
if (for_each_rtx (&INSN_VAR_LOCATION_LOC (insn), if (is_dead_debug_insn (INSN_VAR_LOCATION_LOC (insn),
is_dead_debug_insn, &ddid)) counts, replacements, &seen_repl))
{ {
INSN_VAR_LOCATION_LOC (insn) = gen_rtx_UNKNOWN_VAR_LOC (); INSN_VAR_LOCATION_LOC (insn) = gen_rtx_UNKNOWN_VAR_LOC ();
df_insn_rescan (insn); df_insn_rescan (insn);
} }
else if (ddid.seen_repl) else if (seen_repl)
{ {
INSN_VAR_LOCATION_LOC (insn) INSN_VAR_LOCATION_LOC (insn)
= simplify_replace_fn_rtx (INSN_VAR_LOCATION_LOC (insn), = simplify_replace_fn_rtx (INSN_VAR_LOCATION_LOC (insn),