src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp

*** 56,19 ***
  
    // locking
    // hdr     : must be r0, contents destroyed
    // obj     : must point to the object to lock, contents preserved
    // disp_hdr: must point to the displaced header location, contents preserved
!   // scratch : scratch register, contents destroyed
    // returns code offset at which to add null check debug information
!   int lock_object  (Register swap, Register obj, Register disp_hdr, Register scratch, Label& slow_case);
  
    // unlocking
    // hdr     : contents destroyed
    // obj     : must point to the object to lock, contents preserved
    // disp_hdr: must be r0 & must point to the displaced header location, contents destroyed
!   void unlock_object(Register swap, Register obj, Register lock, Label& slow_case);
  
    void initialize_object(
      Register obj,                      // result: pointer to object after successful allocation
      Register klass,                    // object klass
      Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise
--- 56,20 ---
  
    // locking
    // hdr     : must be r0, contents destroyed
    // obj     : must point to the object to lock, contents preserved
    // disp_hdr: must point to the displaced header location, contents preserved
!   // temp    : temporary register, must not be rscratch1 or rscratch2
    // returns code offset at which to add null check debug information
!   int lock_object  (Register swap, Register obj, Register disp_hdr, Register temp, Label& slow_case);
  
    // unlocking
    // hdr     : contents destroyed
    // obj     : must point to the object to lock, contents preserved
    // disp_hdr: must be r0 & must point to the displaced header location, contents destroyed
!   // temp    : temporary register, must not be rscratch1 or rscratch2
+   void unlock_object(Register swap, Register obj, Register lock, Register temp, Label& slow_case);
  
    void initialize_object(
      Register obj,                      // result: pointer to object after successful allocation
      Register klass,                    // object klass
      Register var_size_in_bytes,        // object size in bytes if unknown at compile time; invalid otherwise