src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp

@@ -2989,11 +2989,11 @@
     ShouldNotReachHere();
   }
 }
 
 void LIR_Assembler::load_barrier_test(LIR_Opr ref) {
-  __ testptr(ref->as_register(), ExternalAddress((address)&ZAddressBadMask));
+  __ testptr(ref->as_register(), Address(r15_thread, JavaThread::zaddress_bad_mask_offset()));
 }
 
 void LIR_Assembler::store_parameter(Register r, int offset_from_rsp_in_words) {
   assert(offset_from_rsp_in_words >= 0, "invalid offset from rsp");
   int offset_from_rsp_in_bytes = offset_from_rsp_in_words * BytesPerWord;