fix injected methods in interface statics/defaults

unimined · May 23, 2024 · 6069dec · 6069dec
1 parent c9cc916
commit 6069dec
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/downgradetest/src/main/java/xyz/wagyourtail/downgradetest/TestInterface.java b/downgradetest/src/main/java/xyz/wagyourtail/downgradetest/TestInterface.java
@@ -1,5 +1,7 @@
 package xyz.wagyourtail.downgradetest;
 
+import java.util.function.Function;
+
 public interface TestInterface {
     String test5 = "test";
 
@@ -20,7 +22,22 @@ private void test() {
     }
 
     static void test3() {
-        System.out.println("test3");
+        System.out.println("test3" + 4);
+
+        Function<Long, IndexOutOfBoundsException> IOOBE = IndexOutOfBoundsException::new;
+        IOOBE.apply(0L);
+
+        switch (TestSwitch.TestEnum.A) {
+            case A:
+                System.out.println("A");
+                break;
+            case B:
+                System.out.println("B");
+                break;
+            case TestSwitch.TestEnum ignored:
+                System.out.println("ignored");
+                break;
+        }
     }
 
 }
diff --git a/...-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_R_SwitchBootstraps.java b/...-api/src/java21/java/xyz/wagyourtail/jvmdg/j21/stub/java_base/J_L_R_SwitchBootstraps.java
@@ -60,7 +60,7 @@ public static MethodInsnNode makeSwitchInternal(String holdingMethod, String des
         for (MethodNode mnode : cnode.methods) {
             if (mnode instanceof SwitchMethodNode smnode) {
                 if (smnode.types.equals(types)) {
-                    return new MethodInsnNode(Opcodes.INVOKESTATIC, cnode.name, mnode.name, mnode.desc, false);
+                    return new MethodInsnNode(Opcodes.INVOKESTATIC, cnode.name, mnode.name, mnode.desc, (cnode.access & Opcodes.ACC_INTERFACE) != 0);
                 }
                 if (mnode.name.equals("jvmdowngrader$switch$" + holdingMethod + "$" + i)) {
                     i++;
@@ -351,7 +351,7 @@ public static MethodInsnNode makeSwitchInternal(String holdingMethod, String des
         smnode.visitMaxs(0, 0);
         smnode.visitEnd();
         cnode.methods.add(smnode);
-        return new MethodInsnNode(Opcodes.INVOKESTATIC, cnode.name, name, desc, false);
+        return new MethodInsnNode(Opcodes.INVOKESTATIC, cnode.name, name, desc, (cnode.access & Opcodes.ACC_INTERFACE) != 0);
     }
 
 

diff --git a/...api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_I_StringConcatFactory.java b/...api/src/java9/java/xyz/wagyourtail/jvmdg/j9/stub/java_base/J_L_I_StringConcatFactory.java
@@ -462,7 +462,7 @@ public static InsnList makeConcatInternal3(String mname, ClassNode node, String
                         node.name,
                         concatMethod.name,
                         concatMethod.desc,
-                        false
+                        (node.access & Opcodes.ACC_INTERFACE) != 0
                     ));
                     return list;
                 }
@@ -480,7 +480,7 @@ public static InsnList makeConcatInternal3(String mname, ClassNode node, String
             node.name,
             method.name,
             method.desc,
-            false
+            (node.access & Opcodes.ACC_INTERFACE) != 0
         ));
         return list;
     }

diff --git a/src/main/java/xyz/wagyourtail/jvmdg/version/VersionProvider.java b/src/main/java/xyz/wagyourtail/jvmdg/version/VersionProvider.java
@@ -506,10 +506,12 @@ public MethodNode stubMethods(MethodNode method, ClassNode owner, Set<ClassNode>
                                         String newOwner = Type.getType(m.getDeclaringClass()).getInternalName();
                                         String name = m.getName();
                                         String desc = Type.getMethodDescriptor(m);
+                                        boolean intf = m.getDeclaringClass().isInterface();
                                         if (!desc.equals(hStaticDesc.getDescriptor())) {
                                             // create wrapper as desc should exactly match.
                                             newOwner = owner.name;
                                             desc = hStaticDesc.getDescriptor();
+                                            intf = (owner.access & Opcodes.ACC_INTERFACE) != 0;
                                             MethodNode found = null;
                                             int num = 0;
                                             for (MethodNode mn : owner.methods) {
@@ -562,7 +564,7 @@ public MethodNode stubMethods(MethodNode method, ClassNode owner, Set<ClassNode>
                                             newOwner,
                                             name,
                                             desc,
-                                            false
+                                            intf
                                         );
                                     }
                                 } else {
@@ -576,6 +578,7 @@ public MethodNode stubMethods(MethodNode method, ClassNode owner, Set<ClassNode>
 
                                             String name;
                                             String desc = Type.getMethodDescriptor(returnType, arguments);
+                                            boolean intf = (owner.access & Opcodes.ACC_INTERFACE) != 0;
 
                                             MethodNode found = null;
                                             int num = 0;
@@ -639,7 +642,7 @@ public MethodNode stubMethods(MethodNode method, ClassNode owner, Set<ClassNode>
                                                 owner.name,
                                                 name,
                                                 desc,
-                                                false
+                                                intf
                                             );
 
                                         }