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

Merge

Browse Source
This commit is contained in:
Igor Veresov 2016-08-19 15:29:57 -07:00
commit d39293e00f
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java
View File

@ -107,6 +107,12 @@ public class CompileCodeTestCase {
} }
public NMethod compile(int level) { public NMethod compile(int level) {
String directive = "[{ match: \"" + executable.getDeclaringClass().getName().replace('.', '/')
+ "." + (executable instanceof Constructor ? "<init>" : executable.getName())
+ "\", " + "BackgroundCompilation: false }]";
if (WB.addCompilerDirective(directive) != 1) {
throw new Error("Failed to add compiler directive: " + directive);
}
boolean enqueued = WB.enqueueMethodForCompilation(executable, boolean enqueued = WB.enqueueMethodForCompilation(executable,
level, bci); level, bci);
if (!enqueued) { if (!enqueued) {

5
hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
View File

@ -34,8 +34,9 @@
* jdk.vm.ci/jdk.vm.ci.hotspot * jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.code
* *
* @ignore 8139700 * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @build sun.hotspot.WhiteBox
* compiler.jvmci.compilerToVM.DisassembleCodeBlobTest
* @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. * @run main/othervm -Xbootclasspath/a:.

6
hotspot/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
View File

@ -35,8 +35,10 @@
* jdk.vm.ci/jdk.vm.ci.code * jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.runtime * jdk.vm.ci/jdk.vm.ci.runtime
* *
* @ignore 8139700 * @ignore 8163894
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build compiler.jvmci.compilerToVM.InvalidateInstalledCodeTest
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox * @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. * @run main/othervm -Xbootclasspath/a:.