Skip to content

Commit

Permalink
Automatic merge of jdk:master into master
Browse files Browse the repository at this point in the history
  • Loading branch information
duke committed Nov 11, 2020
2 parents 08bffdf + 362feaa commit c5f3bb2
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/hotspot/cpu/arm/interp_masm_arm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ void InterpreterMacroAssembler::lock_object(Register Rlock) {

// Unlocks an object. Used in monitorexit bytecode and remove_activation.
//
// Argument: R1: Points to BasicObjectLock structure for lock
// Argument: R0: Points to BasicObjectLock structure for lock
// Throw an IllegalMonitorException if object is not locked by current thread
// Blows volatile registers R0-R3, Rtemp, LR. Calls VM.
void InterpreterMacroAssembler::unlock_object(Register Rlock) {
Expand All @@ -996,8 +996,7 @@ void InterpreterMacroAssembler::unlock_object(Register Rlock) {

const Register Robj = R2;
const Register Rmark = R3;
const Register Rresult = R0;
assert_different_registers(Robj, Rmark, Rlock, R0, Rtemp);
assert_different_registers(Robj, Rmark, Rlock, Rtemp);

const int obj_offset = BasicObjectLock::obj_offset_in_bytes();
const int lock_offset = BasicObjectLock::lock_offset_in_bytes ();
Expand Down

0 comments on commit c5f3bb2

Please sign in to comment.