hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
changeset 26326 d36e8d9dcac8
parent 26320 fc0a95c692f5
child 26696 623a25e6c686
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Wed Aug 27 08:59:05 2014 +0200
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	Thu Aug 28 17:05:41 2014 +0200
@@ -888,7 +888,16 @@
   }
 
   virtual bool doHeapRegion(HeapRegion* r) {
-    return _bitmap->getNextMarkedWordAddress(r->bottom(), r->end()) != r->end();
+    // This closure can be called concurrently to the mutator, so we must make sure
+    // that the result of the getNextMarkedWordAddress() call is compared to the
+    // value passed to it as limit to detect any found bits.
+    // We can use the region's orig_end() for the limit and the comparison value
+    // as it always contains the "real" end of the region that never changes and
+    // has no side effects.
+    // Due to the latter, there can also be no problem with the compiler generating
+    // reloads of the orig_end() call.
+    HeapWord* end = r->orig_end();
+    return _bitmap->getNextMarkedWordAddress(r->bottom(), end) != end;
   }
 };