8312909: C1 should not inline through interface calls with non-subtype receiver
Reviewed-by: kvn, chagedorn
This commit is contained in:
parent
c386091734
commit
ab1c212ac1
src/hotspot/share/c1
test/hotspot/jtreg/compiler/c1
@ -2087,9 +2087,10 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
|
||||
assert(singleton != declared_interface, "not a unique implementor");
|
||||
cha_monomorphic_target = target->find_monomorphic_target(calling_klass, declared_interface, singleton);
|
||||
if (cha_monomorphic_target != nullptr) {
|
||||
if (cha_monomorphic_target->holder() != compilation()->env()->Object_klass()) {
|
||||
ciInstanceKlass* holder = cha_monomorphic_target->holder();
|
||||
ciInstanceKlass* constraint = (holder->is_subtype_of(singleton) ? holder : singleton); // avoid upcasts
|
||||
ciInstanceKlass* holder = cha_monomorphic_target->holder();
|
||||
ciInstanceKlass* constraint = (holder->is_subtype_of(singleton) ? holder : singleton); // avoid upcasts
|
||||
if (holder != compilation()->env()->Object_klass() &&
|
||||
(!type_is_exact || receiver_klass->is_subtype_of(constraint))) {
|
||||
actual_recv = declared_interface;
|
||||
|
||||
// insert a check it's really the expected class.
|
||||
@ -2102,7 +2103,7 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
|
||||
|
||||
dependency_recorder()->assert_unique_implementor(declared_interface, singleton);
|
||||
} else {
|
||||
cha_monomorphic_target = nullptr; // subtype check against Object is useless
|
||||
cha_monomorphic_target = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8312909
|
||||
* @summary Test monomorphic interface call to with invalid receiver.
|
||||
* @modules java.base/jdk.internal.vm.annotation
|
||||
* @compile TestInvokeinterfaceWithBadReceiverHelper.jasm
|
||||
* @run main/bootclasspath/othervm -XX:CompileCommand=compileonly,TestInvokeinterfaceWithBadReceiverHelper::test
|
||||
* -Xcomp -XX:TieredStopAtLevel=1 TestInvokeinterfaceWithBadReceiver
|
||||
*/
|
||||
|
||||
import jdk.internal.vm.annotation.Stable;
|
||||
|
||||
interface MyInterface {
|
||||
public String get();
|
||||
}
|
||||
|
||||
// Single implementor
|
||||
class MyClass implements MyInterface {
|
||||
@Stable
|
||||
String field = "42";
|
||||
|
||||
public String get() {
|
||||
return field;
|
||||
}
|
||||
}
|
||||
|
||||
public class TestInvokeinterfaceWithBadReceiver {
|
||||
|
||||
public static void main(String[] args) {
|
||||
try {
|
||||
TestInvokeinterfaceWithBadReceiverHelper.test(new MyClass());
|
||||
throw new RuntimeException("No IncompatibleClassChangeError thrown!");
|
||||
} catch (IncompatibleClassChangeError e) {
|
||||
// Expected
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,44 @@
|
||||
/*
|
||||
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*
|
||||
*/
|
||||
|
||||
super public class TestInvokeinterfaceWithBadReceiverHelper
|
||||
version 51:0
|
||||
{
|
||||
public Method "<init>":"()V"
|
||||
stack 1 locals 1
|
||||
{
|
||||
aload_0;
|
||||
invokespecial Method java/lang/Object."<init>":"()V";
|
||||
return;
|
||||
}
|
||||
|
||||
public static Method test:"(LMyInterface;)Ljava/lang/String;"
|
||||
stack 1 locals 2
|
||||
{
|
||||
ldc String "42";
|
||||
invokeinterface InterfaceMethod MyInterface.get:"()Ljava/lang/String;", 1;
|
||||
areturn;
|
||||
}
|
||||
|
||||
} // end Class TestInvokeinterfaceWithBadReceiverHelper
|
Loading…
x
Reference in New Issue
Block a user