From 08980b28a4a7587b5201b78ec1f90a5bd37fddf8 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 12 Oct 2019 18:40:46 +0100 Subject: [PATCH] Remove missed debugging statements from previous commit --- .../asm/mixin/injection/invoke/ModifyArgsInjector.java | 1 + .../asm/mixin/injection/invoke/ModifyConstantInjector.java | 3 --- .../asm/mixin/injection/invoke/util/InsnFinder.java | 2 -- .../asm/mixin/injection/struct/InjectionInfo.java | 3 +-- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java index eb16b82d..b722d806 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java @@ -100,6 +100,7 @@ public class ModifyArgsInjector extends InvokeInjector { this.invokeHandler(insns); this.unpackArgs(insns, clArgs, args); + extraStack.apply(); target.insns.insertBefore(targetMethod, insns); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java index 9fe36430..35732fb2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java @@ -99,7 +99,6 @@ public class ModifyConstantInjector extends RedirectInjector { * @param jumpNode jump instruction (must be IFLT, IFGE, IFGT or IFLE) */ private void injectExpandedConstantModifier(Target target, JumpInsnNode jumpNode) { - Bytecode.printMethod(target.method); int opcode = jumpNode.getOpcode(); if (opcode < Opcodes.IFLT || opcode > Opcodes.IFLE) { throw new InvalidInjectionException(this.info, this.annotationType + " annotation selected an invalid opcode " @@ -113,7 +112,6 @@ public class ModifyConstantInjector extends RedirectInjector { insns.add(new JumpInsnNode(opcode + ModifyConstantInjector.OPCODE_OFFSET, jumpNode.label)); extraStack.add(1).apply(); target.replaceNode(jumpNode, invoke, insns); - Bytecode.printMethod(target.method); } private void injectConstantModifier(Target target, AbstractInsnNode constNode) { @@ -129,7 +127,6 @@ public class ModifyConstantInjector extends RedirectInjector { AbstractInsnNode invoke = this.invokeConstantHandler(constantType, target, extraStack, before, after); extraStack.apply(); target.wrapNode(constNode, invoke, before, after); - Bytecode.printMethod(target.method); } private AbstractInsnNode invokeConstantHandler(Type constantType, Target target, Extension extraStack, InsnList before, InsnList after) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/util/InsnFinder.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/util/InsnFinder.java index c79f6c46..364ceba3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/util/InsnFinder.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/util/InsnFinder.java @@ -34,7 +34,6 @@ import org.objectweb.asm.tree.analysis.BasicValue; import org.objectweb.asm.tree.analysis.Frame; import org.objectweb.asm.tree.analysis.Interpreter; import org.spongepowered.asm.mixin.injection.struct.Target; -import org.spongepowered.asm.util.Bytecode; /** * Utility class for finding instructions using static analysis @@ -164,7 +163,6 @@ public class InsnFinder { try { new PopAnalyzer(node).analyze(target.classNode.name, target.method); } catch (AnalyzerException ex) { - Bytecode.printMethod(target.method); if (ex.getCause() instanceof AnalysisResultException) { return ((AnalysisResultException)ex.getCause()).getResult(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java index 177c6257..ceee6ed4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java @@ -366,8 +366,7 @@ public abstract class InjectionInfo extends SpecialMethodInfo implements ISliceC */ public void inject() { for (Entry> entry : this.targetNodes.entrySet()) { - Target target = entry.getKey(); - this.injector.inject(target, entry.getValue()); + this.injector.inject(entry.getKey(), entry.getValue()); } this.targets.clear(); }