archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8264918: [JVMCI] getVtableIndexForInterfaceMethod doesn't check that type and method are related

Browse source 
Reviewed-by: kvn
This commit is contained in:
Vladimir Ivanov 2021-04-09 10:46:12 +00:00
parent f7a6c63ad3
commit b3782ead36
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View file

@ -729,10 +729,11 @@ C2V_END
C2V_VMENTRY_0(jint, getVtableIndexForInterfaceMethod, (JNIEnv* env, jobject, jobject jvmci_type, jobject jvmci_method)) C2V_VMENTRY_0(jint, getVtableIndexForInterfaceMethod, (JNIEnv* env, jobject, jobject jvmci_type, jobject jvmci_method))
Klass* klass = JVMCIENV->asKlass(jvmci_type); Klass* klass = JVMCIENV->asKlass(jvmci_type);
methodHandle method(THREAD, JVMCIENV->asMethod(jvmci_method)); methodHandle method(THREAD, JVMCIENV->asMethod(jvmci_method));
InstanceKlass* holder = method->method_holder();
if (klass->is_interface()) { if (klass->is_interface()) {
JVMCI_THROW_MSG_0(InternalError, err_msg("Interface %s should be handled in Java code", klass->external_name())); JVMCI_THROW_MSG_0(InternalError, err_msg("Interface %s should be handled in Java code", klass->external_name()));
} }
if (!method->method_holder()->is_interface()) { if (!holder->is_interface()) {
JVMCI_THROW_MSG_0(InternalError, err_msg("Method %s is not held by an interface, this case should be handled in Java code", method->name_and_sig_as_C_string())); JVMCI_THROW_MSG_0(InternalError, err_msg("Method %s is not held by an interface, this case should be handled in Java code", method->name_and_sig_as_C_string()));
} }
if (!klass->is_instance_klass()) { if (!klass->is_instance_klass()) {
@ -741,6 +742,9 @@ C2V_VMENTRY_0(jint, getVtableIndexForInterfaceMethod, (JNIEnv* env, jobject, job
if (!InstanceKlass::cast(klass)->is_linked()) { if (!InstanceKlass::cast(klass)->is_linked()) {
JVMCI_THROW_MSG_0(InternalError, err_msg("Class %s must be linked", klass->external_name())); JVMCI_THROW_MSG_0(InternalError, err_msg("Class %s must be linked", klass->external_name()));
} }
if (!klass->is_subtype_of(holder)) {
JVMCI_THROW_MSG_0(InternalError, err_msg("Class %s does not implement interface %s", klass->external_name(), holder->external_name()));
}
return LinkResolver::vtable_index_of_interface_method(klass, method); return LinkResolver::vtable_index_of_interface_method(klass, method);
C2V_END C2V_END

10
test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java
View file

@ -116,17 +116,19 @@ public class GetVtableIndexForInterfaceTest {
InternalError.class)); InternalError.class));
// class not implementing iface // class not implementing iface
result.add(new TestCase(DoNotExtendClass.class, result.add(new TestCase(DoNotExtendClass.class,
SingleImplementerInterface.class, "defaultMethod", false)); SingleImplementerInterface.class, "defaultMethod", false,
InternalError.class));
// abstract class which doesn't implement iface // abstract class which doesn't implement iface
result.add(new TestCase(AbstractClass.class, result.add(new TestCase(AbstractClass.class,
SingleImplementerInterface.class, "defaultMethod", false)); SingleImplementerInterface.class, "defaultMethod", false,
InternalError.class));
// abstract class which implements iface // abstract class which implements iface
result.add(new TestCase(MultipleAbstractImplementer.class, result.add(new TestCase(MultipleAbstractImplementer.class,
MultipleImplementersInterface.class, "defaultMethod", true)); MultipleImplementersInterface.class, "defaultMethod", true));
// class not initialized // class not initialized
result.add(new TestCase(AnotherSingleImplementer.class, result.add(new TestCase(AnotherSingleImplementer.class,
AnotherSingleImplementerInterface.class, "defaultMethod", AnotherSingleImplementerInterface.class, "defaultMethod", false,
false, InternalError.class)); InternalError.class));
return result; return result;
} }