# HG changeset patch
# User tonyp
# Date 1282330870 25200
# Node ID 26faca352942c36974c736b7079fb512ada478e9
# Parent  66b9f90a9211b238ba883f16e5126c861ef26f37# Parent  ee5cc9e784937af2b25333d36f36313b3527963a
Merge

diff -r ee5cc9e78493 -r 26faca352942 src/share/vm/memory/blockOffsetTable.hpp
--- a/src/share/vm/memory/blockOffsetTable.hpp	Fri Aug 20 09:55:50 2010 -0700
+++ b/src/share/vm/memory/blockOffsetTable.hpp	Fri Aug 20 12:01:10 2010 -0700
@@ -163,7 +163,8 @@
       size_t i = index_for(left);
       const size_t end = i + num_cards;
       for (; i < end; i++) {
-        assert(!reducing || _offset_array[i] >= offset, "Not reducing");
+        // Elided until CR 6977974 is fixed properly.
+        // assert(!reducing || _offset_array[i] >= offset, "Not reducing");
         _offset_array[i] = offset;
       }
     }
@@ -184,7 +185,8 @@
       size_t i = left;
       const size_t end = i + num_cards;
       for (; i < end; i++) {
-        assert(!reducing || _offset_array[i] >= offset, "Not reducing");
+        // Elided until CR 6977974 is fixed properly.
+        // assert(!reducing || _offset_array[i] >= offset, "Not reducing");
         _offset_array[i] = offset;
       }
     }