src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp

@@ -1344,15 +1344,13 @@
 #ifdef _LP64
     if (UseCompressedOops && !wide) {
       __ decode_heap_oop(dest->as_register());
     }
 #endif
-#if INCLUDE_ZGC
-    // Load barrier not yet applied, so a verification here would fail
-    if (!UseZGC)
-#endif
-    {
+
+    // Load barrier has not yet been applied, so ZGC can't verify the oop here
+    if (!UseZGC) {
       __ verify_oop(dest->as_register());
     }
   } else if (type == T_ADDRESS && addr->disp() == oopDesc::klass_offset_in_bytes()) {
 #ifdef _LP64
     if (UseCompressedClassPointers) {