Merge
authortonyp
Fri, 20 Aug 2010 13:17:08 -0400
changeset 6275 3d7dee90a261
parent 6267 853e0eb61827 (current diff)
parent 6274 a4a2e26fe2d0 (diff)
child 6276 bd231ac039dc
Merge
--- a/hotspot/src/share/vm/memory/blockOffsetTable.hpp	Fri Aug 20 04:08:08 2010 -0700
+++ b/hotspot/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;
       }
     }