Skip to content
This repository was archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk16u Public archive

Commit 58ff0df

Browse files
committedFeb 2, 2021
8259619: C1: 3-arg StubAssembler::call_RT stack-use condition is incorrect
Reviewed-by: vlivanov, kvn Backport-of: ce9451208772534efd532a6bc44c226a419f570d
1 parent cddbb15 commit 58ff0df

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
142142
int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3) {
143143
// if there is any conflict use the stack
144144
if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
145-
arg2 == c_rarg1 || arg1 == c_rarg3 ||
146-
arg3 == c_rarg1 || arg1 == c_rarg2) {
145+
arg2 == c_rarg1 || arg2 == c_rarg3 ||
146+
arg3 == c_rarg1 || arg3 == c_rarg2) {
147147
stp(arg3, arg2, Address(pre(sp, 2 * wordSize)));
148148
stp(arg1, zr, Address(pre(sp, -2 * wordSize)));
149149
ldp(c_rarg1, zr, Address(post(sp, 2 * wordSize)));

‎src/hotspot/cpu/x86/c1_Runtime1_x86.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
174174
#ifdef _LP64
175175
// if there is any conflict use the stack
176176
if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
177-
arg2 == c_rarg1 || arg1 == c_rarg3 ||
178-
arg3 == c_rarg1 || arg1 == c_rarg2) {
177+
arg2 == c_rarg1 || arg2 == c_rarg3 ||
178+
arg3 == c_rarg1 || arg3 == c_rarg2) {
179179
push(arg3);
180180
push(arg2);
181181
push(arg1);

1 commit comments

Comments
 (1)

openjdk-notifier[bot] commented on Feb 2, 2021

@openjdk-notifier[bot]
This repository has been archived.