src/share/vm/ci/ciObjectFactory.cpp

@@ -401,11 +401,11 @@
 //
 void ciObjectFactory::ensure_metadata_alive(ciMetadata* m) {
   ASSERT_IN_VM; // We're handling raw oops here.
 
 #if INCLUDE_ALL_GCS
-  if (!UseG1GC) {
+  if (!(UseG1GC || (UseShenandoahGC && ShenandoahSATBBarrier))) {
     return;
   }
   Klass* metadata_owner_klass;
   if (m->is_klass()) {
     metadata_owner_klass = m->as_klass()->get_Klass();