src/cpu/x86/vm/templateInterpreter_x86_32.cpp

rev 11463 : Backport Traversal GC

@@ -861,17 +861,19 @@
 #endif
     __ movptr(rax, field_address);
 
     // Generate the G1 pre-barrier code to log the value of
     // the referent field in an SATB buffer.
+    if (!UseShenandoahGC || ShenandoahKeepAliveBarrier) {
     __ get_thread(rcx);
     __ g1_write_barrier_pre(noreg /* obj */,
                             rax /* pre_val */,
                             rcx /* thread */,
                             rbx /* tmp */,
                             true /* tosca_save */,
                             true /* expand_call */);
+    }
 
     // _areturn
     __ pop(rsi);                // get sender sp
     __ pop(rdi);                // get return address
     __ mov(rsp, rsi);           // set sp to sender sp