# HG changeset patch
# User tonyp
# Date 1282324628 14400
# Node ID 66b9f90a9211b238ba883f16e5126c861ef26f37
# Parent  09cdb1e1c77b089ae9518de6626d1a83a76d3b00# Parent  52f2bc645da5eff8ba2cf9bdfa37d501ff469b5a
Merge

diff -r 09cdb1e1c77b -r 66b9f90a9211 src/share/vm/memory/blockOffsetTable.hpp
--- a/src/share/vm/memory/blockOffsetTable.hpp	Fri Aug 20 04:08:08 2010 -0700
+++ b/src/share/vm/memory/blockOffsetTable.hpp	Fri Aug 20 13:17:08 2010 -0400
@@ -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;
       }
     }