src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp

@@ -170,13 +170,16 @@
  
      // SATB protocol requires to keep alive reachable oops from roots at the beginning of GC
      if (_heap->is_concurrent_mark_in_progress()) {
        ShenandoahKeepAliveClosure oops;
        StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
-     } else if (_heap->is_concurrent_weak_root_in_progress() && _heap->is_evacuation_in_progress()) {
+     } else if (_heap->is_evacuation_in_progress()) {
        ShenandoahContextEvacuateUpdateRootsClosure oops;
        StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
+     } else {
+       ShenandoahNoOpClosure oops;
+       StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
      }
    }
  }
  
  void ShenandoahBarrierSet::write_ref_array(HeapWord* start, size_t count) {