src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp

*** 1604,1613 ****
--- 1604,1614 ----
    restore_bcp();
    restore_locals();
  }
  
  void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& mdo_addr) {
+   assert_different_registers(obj, rscratch1);
    Label update, next, none;
  
    verify_oop(obj);
  
    cbnz(obj, update);
*** 1764,1782 ****
      bind(profile_continue);
    }
  }
  
  void InterpreterMacroAssembler::profile_parameters_type(Register mdp, Register tmp1, Register tmp2) {
    if (ProfileInterpreter && MethodData::profile_parameters()) {
      Label profile_continue, done;
  
      test_method_data_pointer(mdp, profile_continue);
  
      // Load the offset of the area within the MDO used for
      // parameters. If it's negative we're not profiling any parameters
!     ldr(tmp1, Address(mdp, in_bytes(MethodData::parameters_type_data_di_offset()) - in_bytes(MethodData::data_offset())));
!     tbnz(tmp1, 63, profile_continue);  // i.e. sign bit set
  
      // Compute a pointer to the area for parameters from the offset
      // and move the pointer to the slot for the last
      // parameters. Collect profiling from last parameter down.
      // mdo start + parameters offset + array length - 1
--- 1765,1784 ----
      bind(profile_continue);
    }
  }
  
  void InterpreterMacroAssembler::profile_parameters_type(Register mdp, Register tmp1, Register tmp2) {
+   assert_different_registers(rscratch1, rscratch2, mdp, tmp1, tmp2);
    if (ProfileInterpreter && MethodData::profile_parameters()) {
      Label profile_continue, done;
  
      test_method_data_pointer(mdp, profile_continue);
  
      // Load the offset of the area within the MDO used for
      // parameters. If it's negative we're not profiling any parameters
!     ldrw(tmp1, Address(mdp, in_bytes(MethodData::parameters_type_data_di_offset()) - in_bytes(MethodData::data_offset())));
!     tbnz(tmp1, 31, profile_continue);  // i.e. sign bit set
  
      // Compute a pointer to the area for parameters from the offset
      // and move the pointer to the slot for the last
      // parameters. Collect profiling from last parameter down.
      // mdo start + parameters offset + array length - 1