src/hotspot/cpu/x86/macroAssembler_x86.cpp

@@ -5250,11 +5250,11 @@
   jcc(Assembler::zero, done);                // Use NULL as-is.
   testptr(value, JNIHandles::weak_tag_mask); // Test for jweak tag.
   jcc(Assembler::zero, not_weak);
   // Resolve jweak.
 #if INCLUDE_ALL_GCS
-  if (UseLoadBarrier) {
+  if (UseZGC) {
     load_barrier(value, Address(value, -JNIHandles::weak_tag_value), false /* expand call */, LoadBarrierOnPhantomOopRef);
   } else
 #endif
   {
     movptr(value, Address(value, -JNIHandles::weak_tag_value));

@@ -6718,11 +6718,11 @@
 #endif
 
 void MacroAssembler::load_heap_oop(Register dst, Address src, bool expand_call, LoadBarrierOn on) {
 #ifdef _LP64
 #if INCLUDE_ALL_GCS
-  if (UseLoadBarrier) {
+  if (UseZGC) {
     load_barrier(dst, src, expand_call, on);
   } else
 #endif
   if (UseCompressedOops) {
     movl(dst, src);

@@ -6743,11 +6743,11 @@
     movptr(dst, src);
 }
 
 void MacroAssembler::store_heap_oop(Address dst, Register src) {
 #ifdef ASSERT
-  if (VerifyOops && UseLoadBarrier) {
+  if (VerifyOops && UseZGC) {
     // Check if mask is good
     Label done;
     testptr(src, Address(r15_thread, JavaThread::zaddress_bad_mask_offset()));
     jcc(Assembler::zero, done);
     STOP("Writing broken oop");