--- old/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	2019-11-11 16:09:44.615343566 +0100
+++ new/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	2019-11-11 16:09:44.533343570 +0100
@@ -863,6 +863,7 @@
 
     // 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 */,
@@ -870,6 +871,7 @@
                             rbx /* tmp */,
                             true /* tosca_save */,
                             true /* expand_call */);
+    }
 
     // _areturn
     __ pop(rsi);                // get sender sp