changeset 1653:66b9f90a9211

Merge
author tonyp
date Fri, 20 Aug 2010 13:17:08 -0400
parents 09cdb1e1c77b 52f2bc645da5
children 26faca352942
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
       }
     }