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

rev 58648 : Shenandoah: New incremental-update mode

@@ -85,11 +85,12 @@
     enqueue(value);
   }
 }
 
 inline void ShenandoahBarrierSet::storeval_barrier(oop obj) {
-  if (obj != NULL && ShenandoahStoreValEnqueueBarrier && _heap->is_concurrent_traversal_in_progress()) {
+  if (obj != NULL && ShenandoahStoreValEnqueueBarrier &&
+      _heap->is_gc_in_progress_mask(ShenandoahHeap::MARKING | ShenandoahHeap::TRAVERSAL)) {
     enqueue(obj);
   }
 }
 
 inline void ShenandoahBarrierSet::keep_alive_if_weak(DecoratorSet decorators, oop value) {

@@ -285,13 +286,15 @@
   }
 }
 
 template <class T>
 void ShenandoahBarrierSet::arraycopy_pre_work(T* src, T* dst, size_t count) {
-  if (_heap->is_concurrent_mark_in_progress() &&
-      !_heap->marking_context()->allocated_after_mark_start(reinterpret_cast<HeapWord*>(dst))) {
-    arraycopy_work<T, false, false, true>(dst, count);
+  if (_heap->is_concurrent_mark_in_progress()) {
+    T* array = ShenandoahSATBBarrier ? dst : src;
+    if (!_heap->marking_context()->allocated_after_mark_start(reinterpret_cast<HeapWord*>(array))) {
+      arraycopy_work<T, false, false, true>(array, count);
+    }
   }
 
   if (_heap->has_forwarded_objects()) {
     arraycopy_update_impl(src, count);
   }