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

@@ -185,11 +185,12 @@
    return false;
  }
  
  void ShenandoahGenerationalHeap::evacuate_collection_set(ShenandoahGeneration* generation, bool concurrent) {
    ShenandoahRegionIterator regions;
-   ShenandoahGenerationalEvacuationTask task(this, generation, &regions, concurrent, false /* only promote regions */);
+   ShenandoahGenerationalEvacuationTask task(this, generation, &regions, concurrent,
+                                            (ShenandoahGCStateCheckHotpatch ? collection_set()->is_empty() : false) /* only promote regions */);
    workers()->run_task(&task);
  }
  
  void ShenandoahGenerationalHeap::promote_regions_in_place(ShenandoahGeneration* generation, bool concurrent) {
    ShenandoahRegionIterator regions;