Merge

f5c0a6a3 · tonyp · 703a1c77 · 548a4d98 · f5c0a6a3
隐藏空白更改
内联并排

Showing with 4 addition and 2 deletion

src/share/vm/memory/blockOffsetTable.hpp src/share/vm/memory/blockOffsetTable.hpp +4 -2

未找到文件。
--- a/src/share/vm/memory/blockOffsetTable.hpp
+++ b/src/share/vm/memory/blockOffsetTable.hpp
@@ -163,7 +163,8 @@ class BlockOffsetSharedArray: public CHeapObj {
      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 @@ class BlockOffsetSharedArray: public CHeapObj {
      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;
      }
    }