src/hotspot/cpu/x86/stubGenerator_x86_64.cpp

@@ -1112,11 +1112,11 @@
     __ testptr(rax, rax);
     __ jcc(Assembler::zero, exit); // if obj is NULL it is OK
 
     if (UseLoadBarrier) {
       // Check if metadata bits indicate a bad oop
-      __ testptr(rax, ExternalAddress((address)&ZAddressBadMask));
+      __ testptr(rax, Address(r15_thread, JavaThread::zaddress_bad_mask_offset()));
       __ jcc(Assembler::notZero, error);
     }
 
     // Check if the oop is in the right area of memory
     __ movptr(c_rarg2, rax);