Skip to content

Commit d7d3807

Browse files
committed
fix tests
1 parent 6da7800 commit d7d3807

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/aarch64/AArch64TestAssembler.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -367,9 +367,8 @@ public void emitEpilogue() {
367367
@Override
368368
public void emitCallPrologue(CallingConvention cc, Object... prim) {
369369
growFrame(cc.getStackSize());
370-
AllocatableValue[] args = cc.getArguments();
371-
for (int i = 0; i < args.length; i++) {
372-
emitLoad(args[i], prim[i]);
370+
for (int i = 0; i < cc.getArgumentCount(); i++) {
371+
emitLoad(cc.getArgument(i), prim[i]);
373372
}
374373
}
375374

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/amd64/AMD64TestAssembler.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -495,11 +495,10 @@ public void emitLoad(AllocatableValue av, Object prim) {
495495
@Override
496496
public void emitCallPrologue(CallingConvention cc, Object... prim) {
497497
growFrame(cc.getStackSize());
498-
AllocatableValue[] args = cc.getArguments();
499498
// Do the emission in reverse, this avoids register collisons of xmm0 - which is used a
500499
// scratch register when putting arguments on the stack.
501-
for (int i = args.length - 1; i >= 0; i--) {
502-
emitLoad(args[i], prim[i]);
500+
for (int i = cc.getArgumentCount() - 1; i >= 0; i--) {
501+
emitLoad(cc.getArgument(i), prim[i]);
503502
}
504503
}
505504

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/riscv64/RISCV64TestAssembler.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -227,9 +227,8 @@ public void emitEpilogue() {
227227
@Override
228228
public void emitCallPrologue(CallingConvention cc, Object... prim) {
229229
growFrame(cc.getStackSize());
230-
AllocatableValue[] args = cc.getArguments();
231-
for (int i = 0; i < args.length; i++) {
232-
emitLoad(args[i], prim[i]);
230+
for (int i = 0; i < cc.getArgumentCount(); i++) {
231+
emitLoad(cc.getArgument(i), prim[i]);
233232
}
234233
}
235234

0 commit comments

Comments
 (0)