1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Wed Apr 16 10:14:50 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp Mon Jul 21 09:40:19 2014 +0200
1.3 @@ -178,12 +178,7 @@
1.4 // collection set or not. Assume that the reference
1.5 // points into the heap.
1.6 inline bool G1CollectedHeap::in_cset_fast_test(oop obj) {
1.7 - assert(_in_cset_fast_test != NULL, "sanity");
1.8 - assert(_g1_committed.contains((HeapWord*) obj), err_msg("Given reference outside of heap, is "PTR_FORMAT, p2i((HeapWord*)obj)));
1.9 - // no need to subtract the bottom of the heap from obj,
1.10 - // _in_cset_fast_test is biased
1.11 - uintx index = cast_from_oop<uintx>(obj) >> HeapRegion::LogOfHRGrainBytes;
1.12 - bool ret = _in_cset_fast_test[index];
1.13 + bool ret = _in_cset_fast_test.get_by_address((HeapWord*)obj);
1.14 // let's make sure the result is consistent with what the slower
1.15 // test returns
1.16 assert( ret || !obj_in_cs(obj), "sanity");
