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

8212817: [JVMCI] ResolvedJavaMethod.isInVirtualMethodTable throws InternalError

Browse Source 
Reviewed-by: never, iveresov
This commit is contained in:
Doug Simon 2018-10-23 18:49:32 +02:00
parent db6696837e
commit 272eb6824b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
View File

@ -725,7 +725,7 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
return config().invalidVtableIndex; return config().invalidVtableIndex;
} }
if (holder.isInterface()) { if (holder.isInterface()) {
if (resolved.isInterface()) { if (resolved.isInterface() || !resolved.isLinked()) {
return config().invalidVtableIndex; return config().invalidVtableIndex;
} }
return getVtableIndexForInterfaceMethod(resolved); return getVtableIndexForInterfaceMethod(resolved);

13
test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
View File

@ -429,11 +429,24 @@ public class TestResolvedJavaMethod extends MethodUniverse {
} }
} }
static class UnlinkedType {
}
/** /**
* All public non-final methods should be available in the vtable. * All public non-final methods should be available in the vtable.
*/ */
@Test @Test
public void testVirtualMethodTableAccess() { public void testVirtualMethodTableAccess() {
ResolvedJavaType unlinkedType = metaAccess.lookupJavaType(UnlinkedType.class);
assertTrue(!unlinkedType.isLinked());
for (Class<?> c : classes) {
if (c.isInterface()) {
for (Method m : c.getDeclaredMethods()) {
ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m);
method.isInVirtualMethodTable(unlinkedType);
}
}
}
for (Class<?> c : classes) { for (Class<?> c : classes) {
if (c.isPrimitive() || c.isInterface()) { if (c.isPrimitive() || c.isInterface()) {
continue; continue;