diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 647cff1daf7..b3440c242eb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-13  Seongbae Park <seongbae.park@gmail.com>
+
+       * bitmap.c (bitmap_and, bitmap_and_compl, bitmap_xor):
+       Ensure dst->current is valid.
+
 2007-02-13  Paul Brook  <paul@codesourcery.com>
 
 	* config.gcc: Add arm*-*-uclinux-*eabi.
diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index 83b553cd5c2..96889e0c7a4 100644
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -797,6 +797,8 @@ bitmap_and (bitmap dst, bitmap a, bitmap b)
 	  b_elt = b_elt->next;
 	}
     }
+  /* Ensure that dst->current is valid.  */
+  dst->current = dst->first;
   bitmap_elt_clear_from (dst, dst_elt);
   gcc_assert (!dst->current == !dst->first);
   if (dst->current)
@@ -910,6 +912,8 @@ bitmap_and_compl (bitmap dst, bitmap a, bitmap b)
 	  b_elt = b_elt->next;
 	}
     }
+  /* Ensure that dst->current is valid.  */
+  dst->current = dst->first;
   bitmap_elt_clear_from (dst, dst_elt);
   gcc_assert (!dst->current == !dst->first);
   if (dst->current)
@@ -1396,6 +1400,8 @@ bitmap_xor (bitmap dst, bitmap a, bitmap b)
 	  dst_elt = dst_elt->next;
 	}
     }
+  /* Ensure that dst->current is valid.  */
+  dst->current = dst->first;
   bitmap_elt_clear_from (dst, dst_elt);
   gcc_assert (!dst->current == !dst->first);
   if (dst->current)