From: Mike Stump <mikestump@comcast.net>
Date: Fri, 28 Nov 2014 22:23:59 +0000 (+0000)
Subject: bitmap.c (bitmap_ior, bitmap_ior_and_compl): Zap current as it could be deleted.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e5d3a2c07c230635986fce17f9ddeffcc2de44f;p=gcc.git

bitmap.c (bitmap_ior, bitmap_ior_and_compl): Zap current as it could be deleted.

From-SVN: r218173
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 92e0af5dff7..9a525e5fe02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-28  Mike Stump  <mikestump@comcast.net>
+
+	* bitmap.c (bitmap_ior): Zap current as it could be deleted.
+	(bitmap_ior_and_compl): Likewise.
+
 2014-11-28  Vladimir Makarov  <vmakarov@redhat.com>
 
 	PR target/64061
diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index 8f7f3064be6..ace6aea3512 100644
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -1595,6 +1595,8 @@ bitmap_ior (bitmap dst, const_bitmap a, const_bitmap b)
   if (dst_elt)
     {
       changed = true;
+      /* Ensure that dst->current is valid.  */
+      dst->current = dst->first;
       bitmap_elt_clear_from (dst, dst_elt);
     }
   gcc_checking_assert (!dst->current == !dst->first);
@@ -1951,6 +1953,8 @@ bitmap_ior_and_compl (bitmap dst, const_bitmap a, const_bitmap b, const_bitmap k
   if (dst_elt)
     {
       changed = true;
+      /* Ensure that dst->current is valid.  */
+      dst->current = dst->first;
       bitmap_elt_clear_from (dst, dst_elt);
     }
   gcc_checking_assert (!dst->current == !dst->first);