infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-19 01:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

8149076: [JVMCI] missing ResourceMark in JVMCIRuntime::initialize_HotSpotJVMCIRuntime

Browse Source 
Reviewed-by: twisti, iignatyev
This commit is contained in:
Tom Rodriguez 2016-02-05 12:27:02 -08:00
parent dd6da5ea53
commit 938471481b
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/src/share/vm/jvmci/jvmciRuntime.cpp
View File

@ -634,6 +634,7 @@ Handle JVMCIRuntime::callStatic(const char* className, const char* methodName, c
void JVMCIRuntime::initialize_HotSpotJVMCIRuntime(TRAPS) {
if (JNIHandles::resolve(_HotSpotJVMCIRuntime_instance) == NULL) {
ResourceMark rm;
#ifdef ASSERT
// This should only be called in the context of the JVMCI class being initialized
TempNewSymbol name = SymbolTable::new_symbol("jdk/vm/ci/runtime/JVMCI", CHECK);

55
hotspot/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java
View File

@ -35,6 +35,16 @@
* -Dcompiler.jvmci.JVM_GetJVMCIRuntimeTest.positive=false
* -XX:-EnableJVMCI
* compiler.jvmci.JVM_GetJVMCIRuntimeTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions
* -Dcompiler.jvmci.JVM_GetJVMCIRuntimeTest.positive=true
* -Dcompiler.jvmci.JVM_GetJVMCIRuntimeTest.threaded=true
* -XX:+EnableJVMCI
* compiler.jvmci.JVM_GetJVMCIRuntimeTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions
* -Dcompiler.jvmci.JVM_GetJVMCIRuntimeTest.positive=false
* -Dcompiler.jvmci.JVM_GetJVMCIRuntimeTest.threaded=true
* -XX:-EnableJVMCI
* compiler.jvmci.JVM_GetJVMCIRuntimeTest
*/
@ -43,22 +53,27 @@ package compiler.jvmci;
import jdk.vm.ci.runtime.JVMCI;
import jdk.test.lib.Asserts;
import java.lang.reflect.Method;
public class JVM_GetJVMCIRuntimeTest {
public class JVM_GetJVMCIRuntimeTest implements Runnable {
private static final boolean IS_POSITIVE = Boolean.getBoolean(
"compiler.jvmci.JVM_GetJVMCIRuntimeTest.positive");
private static final boolean IN_THREAD = Boolean.getBoolean(
"compiler.jvmci.JVM_GetJVMCIRuntimeTest.threaded");
private final Method initializeRuntime;
public static void main(String[] args) {
new JVM_GetJVMCIRuntimeTest().runTest();
public static void main(String[] args) throws Throwable {
JVM_GetJVMCIRuntimeTest instance = new JVM_GetJVMCIRuntimeTest();
if (IN_THREAD) {
Thread t = new Thread(instance);
t.start();
t.join();
} else {
instance.run();
}
}
private void runTest() {
public void run() {
Object result;
try {
result = invoke();
result = JVMCI.getRuntime();
} catch (InternalError e) {
if (IS_POSITIVE) {
throw new AssertionError("unexpected exception", e);
@ -70,28 +85,8 @@ public class JVM_GetJVMCIRuntimeTest {
}
Asserts.assertNotNull(result,
"initializeRuntime returned null");
Asserts.assertEQ(result, invoke(),
Asserts.assertEQ(result, JVMCI.getRuntime(),
"initializeRuntime returns different results");
}
private Object invoke() {
Object result;
try {
result = initializeRuntime.invoke(JVMCI.class);
} catch (ReflectiveOperationException e) {
throw new Error("can't invoke initializeRuntime", e);
}
return result;
}
private JVM_GetJVMCIRuntimeTest() {
Method method;
try {
method = JVMCI.class.getDeclaredMethod("initializeRuntime");
method.setAccessible(true);
} catch (NoSuchMethodException e) {
throw new Error("can't find JVMCI::initializeRuntime", e);
}
initializeRuntime = method;
}
}