aboutsummaryrefslogtreecommitdiff
path: root/gcc/df-problems.c
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@gcc.gnu.org>2010-06-22 16:02:34 +0000
committerJan Hubicka <hubicka@gcc.gnu.org>2010-06-22 16:02:34 +0000
commit50b2e859965b43c6537acabd9a4e882204c89b42 (patch)
tree84b9b4144b79810bb743e2fb9bb71b47ba26829c /gcc/df-problems.c
parentc42bfef297354c8859e97ca7c3f32b0899b52f67 (diff)
downloadgcc-50b2e859965b43c6537acabd9a4e882204c89b42.zip
gcc-50b2e859965b43c6537acabd9a4e882204c89b42.tar.gz
gcc-50b2e859965b43c6537acabd9a4e882204c89b42.tar.bz2
Fix version of patch from previous commit ;(
From-SVN: r161199
Diffstat (limited to 'gcc/df-problems.c')
-rw-r--r--gcc/df-problems.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index 431027a..1196e81 100644
--- a/gcc/df-problems.c
+++ b/gcc/df-problems.c
@@ -983,7 +983,8 @@ df_lr_confluence_n (edge e)
else
changed = bitmap_ior_into (op1, op2);
- return bitmap_ior_into (op1, &df->hardware_regs_used) || changed;
+ changed |= bitmap_ior_into (op1, &df->hardware_regs_used);
+ return changed;
}
@@ -2726,11 +2727,13 @@ df_byte_lr_confluence_n (edge e)
/* ??? Abnormal call edges ignored for the moment, as this gets
confused by sibling call edges, which crashes reg-stack. */
if (e->flags & EDGE_EH)
- changed = bitmap_ior_and_compl_into (op1, op2, &problem_data->invalidated_by_call);
+ changed = bitmap_ior_and_compl_into (op1, op2,
+ &problem_data->invalidated_by_call);
else
changed = bitmap_ior_into (op1, op2);
- return bitmap_ior_into (op1, &problem_data->hardware_regs_used) || changed;
+ changed |= bitmap_ior_into (op1, &problem_data->hardware_regs_used);
+ return changed;
}
@@ -4440,7 +4443,8 @@ df_md_confluence_n (edge e)
return false;
if (e->flags & EDGE_EH)
- return bitmap_ior_and_compl_into (op1, op2, regs_invalidated_by_call_regset);
+ return bitmap_ior_and_compl_into (op1, op2,
+ regs_invalidated_by_call_regset);
else
return bitmap_ior_into (op1, op2);
}