1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Wed Sep 25 17:47:51 2013 +0200 1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Sep 26 10:25:02 2013 -0400 1.3 @@ -703,7 +703,7 @@ 1.4 if (_g1_committed.contains((HeapWord*) obj)) { 1.5 // no need to subtract the bottom of the heap from obj, 1.6 // _in_cset_fast_test is biased 1.7 - uintx index = (uintx) obj >> HeapRegion::LogOfHRGrainBytes; 1.8 + uintx index = cast_from_oop<uintx>(obj) >> HeapRegion::LogOfHRGrainBytes; 1.9 bool ret = _in_cset_fast_test[index]; 1.10 // let's make sure the result is consistent with what the slower 1.11 // test returns