Restrict new bind logic to static calls only.

Author: Michael Haas

src/hotspot/share/runtime/sharedRuntime.cpp

@@ -1219,17 +1219,8 @@ Handle SharedRuntime::find_callee_info_helper(vframeStream& vfst, Bytecodes::Cod
         // For invoke bytecodes, the reexecute bit is not set (see Interpreter::bytecode_should_reexecute).
         // Since the reexecute bit is set for this call, no corresponding invoke bytecode exists.
         Method* callee = attached_method();
-        if (attached_method->is_static()) {
-          bc = Bytecodes::_invokestatic;
-        } else {
-            receiver = Handle(current, callerFrame.retrieve_receiver(&reg_map2));
-          if (attached_method->method_holder()->is_interface()) {
-            bc = Bytecodes::_invokeinterface;
-          } else {
-            bc = Bytecodes::_invokevirtual;
-          }
-        }
-
+        assert(attached_method->is_static(), "attached method should be static");
+        bc = Bytecodes::_invokestatic;
         LinkResolver::resolve_invoke(callinfo, receiver, attached_method, bc, CHECK_NH);
         return receiver;
       }

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/TestMethodBinding.java

@@ -59,22 +59,7 @@
 public class TestMethodBinding extends CodeInstallationTest {
 
 
-    interface MethodProviderInterface {
-        int invokeInterface();
-    }
-
-    static abstract class AbstractMethodProvider implements MethodProviderInterface {
-        public int invokeVirtual() {
-            return 5 + 6;
-        }
-    }
-
-    static class MethodProvider extends AbstractMethodProvider {
-        @Override
-        public int invokeInterface() {
-            return 3 + 4;
-        }
-
+    static class MethodProvider {
         public static int invokeStatic() {
             return 1 + 2;
         }
@@ -83,19 +68,10 @@ public static int invokeStatic() {
     @Test
     public void test() {
         Class<?> returnType = int.class;
-        Object receiver = new MethodProvider();
         Class<?>[] staticArgumentTypes = new Class<?>[]{};
-        Class<?>[] interfaceArgumentTypes = new Class<?>[]{MethodProviderInterface.class};
-        Class<?>[] virtualArgumentTypes = new Class<?>[]{AbstractMethodProvider.class};
         Object[] staticArguments = new Object[]{};
-        Object[] interfaceArguments = new Object[]{receiver};
-        Object[] virtualArguments = interfaceArguments;
-
 
-        test(getMethod(MethodProvider.class, "invokeInterface"), returnType, interfaceArgumentTypes, virtualArguments, config.MARKID_INVOKEINTERFACE);
         test(getMethod(MethodProvider.class, "invokeStatic"), returnType, staticArgumentTypes, staticArguments, config.MARKID_INVOKESTATIC);
-        test(getMethod(AbstractMethodProvider.class, "invokeVirtual"), returnType, virtualArgumentTypes, virtualArguments, config.MARKID_INVOKEVIRTUAL);
-        test(getMethod(MethodProvider.class, "invokeInterface"), returnType, virtualArgumentTypes, virtualArguments, config.MARKID_INVOKESPECIAL);
     }
 
 
@@ -120,6 +96,8 @@ public void test(Method method, Class<?> returnClazz, Class<?>[] types, Object[]
 
                 asm.recordMark(markId);
                 int[] pos = new int[2];
+                // duringCall has to be false to trigger our bind logic in SharedRuntime::find_callee_info_helper
+                // we are allowed to do this because the call has no side-effect
                 BytecodeFrame frame = new BytecodeFrame(null, resolvedMethod, 0, false, false, new JavaValue[0], new JavaKind[0], 0, 0, 0);
                 DebugInfo info = new DebugInfo(frame, new VirtualObject[0]);
                 if (resolvedMethod.isStatic()) {