Fix version of patch from previous commit ;(

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161199 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 8 insertions, 4 deletions

diff --git a/gcc/df-problems.c b/gcc/df-problems.c
index 431027a41e0..1196e81e729 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);
 }