aboutsummaryrefslogtreecommitdiff
path: root/gcc/config/c6x
diff options
context:
space:
mode:
authorSandra Loosemore <sandra@codesourcery.com>2015-06-30 22:15:32 -0400
committerSandra Loosemore <sandra@gcc.gnu.org>2015-06-30 22:15:32 -0400
commit1e32ce0bc5b459c4743f0f77b8f005dfa94da36f (patch)
tree096fef90e0d1d6ce1cd5354800d87df4cfc436e0 /gcc/config/c6x
parentf58d5e069d601551cbc072919789e46f7fe3c77d (diff)
downloadgcc-1e32ce0bc5b459c4743f0f77b8f005dfa94da36f.zip
gcc-1e32ce0bc5b459c4743f0f77b8f005dfa94da36f.tar.gz
gcc-1e32ce0bc5b459c4743f0f77b8f005dfa94da36f.tar.bz2
c6x.c (try_rename_operands): Do not depend on gcc_assert evaluating its argument for side-effect.
2015-06-30 Sandra Loosemore <sandra@codesourcery.com> gcc/ * config/c6x/c6x.c (try_rename_operands): Do not depend on gcc_assert evaluating its argument for side-effect. From-SVN: r225221
Diffstat (limited to 'gcc/config/c6x')
-rw-r--r--gcc/config/c6x/c6x.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/config/c6x/c6x.c b/gcc/config/c6x/c6x.c
index b76a268..159335d 100644
--- a/gcc/config/c6x/c6x.c
+++ b/gcc/config/c6x/c6x.c
@@ -3450,6 +3450,7 @@ try_rename_operands (rtx_insn *head, rtx_insn *tail, unit_req_table reqs,
int best_reg, old_reg;
vec<du_head_p> involved_chains = vNULL;
unit_req_table new_reqs;
+ bool ok;
for (i = 0, tmp_mask = op_mask; tmp_mask; i++)
{
@@ -3516,7 +3517,8 @@ try_rename_operands (rtx_insn *head, rtx_insn *tail, unit_req_table reqs,
best_reg =
find_rename_reg (this_head, super_class, &unavailable, old_reg, true);
- gcc_assert (regrename_do_replace (this_head, best_reg));
+ ok = regrename_do_replace (this_head, best_reg);
+ gcc_assert (ok);
count_unit_reqs (new_reqs, head, PREV_INSN (tail));
merge_unit_reqs (new_reqs);
@@ -3529,7 +3531,10 @@ try_rename_operands (rtx_insn *head, rtx_insn *tail, unit_req_table reqs,
unit_req_imbalance (reqs), unit_req_imbalance (new_reqs));
}
if (unit_req_imbalance (new_reqs) > unit_req_imbalance (reqs))
- gcc_assert (regrename_do_replace (this_head, old_reg));
+ {
+ ok = regrename_do_replace (this_head, old_reg);
+ gcc_assert (ok);
+ }
else
memcpy (reqs, new_reqs, sizeof (unit_req_table));