--- old/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp	2018-03-16 09:52:25.047545138 +0100
+++ new/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp	2018-03-16 09:52:24.856536985 +0100
@@ -1132,7 +1132,7 @@
     __ testptr(rax, rax);
     __ jcc(Assembler::zero, exit); // if obj is NULL it is OK
 
-    if (UseLoadBarrier) {
+    if (UseZGC) {
       // Check if metadata bits indicate a bad oop
       __ testptr(rax, Address(r15_thread, JavaThread::zaddress_bad_mask_offset()));
       __ jcc(Assembler::notZero, error);
@@ -5308,7 +5308,7 @@
     generate_arraycopy_stubs();
 
     // Load barrier stubs
-    if (UseLoadBarrier) {
+    if (UseZGC) {
       address loadbarrier_address = CAST_FROM_FN_PTR(address, SharedRuntime::z_load_barrier_on_oop_field_preloaded);
       address loadbarrier_weak_address = CAST_FROM_FN_PTR(address, SharedRuntime::z_load_barrier_on_weak_oop_field_preloaded);
       Register rr = as_Register(0);