From 34402ab33ce261bde9d5e429e92bea575fce4577 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 12:46:09 +0000 Subject: [PATCH] Fix outstanding stack calc issues, fixes #85 --- .../asm/mixin/injection/callback/CallbackInjector.java | 7 ++----- .../asm/mixin/injection/invoke/ModifyArgInjector.java | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) 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 974200d5..fde13221 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 @@ -411,6 +411,7 @@ public class CallbackInjector extends Injector { } } + this.dupReturnValue(callback); if (this.cancellable) { this.createCallbackInfo(callback, true); } @@ -500,16 +501,12 @@ public class CallbackInjector extends Injector { * @param store store the callback info in a local variable */ private void createCallbackInfo(final Callback callback, boolean store) { - this.dupReturnValue(callback); - callback.add(new TypeInsnNode(Opcodes.NEW, callback.target.callbackInfoClass), true, !store); callback.add(new InsnNode(Opcodes.DUP), true, true); this.invokeCallbackInfoCtor(callback, store); if (store) { callback.add(new VarInsnNode(Opcodes.ASTORE, callback.marshallVar)); - } else if (callback.target.returnType != Type.VOID_TYPE) { - callback.invoke++; } } @@ -566,7 +563,7 @@ public class CallbackInjector extends Injector { private void invokeCallback(final Callback callback, final MethodNode callbackMethod) { // Push "this" onto the stack if the callback is not static if (!this.isStatic) { - callback.add(new VarInsnNode(Opcodes.ALOAD, 0)); + callback.add(new VarInsnNode(Opcodes.ALOAD, 0), false, true); } // Push the target method's parameters onto the stack diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgInjector.java index f76c33b3..0ae600b4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgInjector.java @@ -110,7 +110,7 @@ public class ModifyArgInjector extends InvokeInjector { int[] argMap = this.storeArgs(target, args, insns, argIndex); this.invokeHandlerWithArgs(args, insns, argMap, argIndex, argIndex + 1); this.pushArgs(args, insns, argMap, argIndex + 1, args.length); - return (target.getCurrentMaxLocals() - argMap[argMap.length - 1]) + 1 + args[args.length - 1].getSize(); + return (argMap[argMap.length - 1] - target.getMaxLocals()) + args[args.length - 1].getSize(); } /** @@ -126,7 +126,7 @@ public class ModifyArgInjector extends InvokeInjector { this.pushArgs(args, insns, argMap, 0, argIndex); this.invokeHandlerWithArgs(args, insns, argMap, 0, args.length); this.pushArgs(args, insns, argMap, argIndex + 1, args.length); - return (target.getCurrentMaxLocals() - argMap[argMap.length - 1]) + 1 + args[args.length - 1].getSize(); + return (argMap[argMap.length - 1] - target.getMaxLocals()) + args[args.length - 1].getSize(); } protected int findArgIndex(Target target, Type[] args) {