From fcf7ca2a9ee9a8742db9f041b6379cbd2afedf66 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 18 Dec 2012 22:40:29 +0100
Subject: re PR target/55562 (FAIL: gcc.dg/sms-* on powerpc*-*-*)

	PR target/55562
	* sbitmap.c (bitmap_and, bitmap_xor, bitmap_ior): Return whether
	dst sbitmap changed even if it doesn't have popcount.

From-SVN: r194591
---
 gcc/ChangeLog |  6 ++++++
 gcc/sbitmap.c | 36 +++++++++++++++---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'gcc')

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 952c7e7..7b103fe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-18  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/55562
+	* sbitmap.c (bitmap_and, bitmap_xor, bitmap_ior): Return whether
+	dst sbitmap changed even if it doesn't have popcount.
+
 2012-12-18  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* config/aarch64/aarch64.md (insv_imm<mode>): Add modes
diff --git a/gcc/sbitmap.c b/gcc/sbitmap.c
index b50c82e..884c9a6 100644
--- a/gcc/sbitmap.c
+++ b/gcc/sbitmap.c
@@ -434,28 +434,26 @@ bitmap_and (sbitmap dst, const_sbitmap a, const_sbitmap b)
   const_sbitmap_ptr bp = b->elms;
   bool has_popcount = dst->popcount != NULL;
   unsigned char *popcountp = dst->popcount;
-  bool anychange = false;
+  SBITMAP_ELT_TYPE changed = 0;
 
   for (i = 0; i < n; i++)
     {
       const SBITMAP_ELT_TYPE tmp = *ap++ & *bp++;
+      SBITMAP_ELT_TYPE wordchanged = *dstp ^ tmp;
       if (has_popcount)
 	{
-	  bool wordchanged = (*dstp ^ tmp) != 0;
 	  if (wordchanged)
-	    {
-	      *popcountp = do_popcount (tmp);
-	      anychange = true;
-	    }
+	    *popcountp = do_popcount (tmp);
 	  popcountp++;
 	}
       *dstp++ = tmp;
+      changed |= wordchanged;
     }
 #ifdef BITMAP_DEBUGGING
   if (has_popcount)
     sbitmap_verify_popcount (dst);
 #endif
-  return anychange;
+  return changed != 0;
 }
 
 /* Set DST to be (A xor B)).
@@ -470,28 +468,26 @@ bitmap_xor (sbitmap dst, const_sbitmap a, const_sbitmap b)
   const_sbitmap_ptr bp = b->elms;
   bool has_popcount = dst->popcount != NULL;
   unsigned char *popcountp = dst->popcount;
-  bool anychange = false;
+  SBITMAP_ELT_TYPE changed = 0;
 
   for (i = 0; i < n; i++)
     {
       const SBITMAP_ELT_TYPE tmp = *ap++ ^ *bp++;
+      SBITMAP_ELT_TYPE wordchanged = *dstp ^ tmp;
       if (has_popcount)
 	{
-	  bool wordchanged = (*dstp ^ tmp) != 0;
 	  if (wordchanged)
-	    {
-	      *popcountp = do_popcount (tmp);
-	      anychange = true;
-	    }
+	    *popcountp = do_popcount (tmp);
 	  popcountp++;
 	}
       *dstp++ = tmp;
+      changed |= wordchanged;
     }
 #ifdef BITMAP_DEBUGGING
   if (has_popcount)
     sbitmap_verify_popcount (dst);
 #endif
-  return anychange;
+  return changed != 0;
 }
 
 /* Set DST to be (A or B)).
@@ -506,28 +502,26 @@ bitmap_ior (sbitmap dst, const_sbitmap a, const_sbitmap b)
   const_sbitmap_ptr bp = b->elms;
   bool has_popcount = dst->popcount != NULL;
   unsigned char *popcountp = dst->popcount;
-  bool anychange = false;
+  SBITMAP_ELT_TYPE changed = 0;
 
   for (i = 0; i < n; i++)
     {
       const SBITMAP_ELT_TYPE tmp = *ap++ | *bp++;
+      SBITMAP_ELT_TYPE wordchanged = *dstp ^ tmp;
       if (has_popcount)
 	{
-	  bool wordchanged = (*dstp ^ tmp) != 0;
 	  if (wordchanged)
-	    {
-	      *popcountp = do_popcount (tmp);
-	      anychange = true;
-	    }
+	    *popcountp = do_popcount (tmp);
 	  popcountp++;
 	}
       *dstp++ = tmp;
+      changed |= wordchanged;
     }
 #ifdef BITMAP_DEBUGGING
   if (has_popcount)
     sbitmap_verify_popcount (dst);
 #endif
-  return anychange;
+  return changed != 0;
 }
 
 /* Return nonzero if A is a subset of B.  */
-- 
cgit v1.1