* bitmap.h (bitmap_and, bitmap_and_into, bitmap_and_compl,

	bitmap_and_compl_into, bitmap_ior, bitmap_iot_into,
	bitmap_ior_compl, bitmap_xor, bitmap_xor_into): Produce void.
	(bitmap_ior_and_compl_into): Produce bool.
	(bitmap_union_of_diff): Rename to ...
	(bitmap_ior_and_compl): ... here. Produce bool.
	* bitmap.c (bitmap_ior_and_compl_into): Return bool. Use
	bitmap_operation directly.
	(bitmap_union_of_diff): Rename to ...
	(bitmap_ior_and_compl): ... here. Return bool, use
	bitmap_operation directly.
	* df.c (df_rd_transfer_function): Use bitmap_ior_and_compl.
	(df_ru_transfer_function, df_lr_transfer_function): Likewise.
	* global.c (modify_bb_reg_pav): Likewise.


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

1 files changed, 8 insertions, 7 deletions

diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index c78912b28ff..57939ff4a33 100644
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -743,10 +743,9 @@ bitmap_intersect_compl_p (bitmap a, bitmap b)
 }
 
 
-/* Or into bitmap TO bitmap FROM1 and'ed with the complement of
-   bitmap FROM2.  */
+/* Produce TO |= FROM1 & ~FROM2.  Return true, if TO changed.  */
 
-int
+bool
 bitmap_ior_and_compl_into (bitmap to, bitmap from1, bitmap from2)
 {
   bitmap_head tmp;
@@ -756,13 +755,15 @@ bitmap_ior_and_compl_into (bitmap to, bitmap from1, bitmap from2)
   tmp.using_obstack = 0;
 
   bitmap_and_compl (&tmp, from1, from2);
-  changed = bitmap_ior_into (to, &tmp);
+  changed = bitmap_operation (to, to, &tmp, BITMAP_IOR);
   bitmap_clear (&tmp);
   return changed;
 }
 
-int
-bitmap_union_of_diff (bitmap dst, bitmap a, bitmap b, bitmap c)
+/* Produce DST = A | (B & ~C).  Return true if DST != A.  */
+
+bool
+bitmap_ior_and_compl (bitmap dst, bitmap a, bitmap b, bitmap c)
 {
   bitmap_head tmp;
   int changed;
@@ -771,7 +772,7 @@ bitmap_union_of_diff (bitmap dst, bitmap a, bitmap b, bitmap c)
   tmp.using_obstack = 0;
 
   bitmap_and_compl (&tmp, b, c);
-  changed = bitmap_ior (dst, &tmp, a);
+  changed = bitmap_operation (dst, a, &tmp, BITMAP_IOR);
   bitmap_clear (&tmp);
 
   return changed;