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

*** 157,10 ***
--- 157,25 ---
      FLAG_SET_DEFAULT(UseCountedLoopSafepoints, true);
      if (FLAG_IS_DEFAULT(LoopStripMiningIter)) {
        FLAG_SET_DEFAULT(LoopStripMiningIter, 1000);
      }
    }
+ 
+   if (NMethodRelocation) {
+     warning("NMethod relocation is not supported with hotpatching yet");
+     FLAG_SET_DEFAULT(NMethodRelocation, false);
+   }
+ 
+   if (HotCodeHeap) {
+     warning("Hot code heap is not supported with hotpatching yet");
+     FLAG_SET_DEFAULT(HotCodeHeap, false);
+   }
+ 
+   if (HotCodeHeapSize) {
+     warning("Hot code heap is not supported with hotpatching yet");
+     FLAG_SET_DEFAULT(HotCodeHeapSize, 0);
+   }
  #endif // COMPILER2
  
    // Record more information about previous cycles for improved debugging pleasure
    if (FLAG_IS_DEFAULT(LogEventsBufferEntries)) {
      FLAG_SET_DEFAULT(LogEventsBufferEntries, 250);