src/hotspot/share/gc/shenandoah/shenandoahBarrierSetClone.inline.hpp

rev 58671 : 8242130: Shenandoah: Simplify arraycopy-barrier dispatching
rev 58672 : Shenandoah: New incremental-update mode
rev 58673 : [mq]: JDK-8242054-01.patch

@@ -82,10 +82,11 @@
 }
 
 void ShenandoahBarrierSet::clone_evacuation(oop obj) {
   assert(_heap->is_evacuation_in_progress(), "only during evacuation");
   if (need_bulk_update(cast_from_oop<HeapWord*>(obj))) {
+    ShenandoahEvacOOMScope oom_evac_scope;
     ShenandoahUpdateRefsForOopClosure</* has_fwd = */ true, /* evac = */ true, /* enqueue */ false> cl;
     obj->oop_iterate(&cl);
   }
 }
 

@@ -100,13 +101,13 @@
 void ShenandoahBarrierSet::clone_barrier(oop obj) {
   assert(ShenandoahCloneBarrier, "only get here with clone barriers enabled");
   shenandoah_assert_correct(NULL, obj);
 
   int gc_state = _heap->gc_state();
-  if ((gc_state != ShenandoahHeap::MARKING) != 0) {
+  if ((gc_state & ShenandoahHeap::MARKING) != 0) {
     clone_marking(obj);
-  } else if ((gc_state != ShenandoahHeap::EVACUATION) != 0) {
+  } else if ((gc_state & ShenandoahHeap::EVACUATION) != 0) {
     clone_evacuation(obj);
   } else {
     clone_update(obj);
   }
 }