From f679568c7cda5545e3639fae2fd83a2fabbd0c44 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 20 Feb 2015 18:29:12 +0000 Subject: [PATCH] Fix some stack size calculation issues --- .../asm/mixin/injection/invoke/ModifyArgInjector.java | 9 ++++----- .../asm/mixin/transformer/MixinTransformer.java | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) 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 379d505e..5498ab2a 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 @@ -89,7 +89,6 @@ public class ModifyArgInjector extends InvokeInjector { protected void inject(Target target, MethodInsnNode node) { Type[] args = Type.getArgumentTypes(node.desc); int argIndex = this.findArgIndex(target, args); - InsnList insns = new InsnList(); int extraLocals = 0; @@ -100,8 +99,8 @@ public class ModifyArgInjector extends InvokeInjector { } target.method.instructions.insertBefore(node, insns); - target.method.maxLocals = Math.max(target.method.maxLocals, target.maxLocals + extraLocals); - target.method.maxStack = Math.max(target.method.maxStack, target.maxStack + 2 - extraLocals); + target.method.maxLocals = Math.max(target.maxLocals, target.method.maxLocals + extraLocals); + target.method.maxStack = Math.max(target.maxStack, target.method.maxStack + 2 - (extraLocals - 1)); } /** @@ -111,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.method.maxLocals - argMap[argMap.length - 1] - 1 + args[args.length - 1].getSize(); + return (target.method.maxLocals - argMap[argMap.length - 1]) + 1 + args[args.length - 1].getSize(); } /** @@ -127,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.method.maxLocals - argMap[argMap.length - 1] - 1 + args[args.length - 1].getSize(); + return (target.method.maxLocals - argMap[argMap.length - 1]) + 1 + args[args.length - 1].getSize(); } protected int findArgIndex(Target target, Type[] args) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java index 97bbc16c..e42a381e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -640,6 +640,7 @@ public class MixinTransformer extends TreeTransformer { // Patch the initialiser into the target class ctors for (MethodNode method : targetClass.methods) { if (MixinTransformer.INIT.equals(method.name)) { + method.maxStack = Math.max(method.maxStack, ctor.maxStack); this.injectInitialiser(method, initialiser); } }