diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/code/Injector.java b/src/main/java/org/spongepowered/asm/mixin/injection/code/Injector.java index 197189a6..9bf02d2a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/code/Injector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/code/Injector.java @@ -295,7 +295,7 @@ public abstract class Injector { injectorTarget, injectorTarget.getMergedBy(), injectorTarget.getMergedPriority())); } - if (this.findTargetNodes(method, injectionPoint, injectorTarget.getSlice(injectionPoint), nodes)) { + if (this.findTargetNodes(method, injectionPoint, injectorTarget, nodes)) { for (AbstractInsnNode insn : nodes) { Integer key = method.instructions.indexOf(insn); TargetNode targetNode = targetNodes.get(key); @@ -311,8 +311,9 @@ public abstract class Injector { return targetNodes.values(); } - protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, InsnList insns, Collection nodes) { - return injectionPoint.find(into.desc, insns, nodes); + protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, InjectorTarget injectorTarget, + Collection nodes) { + return injectionPoint.find(into.desc, injectorTarget.getSlice(injectionPoint), nodes); } protected void sanityCheck(Target target, List injectionPoints) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/BeforeLoadLocal.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/BeforeLoadLocal.java index 1d2156ff..609fb55c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/BeforeLoadLocal.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/BeforeLoadLocal.java @@ -30,6 +30,7 @@ import java.util.ListIterator; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.InsnList; import org.objectweb.asm.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InjectionPoint.AtCode; import org.spongepowered.asm.mixin.injection.ModifyVariable; @@ -199,10 +200,10 @@ public class BeforeLoadLocal extends LocalVariableInjectionPoint { } @Override - boolean find(InjectionInfo info, Target target, Collection nodes) { + boolean find(InjectionInfo info, InsnList insns, Collection nodes, Target target) { SearchState state = new SearchState(); - ListIterator iter = target.method.instructions.iterator(); + ListIterator iter = insns.iterator(); while (iter.hasNext()) { AbstractInsnNode insn = iter.next(); if (state.isPendingCheck()) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java index 7e2916af..16d5abd1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java @@ -37,9 +37,10 @@ import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InjectionPoint.RestrictTargetLevel; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.code.InjectorTarget; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; -import org.spongepowered.asm.mixin.injection.struct.InjectionPointData; import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode; +import org.spongepowered.asm.mixin.injection.struct.InjectionPointData; import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.mixin.injection.struct.Target.Extension; import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; @@ -88,7 +89,7 @@ public class ModifyVariableInjector extends Injector { throw new InvalidInjectionException(this.mixin, this.getAtCode() + " injection point must be used in conjunction with @ModifyVariable"); } - abstract boolean find(InjectionInfo info, Target target, Collection nodes); + abstract boolean find(InjectionInfo info, InsnList insns, Collection nodes, Target target); } @@ -107,12 +108,13 @@ public class ModifyVariableInjector extends Injector { } @Override - protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, InsnList insns, Collection nodes) { + protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, InjectorTarget injectorTarget, + Collection nodes) { if (injectionPoint instanceof LocalVariableInjectionPoint) { - Target target = this.info.getContext().getTargetMethod(into); - return ((LocalVariableInjectionPoint)injectionPoint).find(this.info, target, nodes); + return ((LocalVariableInjectionPoint)injectionPoint).find(this.info, injectorTarget.getSlice(injectionPoint), nodes, + injectorTarget.getTarget()); } - return injectionPoint.find(into.desc, insns, nodes); + return injectionPoint.find(into.desc, injectorTarget.getSlice(injectionPoint), nodes); } /* (non-Javadoc)