src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp

@@ -59,13 +59,16 @@
     obj = copy_to_survivor_space(in_cset_state, obj, m);
   }
   RawAccess<IS_NOT_NULL>::oop_store(p, obj);
 
   assert(obj != NULL, "Must be");
-  if (!HeapRegion::is_in_same_region(p, obj)) {
+  if (HeapRegion::is_in_same_region(p, obj)) {
+    return;
+  }
     HeapRegion* from = _g1h->heap_region_containing(p);
-    update_rs(from, p, obj);
+  if (!from->is_young()) {
+    enqueue_card_if_tracked(p, obj);
   }
 }
 
 template <class T> inline void G1ParScanThreadState::push_on_queue(T* ref) {
   assert(verify_ref(ref), "sanity");

@@ -107,11 +110,13 @@
     assert(length == end, "sanity");
     // We'll process the final range for this object. Restore the length
     // so that the heap remains parsable in case of evacuation failure.
     to_obj_array->set_length(end);
   }
-  _scanner.set_region(_g1h->heap_region_containing(to_obj));
+
+  HeapRegion* hr = _g1h->heap_region_containing(to_obj);
+  _scanner.set_scanning_in_young(hr->is_young());
   // Process indexes [start,end). It will also process the header
   // along with the first chunk (i.e., the chunk with start == 0).
   // Note that at this point the length field of to_obj_array is not
   // correct given that we are using it to keep track of the next
   // start index. oop_iterate_range() (thankfully!) ignores the length