From 600218692b5b628396d1860d683e32a5d7945bba Mon Sep 17 00:00:00 2001 From: Runemoro Date: Mon, 1 Jul 2019 22:54:00 -0400 Subject: [PATCH 1/2] Fix lambda variable names conflicting with names in the enclosing method --- .../java/net/fabricmc/stitch/util/SnowmanClassVisitor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java b/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java index 7e165f3..4696f5a 100644 --- a/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java +++ b/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java @@ -21,6 +21,8 @@ import org.objectweb.asm.MethodVisitor; public class SnowmanClassVisitor extends ClassVisitor { + private int localCounter = 0; + public static class SnowmanMethodVisitor extends MethodVisitor { public SnowmanMethodVisitor(int api, MethodVisitor methodVisitor) { super(api, methodVisitor); @@ -45,7 +47,7 @@ public void visitLocalVariable( final int index) { String newName = name; if (name != null && name.startsWith("\u2603")) { - newName = "lvt" + index; + newName = "local_" + localCounter++; } super.visitLocalVariable(newName, descriptor, signature, start, end, index); } From 9a97f9ec5f65f17832a7b10563ca78bb7b75603c Mon Sep 17 00:00:00 2001 From: Runemoro Date: Mon, 1 Jul 2019 23:19:20 -0400 Subject: [PATCH 2/2] Update SnowmanClassVisitor.java --- src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java b/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java index 4696f5a..e4eff30 100644 --- a/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java +++ b/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java @@ -47,7 +47,7 @@ public void visitLocalVariable( final int index) { String newName = name; if (name != null && name.startsWith("\u2603")) { - newName = "local_" + localCounter++; + newName = "var" + localCounter++; } super.visitLocalVariable(newName, descriptor, signature, start, end, index); }