src/hotspot/cpu/aarch64/templateTable_aarch64.cpp

*** 350,10 ***
--- 350,22 ---
  
    // resolved class - need to call vm to get java mirror of the class
    __ cmp(r3, (u1)JVM_CONSTANT_Class);
    __ br(Assembler::NE, notClass);
  
+   __ load_resolved_klass_at_offset(r2, r1, r3, rscratch1); // kills r3=tag
+ 
+   __ cmp(r3, zr); // resolved_klass ?= null
+   __ br(Assembler::EQ, call_ldc);
+ 
+   const int mirror_offset = in_bytes(Klass::java_mirror_offset());
+   __ ldr(r3, Address(r3, mirror_offset));
+   __ resolve_oop_handle(r3, rscratch1, rscratch2);
+   __ push_ptr(r3);
+ 
+   __ b(Done);
+ 
    __ bind(call_ldc);
    __ mov(c_rarg1, is_ldc_wide(type) ? 1 : 0);
    call_VM(r0, CAST_FROM_FN_PTR(address, InterpreterRuntime::ldc), c_rarg1);
    __ push_ptr(r0);
    __ verify_oop(r0);