Skip to content

Commit ce94512

Browse files
committedJan 13, 2021
8259619: C1: 3-arg StubAssembler::call_RT stack-use condition is incorrect
Reviewed-by: chagedorn, kvn
1 parent 2e12454 commit ce94512

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
@@ -144,8 +144,8 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
144144
int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry, Register arg1, Register arg2, Register arg3) {
145145
// if there is any conflict use the stack
146146
if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
147-
arg2 == c_rarg1 || arg1 == c_rarg3 ||
148-
arg3 == c_rarg1 || arg1 == c_rarg2) {
147+
arg2 == c_rarg1 || arg2 == c_rarg3 ||
148+
arg3 == c_rarg1 || arg3 == c_rarg2) {
149149
stp(arg3, arg2, Address(pre(sp, 2 * wordSize)));
150150
stp(arg1, zr, Address(pre(sp, -2 * wordSize)));
151151
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
@@ -176,8 +176,8 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
176176
#ifdef _LP64
177177
// if there is any conflict use the stack
178178
if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
179-
arg2 == c_rarg1 || arg1 == c_rarg3 ||
180-
arg3 == c_rarg1 || arg1 == c_rarg2) {
179+
arg2 == c_rarg1 || arg2 == c_rarg3 ||
180+
arg3 == c_rarg1 || arg3 == c_rarg2) {
181181
push(arg3);
182182
push(arg2);
183183
push(arg1);

0 commit comments

Comments
 (0)
Please sign in to comment.