src/share/vm/code/nmethod.cpp

@@ -489,11 +489,11 @@
 #endif
 
   _oops_do_mark_link       = NULL;
   _jmethod_id              = NULL;
   _osr_link                = NULL;
-  if (UseG1GC) {
+  if (UseG1GC || UseShenandoahGC) {
     _unloading_next        = NULL;
   } else {
     _scavenge_root_link    = NULL;
   }
   _scavenge_root_state     = 0;

@@ -2835,11 +2835,11 @@
   }
   virtual void do_oop(narrowOop* p) { ShouldNotReachHere(); }
 };
 
 void nmethod::verify_scavenge_root_oops() {
-  if (UseG1GC) {
+  if (UseG1GC || UseShenandoahGC) {
     return;
   }
 
   if (!on_scavenge_root_list()) {
     // Actually look inside, to verify the claim that it's clean.