truffle: src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp comparison

comparison src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp @ 20335:eec72fa4b108

8040722: G1: Clean up usages of heap_region_containing Reviewed-by: tschatzl, jmasa

author	brutisso
date	Tue, 19 Aug 2014 12:39:06 +0200
parents	a3953c777565
children	7848fc12602b

comparison

equal deleted inserted replaced

-:ff3169f25621
+:eec72fa4b108
 inline void G1RootRegionScanClosure::do_oop_nv(T* p) {
 T heap_oop = oopDesc::load_heap_oop(p);
 if (!oopDesc::is_null(heap_oop)) {
 oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
 HeapRegion* hr = _g1h->heap_region_containing((HeapWord*) obj);
-if (hr != NULL) {
+_cm->grayRoot(obj, obj->size(), _worker_id, hr);
-_cm->grayRoot(obj, obj->size(), _worker_id, hr);
-}
 }
 }
 template <class T>
 inline void G1Mux2Closure::do_oop_nv(T* p) {
 }
 template <class T>
 inline void G1UpdateRSOrPushRefOopClosure::do_oop_nv(T* p) {
 oop obj = oopDesc::load_decode_heap_oop(p);
+if (obj == NULL) {
+return;
+}
 #ifdef ASSERT
 // can't do because of races
 // assert(obj == NULL || obj->is_oop(), "expected an oop");
 // Do the safe subset of is_oop
-if (obj != NULL) {
 #ifdef CHECK_UNHANDLED_OOPS
 oopDesc* o = obj.obj();
 #else
 oopDesc* o = obj;
 #endif // CHECK_UNHANDLED_OOPS
 assert((intptr_t)o % MinObjAlignmentInBytes == 0, "not oop aligned");
 assert(Universe::heap()->is_in_reserved(obj), "must be in heap");
-}
 #endif // ASSERT
 assert(_from != NULL, "from region must be non-NULL");
 assert(_from->is_in_reserved(p), "p is not in from");
 HeapRegion* to = _g1->heap_region_containing(obj);
-if (to != NULL && _from != to) {
+if (_from == to) {
-// The _record_refs_into_cset flag is true during the RSet
+// Normally this closure should only be called with cross-region references.
-// updating part of an evacuation pause. It is false at all
+// But since Java threads are manipulating the references concurrently and we
-// other times:
+// reload the values things may have changed.
-//  * rebuilding the rembered sets after a full GC
+return;
-//  * during concurrent refinement.
+}
-//  * updating the remembered sets of regions in the collection
+// The _record_refs_into_cset flag is true during the RSet
-//    set in the event of an evacuation failure (when deferred
+// updating part of an evacuation pause. It is false at all
-//    updates are enabled).
+// other times:
+//  * rebuilding the remembered sets after a full GC
-if (_record_refs_into_cset && to->in_collection_set()) {
+//  * during concurrent refinement.
-// We are recording references that point into the collection
+//  * updating the remembered sets of regions in the collection
-// set and this particular reference does exactly that...
+//    set in the event of an evacuation failure (when deferred
-// If the referenced object has already been forwarded
+//    updates are enabled).
-// to itself, we are handling an evacuation failure and
-// we have already visited/tried to copy this object
+if (_record_refs_into_cset && to->in_collection_set()) {
-// there is no need to retry.
+// We are recording references that point into the collection
-if (!self_forwarded(obj)) {
+// set and this particular reference does exactly that...
-assert(_push_ref_cl != NULL, "should not be null");
+// If the referenced object has already been forwarded
-// Push the reference in the refs queue of the G1ParScanThreadState
+// to itself, we are handling an evacuation failure and
-// instance for this worker thread.
+// we have already visited/tried to copy this object
-_push_ref_cl->do_oop(p);
+// there is no need to retry.
-}
+if (!self_forwarded(obj)) {
+assert(_push_ref_cl != NULL, "should not be null");
-// Deferred updates to the CSet are either discarded (in the normal case),
+// Push the reference in the refs queue of the G1ParScanThreadState
-// or processed (if an evacuation failure occurs) at the end
+// instance for this worker thread.
-// of the collection.
+_push_ref_cl->do_oop(p);
-// See G1RemSet::cleanup_after_oops_into_collection_set_do().
+}
-return;
-}
+// Deferred updates to the CSet are either discarded (in the normal case),
+// or processed (if an evacuation failure occurs) at the end
+// of the collection.
+// See G1RemSet::cleanup_after_oops_into_collection_set_do().
+} else {
 // We either don't care about pushing references that point into the
 // collection set (i.e. we're not during an evacuation pause) _or_
 // the reference doesn't point into the collection set. Either way
 // we add the reference directly to the RSet of the region containing
 // the referenced object.

Mercurial > hg > truffle

comparison src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp @ 20335:eec72fa4b108