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

@@ -177,10 +177,13 @@
          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()) {
          ShenandoahContextEvacuateUpdateRootsClosure oops;
          StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
+       } else if (ShenandoahGCStateCheckHotpatch) {
+         ShenandoahNoOpClosure oops;
+         StackWatermarkSet::finish_processing(JavaThread::cast(thread), &oops, StackWatermarkKind::gc);
        }
      }
    }
  }