src/hotspot/cpu/aarch64/templateTable_aarch64.cpp

@@ -3221,12 +3221,11 @@
    __ jump_from_interpreted(method, r0);
  
    __ bind(notFinal);
  
    // get receiver klass
-   __ null_check(recv, oopDesc::klass_offset_in_bytes());
-   __ load_klass(r0, recv);
+   __ load_klass(r0, recv, true);
  
    // profile this call
    __ profile_virtual_call(r0, rlocals, r3);
  
    // get target Method & entry point

@@ -3311,12 +3310,11 @@
    // Check for private method invocation - indicated by vfinal
    Label notVFinal;
    __ tbz(r3, ConstantPoolCacheEntry::is_vfinal_shift, notVFinal);
  
    // Get receiver klass into r3 - also a null check
-   __ null_check(r2, oopDesc::klass_offset_in_bytes());
-   __ load_klass(r3, r2);
+   __ load_klass(r3, r2, true);
  
    Label subtype;
    __ check_klass_subtype(r3, r0, r4, subtype);
    // If we get here the typecheck failed
    __ b(no_such_interface);

@@ -3328,12 +3326,11 @@
  
    __ bind(notVFinal);
  
    // Get receiver klass into r3 - also a null check
    __ restore_locals();
-   __ null_check(r2, oopDesc::klass_offset_in_bytes());
-   __ load_klass(r3, r2);
+   __ load_klass(r3, r2, true);
  
    Label no_such_method;
  
    // Preserve method for throw_AbstractMethodErrorVerbose.
    __ mov(r16, rmethod);

@@ -3524,34 +3521,40 @@
    // there is an initialize need. Otherwise, skip and go to the slow path.
    if (UseTLAB || allow_shared_alloc) {
      // The object is initialized before the header.  If the object size is
      // zero, go directly to the header initialization.
      __ bind(initialize_object);
-     __ sub(r3, r3, sizeof(oopDesc));
+     __ sub(r3, r3, oopDesc::base_offset_in_bytes());
      __ cbz(r3, initialize_header);
  
      // Initialize object fields
      {
-       __ add(r2, r0, sizeof(oopDesc));
+       __ add(r2, r0, oopDesc::base_offset_in_bytes());
+       if (!is_aligned(oopDesc::base_offset_in_bytes(), BytesPerLong)) {
+         __ strw(zr, Address(__ post(r2, BytesPerInt)));
+         __ sub(r3, r3, BytesPerInt);
+         __ cbz(r3, initialize_header);
+       }
        Label loop;
        __ bind(loop);
        __ str(zr, Address(__ post(r2, BytesPerLong)));
        __ sub(r3, r3, BytesPerLong);
        __ cbnz(r3, loop);
      }
  
      // initialize object header only.
      __ bind(initialize_header);
-     if (UseBiasedLocking) {
+     if (UseBiasedLocking || UseCompactObjectHeaders) {
        __ ldr(rscratch1, Address(r4, Klass::prototype_header_offset()));
      } else {
        __ mov(rscratch1, (intptr_t)markWord::prototype().value());
      }
      __ str(rscratch1, Address(r0, oopDesc::mark_offset_in_bytes()));
-     __ store_klass_gap(r0, zr);  // zero klass gap for compressed oops
-     __ store_klass(r0, r4);      // store klass last
- 
+     if (!UseCompactObjectHeaders) {
+       __ store_klass_gap(r0, zr);  // zero klass gap for compressed oops
+       __ store_klass(r0, r4);      // store klass last
+     }
      {
        SkipIfEqual skip(_masm, &DTraceAllocProbes, false);
        // Trigger dtrace event for fastpath
        __ push(atos); // save the return value
        __ call_VM_leaf(