Skip to content

Commit 362feaa

Browse files
author
Boris Ulasevich
committed
8254661: arm32: additional cleanup after fixing SIGSEGV
Reviewed-by: ngasson, shade
1 parent 432c387 commit 362feaa

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/hotspot/cpu/arm/interp_masm_arm.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ void InterpreterMacroAssembler::lock_object(Register Rlock) {
983983

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

997997
const Register Robj = R2;
998998
const Register Rmark = R3;
999-
const Register Rresult = R0;
1000-
assert_different_registers(Robj, Rmark, Rlock, R0, Rtemp);
999+
assert_different_registers(Robj, Rmark, Rlock, Rtemp);
10011000

10021001
const int obj_offset = BasicObjectLock::obj_offset_in_bytes();
10031002
const int lock_offset = BasicObjectLock::lock_offset_in_bytes ();

0 commit comments

Comments
 (0)