archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8186235: [Graal] compiler/aot/RecompilationTest.java fails in case UseJVMCICompiler is enabled

Browse source 
Make JVMCI respect -XX:-Inline

Reviewed-by: kvn
This commit is contained in:
Igor Veresov 2017-08-22 08:53:35 -07:00
parent b54514e556
commit 7465efdb3b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
View file

@ -765,7 +765,7 @@ C2V_END
C2V_VMENTRY(jboolean, hasNeverInlineDirective,(JNIEnv *, jobject, jobject jvmci_method)) C2V_VMENTRY(jboolean, hasNeverInlineDirective,(JNIEnv *, jobject, jobject jvmci_method))
methodHandle method = CompilerToVM::asMethod(jvmci_method); methodHandle method = CompilerToVM::asMethod(jvmci_method);
return CompilerOracle::should_not_inline(method) || method->dont_inline(); return !Inline || CompilerOracle::should_not_inline(method) || method->dont_inline();
C2V_END C2V_END
C2V_VMENTRY(jboolean, shouldInlineMethod,(JNIEnv *, jobject, jobject jvmci_method)) C2V_VMENTRY(jboolean, shouldInlineMethod,(JNIEnv *, jobject, jobject jvmci_method))

4
hotspot/test/compiler/aot/RecompilationTest.java
View file

@ -37,7 +37,7 @@
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:. * -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
* -extraopt -XX:-UseCompressedOops * -extraopt -XX:-UseCompressedOops
* -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::* * -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::*
* @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:+TieredCompilation * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:+TieredCompilation -XX:CompilationPolicyChoice=2
* -XX:-UseCounterDecay -XX:-UseCompressedOops * -XX:-UseCounterDecay -XX:-UseCompressedOops
* -XX:-Inline * -XX:-Inline
* -XX:AOTLibrary=./libRecompilationTest1.so -Xbootclasspath/a:. * -XX:AOTLibrary=./libRecompilationTest1.so -Xbootclasspath/a:.
@ -50,7 +50,7 @@
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:. * -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
* -extraopt -XX:-UseCompressedOops * -extraopt -XX:-UseCompressedOops
* -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::* * -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::*
* @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:+TieredCompilation * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:+TieredCompilation -XX:CompilationPolicyChoice=2
* -XX:-UseCounterDecay -XX:-UseCompressedOops * -XX:-UseCounterDecay -XX:-UseCompressedOops
* -XX:-Inline * -XX:-Inline
* -XX:AOTLibrary=./libRecompilationTest2.so -Xbootclasspath/a:. * -XX:AOTLibrary=./libRecompilationTest2.so -Xbootclasspath/a:.