stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8218025: disable pop_frame and force_early_return caps for Graal

Browse Source 
Reviewed-by: iignatyev, sspitsyn, dholmes
This commit is contained in:
Alex Menkov 2019-02-01 09:25:31 -08:00
parent 12e3cbaec9
commit e24693c7db
3 changed files with 86 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hotspot/share/prims/jvmtiManageCapabilities.cpp
View File

@ -107,6 +107,14 @@ jvmtiCapabilities JvmtiManageCapabilities::init_onload_capabilities() {
#ifndef ZERO
jc.can_pop_frame = 1;
jc.can_force_early_return = 1;
// Workaround for 8195635:
// disable pop_frame and force_early_return capabilities with Graal
#if INCLUDE_JVMCI
if (UseJVMCICompiler) {
jc.can_pop_frame = 0;
jc.can_force_early_return = 0;
}
#endif // INCLUDE_JVMCI
#endif // !ZERO
jc.can_get_source_debug_extension = 1;
jc.can_access_local_variables = 1;

57
test/hotspot/jtreg/ProblemList-graal.txt
View File

@ -109,8 +109,6 @@ vmTestbase/vm/mlvm/anonloader/stress/oome/heap/Test.java 8186299 gener
vmTestbase/vm/mlvm/anonloader/stress/oome/metaspace/Test.java 8186299 generic-all
# jvmti tests
vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/PopFrame/popframe009/TestDescription.java 8195639 generic-all
vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/TestDescription.java 8195674 generic-all
@ -129,6 +127,61 @@ vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/TestDescription.java
serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java 8202482 generic-all
# tests require pop_frame and force_early_return capabilities
vmTestbase/nsk/jdb/pop/pop001/pop001.java 8195635 generic-all
vmTestbase/nsk/jdb/pop_exception/pop_exception001/pop_exception001.java 8195635 generic-all
vmTestbase/nsk/jdb/reenter/reenter001/reenter001.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc01x002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc02x002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc04x002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc06x001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc08x001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/BScenarios/hotswap/tc10x002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/MethodExitEvent/returnValue/returnValue003/returnValue003.java 8195635 generic-all
vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.jav 8195635 generic-all
vmTestbase/nsk/jdi/Scenarios/invokeMethod/popframes001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/ThreadReference/popFrames/popframes001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/stress/serial/forceEarlyReturn002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn002/forceEarlyReturn002.java 8195635 generic-all
vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/PopFrame/popframe001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/PopFrame/popframe003/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/PopFrame/popframe005/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS102/hs102t001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.java 8195635 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.java 8195635 generic-all
vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/TestDescription.java 8195635 generic-all
vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_a/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_b/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2same_a/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2same_b/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_none2indy_a/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_none2indy_b/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInTarget/TestDescription.java 8195635 generic-all
vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/INDIFY_Test.java 8195635 generic-all
compiler/stable/TestStableBoolean.java 8204347 generic-all
compiler/stable/TestStableByte.java 8204347 generic-all
compiler/stable/TestStableChar.java 8204347 generic-all

23
test/jdk/ProblemList-graal.txt
View File

@ -69,6 +69,29 @@ java/lang/ref/OOMEInReferenceHandler.java 8196611
java/lang/Runtime/exec/LotsOfOutput.java 8196611 generic-all
java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java 8196611 generic-all
# tests require pop_frame and force_early_return capabilities
com/sun/jdi/RedefineTTYLineNumber.java 8195635 generic-all
com/sun/jdi/RedefineG.java 8195635 generic-all
com/sun/jdi/RedefineCrossStart.java 8195635 generic-all
com/sun/jdi/PopSynchronousTest.java 8195635 generic-all
com/sun/jdi/RedefineTTYLineNumber.java 8195635 generic-all
com/sun/jdi/RedefineG.java 8195635 generic-all
com/sun/jdi/RedefineCrossStart.java 8195635 generic-all
com/sun/jdi/PopSynchronousTest.java 8195635 generic-all
com/sun/jdi/PopAsynchronousTest.java 8195635 generic-all
com/sun/jdi/PopAndStepTest.java 8195635 generic-all
com/sun/jdi/PopAsynchronousTest.java 8195635 generic-all
com/sun/jdi/PopAndStepTest.java 8195635 generic-all
com/sun/jdi/EarlyReturnTest.java 8195635 generic-all
com/sun/jdi/RedefineTTYLineNumber.java 8195635 generic-all
com/sun/jdi/RedefineG.java 8195635 generic-all
com/sun/jdi/RedefineCrossStart.java 8195635 generic-all
com/sun/jdi/PopSynchronousTest.java 8195635 generic-all
com/sun/jdi/PopAsynchronousTest.java 8195635 generic-all
com/sun/jdi/PopAndStepTest.java 8195635 generic-all
com/sun/jdi/EarlyReturnTest.java 8195635 generic-all
com/sun/jdi/EarlyReturnTest.java 8195635 generic-all
# Next JFR tests fail with Graal. Assuming 8193210.
jdk/jfr/event/compiler/TestCodeSweeper.java 8193210 generic-all
jdk/jfr/event/compiler/TestCompilerInlining.java 8193210 generic-all