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

@@ -186,10 +186,15 @@
        && strcmp(ShenandoahGCHeuristics, "adaptive") != 0) {
      log_warning(gc)("Ignoring -XX:ShenandoahGCHeuristics input: %s, because generational shenandoah only"
        " supports adaptive heuristics", ShenandoahGCHeuristics);
    }
  
+   if (ShenandoahGCStateCheckHotpatch && NMethodRelocation) {
+     log_warning(gc)("Hot patching is not yet supported with NMethod relocation, disabling");
+     FLAG_SET_DEFAULT(ShenandoahGCStateCheckHotpatch, false);
+   }
+ 
    FullGCForwarding::initialize_flags(MaxHeapSize);
  }
  
  size_t ShenandoahArguments::conservative_max_heap_alignment() {
    size_t align = next_power_of_2(ShenandoahMaxRegionSize);