diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java index e8512fda..726629d6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java @@ -422,8 +422,8 @@ public class CallbackInjector extends Injector { private String generateBadLVTMessage(final Callback callback) { int position = callback.target.method.instructions.indexOf(callback.node); List expected = CallbackInjector.summariseLocals(this.methodNode.desc, callback.target.arguments.length + 1); - List found = CallbackInjector.summariseLocals(callback.localTypes, callback.frameSize); - String message = String.format("LVT in %s::%s has incompatible changes at opcode %d in callback %s%s.\nExpected: %s\n Found:%s", + List found = CallbackInjector.summariseLocals(callback.getDescriptorWithAllLocals(), callback.frameSize); + String message = String.format("LVT in %s::%s has incompatible changes at opcode %d in callback %s%s.\nExpected: %s\n Found: %s", this.classNode.name, callback.target.method.name, position, this.methodNode.name, this.methodNode.desc, expected, found); return message; } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java index 210a36ea..6737f297 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/Target.java @@ -255,9 +255,10 @@ public class Target { } String descriptor = this.callbackDescriptor.substring(0, this.callbackDescriptor.indexOf(')')); - for (int l = startIndex; l < locals.length && l < (startIndex + extra); l++) { + for (int l = startIndex; l < locals.length && extra > 0; l++) { if (locals[l] != null) { descriptor += locals[l].getDescriptor(); + extra--; } } diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index d1cf5feb..04dc4323 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -72,9 +72,10 @@ public class Locals { */ public static void loadLocals(Type[] locals, InsnList insns, int pos, int limit) { limit += pos; - for (; pos < locals.length && pos < limit; pos++) { + for (; pos < locals.length && limit > 0; pos++) { if (locals[pos] != null) { insns.add(new VarInsnNode(locals[pos].getOpcode(Opcodes.ILOAD), pos)); + limit--; } } }