src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp

rev 11463 : Backport Traversal GC

@@ -691,11 +691,11 @@
   address entry = __ pc();
 
   const int referent_offset = java_lang_ref_Reference::referent_offset;
   guarantee(referent_offset > 0, "referent offset not initialized");
 
-  if (UseG1GC || UseShenandoahGC) {
+  if (UseG1GC || (UseShenandoahGC && ShenandoahKeepAliveBarrier)) {
     Label slow_path;
     const Register local_0 = c_rarg0;
     // Check if local 0 != NULL
     // If the receiver is null then it is OK to jump to the slow path.
     __ ldr(local_0, Address(esp, 0));

@@ -1185,11 +1185,11 @@
     STATIC_ASSERT(JNIHandles::weak_tag_mask == 1u);
     __ tbz(r0, 0, not_weak);    // Test for jweak tag.
     // Resolve jweak.
     __ ldr(r0, Address(r0, -JNIHandles::weak_tag_value));
 #if INCLUDE_ALL_GCS
-    if (UseG1GC || (UseShenandoahGC && ShenandoahSATBBarrier)) {
+    if (UseG1GC || (UseShenandoahGC && ShenandoahKeepAliveBarrier)) {
       __ enter();                   // Barrier may call runtime.
       __ g1_write_barrier_pre(noreg /* obj */,
                               r0 /* pre_val */,
                               rthread /* thread */,
                               t /* tmp */,