src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

rev 54118 : [mq]: aarch64-port

@@ -1009,11 +1009,15 @@
 
   if (type == T_ARRAY || type == T_OBJECT) {
     if (UseCompressedOops && !wide) {
       __ decode_heap_oop(dest->as_register());
     }
+
+    if (!UseZGC) {
+      // Load barrier has not yet been applied, so ZGC can't verify the oop here
     __ verify_oop(dest->as_register());
+    }
   } else if (type == T_ADDRESS && addr->disp() == oopDesc::klass_offset_in_bytes()) {
     if (UseCompressedClassPointers) {
       __ decode_klass_not_null(dest->as_register());
     }
   }

@@ -2864,11 +2868,15 @@
   }
 }
 
 
 void LIR_Assembler::leal(LIR_Opr addr, LIR_Opr dest, LIR_PatchCode patch_code, CodeEmitInfo* info) {
-  assert(patch_code == lir_patch_none, "Patch code not supported");
+  if (patch_code != lir_patch_none) {
+    deoptimize_trap(info);
+    return;
+  }
+
   __ lea(dest->as_register_lo(), as_Address(addr->as_address_ptr()));
 }
 
 
 void LIR_Assembler::rt_call(LIR_Opr result, address dest, const LIR_OprList* args, LIR_Opr tmp, CodeEmitInfo* info) {