Mixin fix + ASM update

Author: terminalsin

build.gradle

@@ -57,9 +57,9 @@ allprojects {
 
 
     ext {
-        asm = 'org.ow2.asm:asm:9.7.1'
-        asm_commons = 'org.ow2.asm:asm-commons:9.7.1'
-        asm_tree = 'org.ow2.asm:asm-tree:9.7.1'
+        asm = 'org.ow2.asm:asm:9.9.1'
+        asm_commons = 'org.ow2.asm:asm-commons:9.9.1'
+        asm_tree = 'org.ow2.asm:asm-tree:9.9.1'
         cafedude = 'com.github.Col-E:CAFED00D:2.1.1'
         slf4j_api = 'org.slf4j:slf4j-api:1.7.36'
         jlinker = 'com.github.xxDark:jlinker:1.0.7'

dev.skidfuscator.obfuscator/skidfuscator-error-aqt.txt

@@ -1,6 +1,7 @@
 package dev.skidfuscator.obfuscator.hierarchy;
 
 import dev.skidfuscator.obfuscator.Skidfuscator;
+import dev.skidfuscator.obfuscator.hierarchy.err.InvalidLambdaCallException;
 import dev.skidfuscator.obfuscator.hierarchy.matching.ClassMethodHash;
 import dev.skidfuscator.obfuscator.skidasm.*;
 import dev.skidfuscator.obfuscator.skidasm.cfg.SkidControlFlowGraph;
@@ -383,25 +384,8 @@ private void setupInvoke() {
                                             if (!node.getMethods().isEmpty()) {
 
                                                 // [validation] cannot have more than one method in implicit function
-                                                if (node.getMethods().size() > 1) {
-                                                    throw new IllegalStateException(String.format(
-                                                            """
-                                                            -----------------------------------------------------
-                                                            /!\\ Skidfuscator failed to verify a lambda call! 
-                                                            Please report this to the developer...
-                                                            -----------------------------------------------------
-                                                            Bound: %s
-                                                            Target: %s
-                                                            Target Methods: %s
-                                                            -----------------------------------------------------
-                                                            """,
-                                                            boundFunc,
-                                                            node.getDisplayName(),
-                                                            node.getMethods().stream()
-                                                                    .map(MethodNode::toString)
-                                                                    .reduce("\n- ", (s, s2) -> s + "\n- " + s2)
-
-                                                    ));
+                                                if (node.getMethods().size() != 1) {
+                                                    throw new InvalidLambdaCallException(boundFunc, node);
                                                 }
 
                                                 // must be correct
@@ -411,6 +395,11 @@ private void setupInvoke() {
                                         }
 
                                         if (methodNode != null) {
+                                            // [validation] Discovered lambda call must belong to a group
+                                            if (methodNode.getGroup() == null) {
+                                                throw new InvalidLambdaCallException(boundFunc, targetClass);
+                                            }
+
                                             methodNode.getGroup().setImplicitFunction(true);
                                             return;
                                         }

dev.skidfuscator.obfuscator/skidfuscator-error-arq.txt

@@ -0,0 +1,28 @@
+package dev.skidfuscator.obfuscator.hierarchy.err;
+
+import org.mapleir.asm.ClassNode;
+import org.mapleir.asm.MethodNode;
+import org.objectweb.asm.Handle;
+
+public class InvalidLambdaCallException extends RuntimeException {
+    public InvalidLambdaCallException(Handle boundFunc, ClassNode node) {
+        super(String.format(
+                """
+                -----------------------------------------------------
+                /!\\ Skidfuscator failed to verify a lambda call! 
+                Please report this to the developer...
+                -----------------------------------------------------
+                Bound: %s
+                Target: %s
+                Target Methods: %s
+                -----------------------------------------------------
+                """,
+                boundFunc,
+                node.getDisplayName(),
+                node.getMethods().stream()
+                        .map(MethodNode::toString)
+                        .reduce("\n- ", (s, s2) -> s + "\n- " + s2)
+
+        ));
+    }
+}