src/cpu/x86/vm/templateInterpreter_x86_64.cpp

rev 11463 : Backport Traversal GC

@@ -813,16 +813,18 @@
     const Address field_address(rax, referent_offset);
     __ load_heap_oop(rax, field_address);
 
     // Generate the G1 pre-barrier code to log the value of
     // the referent field in an SATB buffer.
+    if (!UseShenandoahGC || ShenandoahKeepAliveBarrier) {
     __ g1_write_barrier_pre(noreg /* obj */,
                             rax /* pre_val */,
                             r15_thread /* thread */,
                             rbx /* tmp */,
                             true /* tosca_live */,
                             true /* expand_call */);
+    }
 
     // _areturn
     __ pop(rdi);                // get return address
     __ mov(rsp, r13);           // set sp to sender sp
     __ jmp(rdi);