src/share/vm/prims/jvm.cpp

@@ -585,11 +585,11 @@
 
 static void fixup_cloned_reference(ReferenceType ref_type, oop src, oop clone) {
   // If G1 is enabled then we need to register a non-null referent
   // with the SATB barrier.
 #if INCLUDE_ALL_GCS
-  if (UseG1GC) {
+  if (UseG1GC || (UseShenandoahGC && ShenandoahKeepAliveBarrier)) {
     oop referent = java_lang_ref_Reference::referent(clone);
     if (referent != NULL) {
       G1SATBCardTableModRefBS::enqueue(referent);
     }
   }

@@ -1148,11 +1148,10 @@
   }
 
   return (jclass) JNIHandles::make_local(env, k->java_mirror());
 }
 
-
 JVM_ENTRY(jclass, JVM_DefineClass(JNIEnv *env, const char *name, jobject loader, const jbyte *buf, jsize len, jobject pd))
   JVMWrapper2("JVM_DefineClass %s", name);
 
   return jvm_define_class_common(env, name, loader, buf, len, pd, NULL, true, THREAD);
 JVM_END

@@ -1563,11 +1562,11 @@
       protection_domain  = thread->privileged_stack_top()->protection_domain();
     } else {
       protection_domain = method->method_holder()->protection_domain();
     }
 
-    if ((previous_protection_domain != protection_domain) && (protection_domain != NULL)) {
+    if ((previous_protection_domain != protection_domain) && protection_domain != NULL) {
       local_array->push(protection_domain);
       previous_protection_domain = protection_domain;
     }
 
     if (is_privileged) break;