8174957: [JVMCI] jaotc is broken in Xcomp mode

Reviewed-by: iveresov
This commit is contained in:
Doug Simon 2017-02-15 11:14:45 +01:00
parent 5c88e780c2
commit 896fc63787
6 changed files with 23 additions and 13 deletions

View file

@ -38,6 +38,7 @@
package compiler.jvmci.compilerToVM;
import jdk.test.lib.Asserts;
import jdk.vm.ci.hotspot.VMField;
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
@ -49,10 +50,19 @@ public class ReadConfigurationTest {
}
private void runTest() {
TestHotSpotVMConfig config = new TestHotSpotVMConfig(HotSpotJVMCIRuntime.runtime().getConfigStore());
HotSpotVMConfigStore store = HotSpotJVMCIRuntime.runtime().getConfigStore();
TestHotSpotVMConfig config = new TestHotSpotVMConfig(store);
Asserts.assertNE(config.codeCacheHighBound, 0L, "Got null address");
Asserts.assertNE(config.stubRoutineJintArrayCopy, 0L, "Got null address");
for (VMField field : store.getFields().values()) {
Object value = field.value;
if (value != null) {
Asserts.assertTrue(value instanceof Long || value instanceof Boolean,
"Got unexpected value type for VM field " + field.name + ": " + value.getClass());
}
}
for (VMIntrinsicMethod m : config.getStore().getIntrinsics()) {
Asserts.assertNotNull(m);
Asserts.assertNotNull(m.declaringClass);