src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp

@@ -1944,11 +1944,11 @@
     __ tbz(r0, 0, not_weak);    // Test for jweak tag.
     // Resolve jweak.
     __ ldr(r0, Address(r0, -JNIHandles::weak_tag_value));
     __ verify_oop(r0);
 #if INCLUDE_ALL_GCS
-    if (UseG1GC) {
+    if (UseG1GC || (UseShenandoahGC && ShenandoahSATBBarrier)) {
       __ g1_write_barrier_pre(noreg /* obj */,
                               r0 /* pre_val */,
                               rthread /* thread */,
                               rscratch2 /* tmp */,
                               true /* tosca_live */,