Remove non-static logic again.

Author: Michael Haas

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

@@ -44,8 +44,6 @@
 import org.junit.Assert;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Base class for code installation tests.
@@ -89,24 +87,16 @@ private TestAssembler createAssembler() {
         }
     }
 
-    protected Method getMethod(Class<?> clazz, String name, Class<?>... args) {
+    protected Method getMethod(String name, Class<?>... args) {
         try {
-            return clazz.getMethod(name, args);
+            return getClass().getMethod(name, args);
         } catch (NoSuchMethodException e) {
             Assert.fail("method not found");
             return null;
         }
     }
 
-    protected Method getMethod(String name, Class<?>... args) {
-        return getMethod(getClass(), name, args);
-    }
-
     protected HotSpotNmethod test(TestCompiler compiler, Method method, Object... args) {
-        return test(compiler, method, null, args);
-    }
-
-    protected HotSpotNmethod test(TestCompiler compiler, Method method, Object obj, Object... args) {
         try {
             HotSpotResolvedJavaMethod resolvedMethod = (HotSpotResolvedJavaMethod) metaAccess.lookupJavaMethod(method);
             TestAssembler asm = createAssembler();
@@ -123,13 +113,8 @@ protected HotSpotNmethod test(TestCompiler compiler, Method method, Object obj,
                 System.out.println(str);
             }
 
-            Object expected = method.invoke(obj, args);
-            List<Object> newArgs = new ArrayList<>();
-            if (obj != null) {
-                newArgs.add(obj);
-            }
-            newArgs.addAll(List.of(args));
-            Object actual = installed.executeVarargs(newArgs.toArray(new Object[newArgs.size()]));
+            Object expected = method.invoke(null, args);
+            Object actual = installed.executeVarargs(args);
             Assert.assertEquals(expected, actual);
             return (HotSpotNmethod) installed;
         } catch (Exception e) {

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

@@ -476,7 +476,7 @@ private byte[] finish() {
      */
     public abstract void emitCall(long addr);
 
-    public void emitJavaCall(int[] pos, DebugInfo info, int markId) {
+    public void emitJavaCall(int[] pos, DebugInfo info) {
         throw new UnsupportedOperationException("Java calls are not supported.");
     }
 

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

@@ -51,11 +51,8 @@ public TestHotSpotVMConfig(HotSpotVMConfigStore config, Architecture arch) {
     public final int MARKID_FRAME_COMPLETE = getConstant("CodeInstaller::FRAME_COMPLETE", Integer.class);
     public final int MARKID_ENTRY_BARRIER_PATCH = getConstant("CodeInstaller::ENTRY_BARRIER_PATCH", Integer.class);
     public final long handleDeoptStub = getFieldValue("CompilerToVM::Data::SharedRuntime_deopt_blob_unpack", Long.class, "address");
-
-    public final int MARKID_INVOKEINTERFACE = getConstant("CodeInstaller::INVOKEINTERFACE", Integer.class);
-    public final int MARKID_INVOKEVIRTUAL = getConstant("CodeInstaller::INVOKEVIRTUAL", Integer.class);
+    
     public final int MARKID_INVOKESTATIC = getConstant("CodeInstaller::INVOKESTATIC", Integer.class);
-    public final int MARKID_INVOKESPECIAL = getConstant("CodeInstaller::INVOKESPECIAL", Integer.class);
     public final boolean continuationsEnabled = getFieldValue("CompilerToVM::Data::continuations_enabled", Boolean.class, "bool");
 
     public final int maxOopMapStackOffset = getFieldValue("CompilerToVM::Data::_max_oop_map_stack_offset", Integer.class, "int");

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

@@ -41,7 +41,6 @@
 package jdk.vm.ci.code.test;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
-import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall;
 
 import jdk.vm.ci.code.*;
 import jdk.vm.ci.hotspot.HotSpotReferenceMap;
@@ -53,16 +52,12 @@
 import jdk.vm.ci.meta.JavaType;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 
 public class TestMethodBinding extends CodeInstallationTest {
 
 
-    static class MethodProvider {
-        public static int invokeStatic() {
-            return 1 + 2;
-        }
+    public static int invokeStatic() {
+        return 1 + 2;
     }
 
     @Test
@@ -71,19 +66,14 @@ public void test() {
         Class<?>[] staticArgumentTypes = new Class<?>[]{};
         Object[] staticArguments = new Object[]{};
 
-        test(getMethod(MethodProvider.class, "invokeStatic"), returnType, staticArgumentTypes, staticArguments, config.MARKID_INVOKESTATIC);
+        test(getMethod("invokeStatic"), returnType, staticArgumentTypes, staticArguments);
     }
 
 
-    public void test(Method method, Class<?> returnClazz, Class<?>[] types, Object[] values, int markId) {
+    public void test(Method method, Class<?> returnClazz, Class<?>[] types, Object[] values) {
         try {
             ResolvedJavaMethod resolvedMethod = metaAccess.lookupJavaMethod(method);
-            Object obj = null;
-            List<Object> args = new ArrayList<>(List.of(values));
-            if (!resolvedMethod.isStatic()) {
-                obj = values[0];
-                args.removeFirst();
-            }
+            assert resolvedMethod.isStatic() : "method should be static";
             test(asm -> {
                 JavaType[] argTypes = new JavaType[types.length];
                 int i = 0;
@@ -94,19 +84,14 @@ public void test(Method method, Class<?> returnClazz, Class<?>[] types, Object[]
                 CallingConvention cc = codeCache.getRegisterConfig().getCallingConvention(JavaCall, returnType, argTypes, asm.valueKindFactory);
                 asm.emitCallPrologue(cc, values);
 
-                asm.recordMark(markId);
+                asm.recordMark(config.MARKID_INVOKESTATIC);
                 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()) {
-                    info.setReferenceMap(new HotSpotReferenceMap(new Location[0], new Location[0], new int[0], 8));
-                } else {
-                    assert values.length == 1 : "Only a receiver argument is allowed";
-                    info.setReferenceMap(new HotSpotReferenceMap(new Location[]{Location.register(((RegisterValue) cc.getArgument(0)).getRegister())}, new Location[]{null}, new int[]{asm.config.heapWordSize}, 8));
-                }
-                asm.emitJavaCall(pos, info, markId);
+                info.setReferenceMap(new HotSpotReferenceMap(new Location[0], new Location[0], new int[0], 8));
+                asm.emitJavaCall(pos, info);
 
                 asm.recordCall(pos[0], pos[1], resolvedMethod, true, true, info);
                 asm.emitCallEpilogue(cc);
@@ -118,7 +103,7 @@ public void test(Method method, Class<?> returnClazz, Class<?>[] types, Object[]
                     assert false : "Unimplemented return type: " + returnClazz;
                 }
 
-            }, method, obj, args.toArray(new Object[args.size()]));
+            }, method, values);
         } catch (Throwable e) {
             e.printStackTrace();
             throw e;

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

@@ -523,10 +523,7 @@ private void nop(int count) {
         }
     }
 
-    public void emitJavaCall(int[] pos, DebugInfo info, int markId) {
-        if (markId == config.MARKID_INVOKEVIRTUAL || markId == config.MARKID_INVOKEINTERFACE) {
-            emitLoadLong(AMD64.rax, 0);
-        }
+    public void emitJavaCall(int[] pos, DebugInfo info) {
         int displacementPos = code.position() + 1;
         if (displacementPos % 4 != 0) {
             nop(4 - displacementPos % 4);