8239083: C1 assert(known_holder == NULL || (known_holder->is_instance_klass() && (!known_holder->is_interface() || ((ciInstanceKlass*)known_holder)->has_nonstatic_concrete_methods())), "should be non-static concrete method");
Remove unnecessary preparation to profile the holder of a static method called by a method handle in C1.
Reviewed-by: thartmann, kvn
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index aaefe6b..63fcd1c 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -4041,7 +4041,7 @@
if (ciMethod::is_consistent_info(callee, target)) {
Bytecodes::Code bc = target->is_static() ? Bytecodes::_invokestatic : Bytecodes::_invokevirtual;
ignore_return = ignore_return || (callee->return_type()->is_void() && !target->return_type()->is_void());
- if (try_inline(target, /*holder_known*/ true, ignore_return, bc)) {
+ if (try_inline(target, /*holder_known*/ !callee->is_static(), ignore_return, bc)) {
return true;
}
} else {
@@ -4107,7 +4107,7 @@
// We don't do CHA here so only inline static and statically bindable methods.
if (target->is_static() || target->can_be_statically_bound()) {
Bytecodes::Code bc = target->is_static() ? Bytecodes::_invokestatic : Bytecodes::_invokevirtual;
- if (try_inline(target, /*holder_known*/ true, ignore_return, bc)) {
+ if (try_inline(target, /*holder_known*/ !callee->is_static(), ignore_return, bc)) {
return true;
}
} else {
diff --git a/test/hotspot/jtreg/compiler/c1/TestStaticInterfaceMethodCall.java b/test/hotspot/jtreg/compiler/c1/TestStaticInterfaceMethodCall.java
new file mode 100644
index 0000000..25cb969
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c1/TestStaticInterfaceMethodCall.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020, 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 8239083
+ * @summary Test invocation of static interface method with and without method handle with C1.
+ *
+ * @run main/othervm -Xbatch -XX:TieredStopAtLevel=3 compiler.c1.TestStaticInterfaceMethodCall
+ */
+
+package compiler.c1;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+public class TestStaticInterfaceMethodCall {
+
+ static final MethodHandle MH_m;
+
+ static {
+ try {
+ MH_m = MethodHandles.lookup().findStatic(MyInterface.class, "m", MethodType.methodType(void.class));
+ } catch (ReflectiveOperationException e) {
+ throw new BootstrapMethodError(e);
+ }
+ }
+
+ public static void main(String[] args) throws Throwable {
+ for (int i = 0; i < 20_000; i++) {
+ test_call_by_method_handle();
+ test_direct_call();
+ }
+ }
+
+ static void test_call_by_method_handle() throws Throwable {
+ MH_m.invokeExact();
+ }
+
+ static void test_direct_call() {
+ MyInterface.m();
+ }
+
+}
+
+interface MyInterface {
+ static void m() {}
+}
