infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 18:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8296821: compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java fails after JDK-8262901

Browse Source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Olga Mikhaltsova 2022-11-14 08:40:11 +00:00 committed by Tobias Hartmann
parent 34d10f19f5
commit 277f0c24a2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/hotspot/jtreg/ProblemList.txt
View File

@ -46,7 +46,6 @@
compiler/ciReplay/TestSAServer.java 8029528 generic-all
compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-all
compiler/jvmci/compilerToVM/GetFlagValueTest.java 8204459 generic-all
compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java 8296821 generic-all
compiler/tiered/LevelTransitionTest.java 8067651 generic-all
compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all

8
test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java
View File

@ -159,7 +159,13 @@ public class NativeCallTest extends CodeInstallationTest {
asm.emitCallPrologue(cc, values);
asm.emitCall(addr);
asm.emitCallEpilogue(cc);
asm.emitFloatRet(((RegisterValue) cc.getReturn()).getRegister());
if (returnClazz == float.class) {
asm.emitFloatRet(((RegisterValue) cc.getReturn()).getRegister());
} else if (returnClazz == int.class) {
asm.emitIntRet(((RegisterValue) cc.getReturn()).getRegister());
} else {
assert false : "Unimplemented return type: " + returnClazz;
}
}, getMethod(name, types), values);
} catch (Throwable e) {
e.printStackTrace();

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

@ -403,8 +403,7 @@ public class AMD64TestAssembler extends TestAssembler {
@Override
public void emitCallPrologue(CallingConvention cc, Object... prim) {
emitGrowStack(cc.getStackSize());
frameSize += cc.getStackSize();
growFrame(cc.getStackSize());
AllocatableValue[] args = cc.getArguments();
// Do the emission in reverse, this avoids register collisons of xmm0 - which is used a
// scratch register when putting arguments on the stack.
@ -427,7 +426,6 @@ public class AMD64TestAssembler extends TestAssembler {
@Override
public void emitCallEpilogue(CallingConvention cc) {
emitGrowStack(-cc.getStackSize());
frameSize -= cc.getStackSize();
growFrame(-cc.getStackSize());
}
}