Merge

Fri, 20 Aug 2010 13:17:08 -0400

author
tonyp
date
Fri, 20 Aug 2010 13:17:08 -0400
changeset 2088
66b9f90a9211
parent 2080
09cdb1e1c77b
parent 2087
52f2bc645da5
child 2089
26faca352942

Merge

     1.1 --- a/src/share/vm/memory/blockOffsetTable.hpp	Fri Aug 20 04:08:08 2010 -0700
     1.2 +++ b/src/share/vm/memory/blockOffsetTable.hpp	Fri Aug 20 13:17:08 2010 -0400
     1.3 @@ -163,7 +163,8 @@
     1.4        size_t i = index_for(left);
     1.5        const size_t end = i + num_cards;
     1.6        for (; i < end; i++) {
     1.7 -        assert(!reducing || _offset_array[i] >= offset, "Not reducing");
     1.8 +        // Elided until CR 6977974 is fixed properly.
     1.9 +        // assert(!reducing || _offset_array[i] >= offset, "Not reducing");
    1.10          _offset_array[i] = offset;
    1.11        }
    1.12      }
    1.13 @@ -184,7 +185,8 @@
    1.14        size_t i = left;
    1.15        const size_t end = i + num_cards;
    1.16        for (; i < end; i++) {
    1.17 -        assert(!reducing || _offset_array[i] >= offset, "Not reducing");
    1.18 +        // Elided until CR 6977974 is fixed properly.
    1.19 +        // assert(!reducing || _offset_array[i] >= offset, "Not reducing");
    1.20          _offset_array[i] = offset;
    1.21        }
    1.22      }

mercurial