Make usedLocalNodes unique

Fix local ordinal resolution

Author: Su5eD

core/src/main/java/org/sinytra/adapter/analysis/locals/LocalVarAnalyzer.java

@@ -7,19 +7,16 @@
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.*;
-import org.sinytra.adapter.env.ctx.MixinContext;
-import org.sinytra.adapter.env.ctx.TargetPair;
 import org.sinytra.adapter.analysis.params.EnhancedParamsDiff;
 import org.sinytra.adapter.analysis.params.ParamsDiffSnapshot;
 import org.sinytra.adapter.env.ctx.LocalVariable;
+import org.sinytra.adapter.env.ctx.MixinContext;
+import org.sinytra.adapter.env.ctx.TargetPair;
 import org.sinytra.adapter.transform.param.TransformParameters;
 import org.sinytra.adapter.util.AdapterUtil;
 import org.sinytra.adapter.util.OpcodeUtil;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.IntStream;
 
 public final class LocalVarAnalyzer {
@@ -64,7 +61,7 @@ public static InsnList findInitializerInsns(MethodNode methodNode, int index) {
     public record CapturedLocalsUsage(LocalVariableLookup targetTable, Int2IntMap usageCount, Int2ObjectMap<InsnList> varInsnLists) {
     }
 
-    public record CapturedLocalsTransform(List<Integer> used, TransformParameters remover, List<LocalVariableNode> usedLocalNodes) {
+    public record CapturedLocalsTransform(List<Integer> used, TransformParameters remover, Collection<LocalVariableNode> usedLocalNodes) {
         public CapturedLocalsUsage getUsage(AdapterUtil.CapturedLocals capturedLocals) {
             LocalVariableLookup targetTable = new LocalVariableLookup(capturedLocals.target().methodNode());
             Int2ObjectMap<InsnList> varInsnLists = new Int2ObjectOpenHashMap<>();
@@ -82,14 +79,15 @@ public static CapturedLocalsTransform analyzeCapturedLocals(AdapterUtil.Captured
         int paramLocalStart = capturedLocals.paramLocalStart();
         LocalVariableLookup table = capturedLocals.lvt();
         List<Integer> used = new ArrayList<>();
-        List<LocalVariableNode> usedLocalNodes = new ArrayList<>();
+        Set<LocalVariableNode> usedLocalNodes = new HashSet<>();
         for (AbstractInsnNode insn : methodNode.instructions) {
             if (insn instanceof VarInsnNode varInsn) {
                 LocalVariableNode node = table.getByIndexOrNull(varInsn.var);
-                if (node == null) {
+                if (node == null) 
                     continue;
-                }
                 int ordinal = table.getParameterOrdinal(node);
+                if (ordinal == -1)
+                    continue;
                 if (ordinal >= paramLocalStart && ordinal <= capturedLocals.paramLocalEnd()) {
                     used.add(ordinal);
                     usedLocalNodes.add(node);

core/src/main/java/org/sinytra/adapter/analysis/locals/LocalVariableLookup.java

@@ -13,6 +13,7 @@
 public class LocalVariableLookup {
     private final List<LocalVariableNode> sortedLocals;
     private final boolean isNonStatic;
+    private final int lastParamLVTIndex;
     private final Int2ObjectMap<LocalVariableNode> byIndex = new Int2ObjectOpenHashMap<>();
     private final Map<Type, List<LocalVariableNode>> byType = new HashMap<>();
 
@@ -22,6 +23,7 @@ public LocalVariableLookup(MethodNode methodNode) {
         for (LocalVariableNode node : this.sortedLocals) {
             this.byIndex.put(node.index, node);
         }
+        this.lastParamLVTIndex = Type.getArgumentTypes(methodNode.desc).length + (this.isNonStatic ? 1 : 0);
     }
 
     public LocalVariableNode getByOrdinal(int ordinal) {
@@ -46,6 +48,9 @@ public int getOrdinal(LocalVariableNode node) {
     }
 
     public int getParameterOrdinal(LocalVariableNode node) {
+        if (node.index > this.lastParamLVTIndex) {
+            return -1;
+        }
         return getOrdinal(node) - (this.isNonStatic ? 1 : 0);
     }
 

core/src/main/java/org/sinytra/adapter/transform/preprocess/LocalCaptureUpgradeTransformer.java

@@ -59,15 +59,15 @@ public PatchResult apply(MixinContext context, Configuration config) {
             if (cleanLocals.size() != dirtyLocals.size())
                 return PatchResult.PASS;
 
-            List<LocalVariableNode> sameType = methodNode.localVariables.stream()
-                .filter(l -> Type.getType(l.desc).equals(expected))
-                .toList();
-            int localOrdinal = sameType.indexOf(node);
+            int localOrdinal = lookup.getTypedOrdinal(node).orElse(-1);
             if (localOrdinal == -1) return PatchResult.PASS;
 
             int paramOrdinal = lookup.getParameterOrdinal(node);
-            parameterToOrdinal.put(paramOrdinal, localOrdinal);
             usedOrdinals.add(paramOrdinal);
+
+            if (cleanLocals.size() > 1) {
+                parameterToOrdinal.put(paramOrdinal, localOrdinal);
+            }
         }
 
         Type[] args = Type.getArgumentTypes(methodNode.desc);

core/src/main/java/org/sinytra/adapter/util/AdapterUtil.java

@@ -231,7 +231,8 @@ public static CapturedLocals getCapturedLocals(MixinContext context, TargetPair
         int paramLocalPosVal = paramLocalPos.getAsInt();
         // Get expected local variables from method parameters
         List<Type> expected = AdapterUtil.summariseLocals(availableParams, paramLocalPosVal);
-        return new CapturedLocals(dirtyTarget, isStatic, paramLocalPosVal, paramLocalPosVal + expected.size(), lvtOffset, expected, new LocalVariableLookup(methodNode));
+        int paramLocalPosEnd = paramLocalPosVal + expected.size() - 1;
+        return new CapturedLocals(dirtyTarget, isStatic, paramLocalPosVal, paramLocalPosEnd, lvtOffset, expected, new LocalVariableLookup(methodNode));
     }
 
     private static OptionalInt getCapturedLocalStartingIndex(Type[] params) {