From 8f9b6148a1f2d185e5b8244edb8cbd9971f6eae7 Mon Sep 17 00:00:00 2001 From: bloodmc Date: Tue, 15 Sep 2015 14:35:19 -0400 Subject: [PATCH 001/169] Add new INIT phase to handle FML deobf transformer. --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/MixinEnvironment.java | 48 ++++++++++++++++++- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 53acb410..a8b235bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.5 +buildVersion=0.4.6 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 8aa58ebd..e48bcec4 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.5"; + public static final String VERSION = "0.4.6"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index f9f3466f..57a43040 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -25,6 +25,7 @@ package org.spongepowered.asm.mixin; import java.io.File; +import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; @@ -35,9 +36,14 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.helpers.Booleans; +import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.appender.AbstractAppender; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; import org.spongepowered.asm.mixin.transformer.MixinTransformer; @@ -76,16 +82,22 @@ public class MixinEnvironment implements ITokenProvider { */ public static final Phase PREINIT = new Phase(0, "PREINIT"); + /** + * "Initialisation" phase, after FML's deobf transformer has loaded + */ + public static final Phase INIT = new Phase(1, "INIT"); + /** * "Default" phase, during runtime */ - public static final Phase DEFAULT = new Phase(1, "DEFAULT"); + public static final Phase DEFAULT = new Phase(2, "DEFAULT"); /** * All phases */ static final List phases = ImmutableList.of( Phase.PREINIT, + Phase.INIT, Phase.DEFAULT ); @@ -392,6 +404,33 @@ public class MixinEnvironment implements ITokenProvider { } + static class MixinLogger { + + static MixinAppender appender = new MixinAppender("MixinLogger", null, null); + + public MixinLogger() { + org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); + log.addAppender(appender); + } + + static class MixinAppender extends AbstractAppender { + + protected MixinAppender(String name, Filter filter, Layout layout) { + super(name, filter, layout); + // TODO Auto-generated constructor stub + } + + @Override + public void append(LogEvent event) { + if (event.getLevel() == Level.DEBUG && "Validating minecraft".equals(event.getMessage().getFormat())) { + // transition to INIT + MixinEnvironment.gotoPhase(Phase.INIT); + } + } + + } + } + /** * Known re-entrant transformers, other re-entrant transformers will * detected automatically @@ -861,6 +900,7 @@ public class MixinEnvironment implements ITokenProvider { if (MixinEnvironment.currentPhase == Phase.NOT_INITIALISED) { MixinEnvironment.currentPhase = phase; MixinEnvironment.getEnvironment(phase); + new MixinLogger(); } } @@ -913,6 +953,12 @@ public class MixinEnvironment implements ITokenProvider { MixinBootstrap.addProxy(); } + if (phase == Phase.DEFAULT) { + // remove appender + org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); + log.removeAppender(MixinLogger.appender); + } + MixinEnvironment.currentPhase = phase; MixinEnvironment.currentEnvironment = MixinEnvironment.getEnvironment(MixinEnvironment.getCurrentPhase()); } From bdda81fb265a56ab0262e9b71fd87f7f7441becb Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Tue, 15 Sep 2015 21:20:21 -0500 Subject: [PATCH 002/169] Perform nasty filter switch to gurarantee that we'll switch into INIT. While @bloodmc 's changes did fix dev and prod time, it doesn't work with the IVY launcher built into the Sponge mod. This works around it by manipulating logger levels and adding a filter to hide what we are doing. @Mumfrey you'll definately want to get rid of this ASAP... Signed-off-by: Chris Sanders --- .../asm/mixin/MixinEnvironment.java | 112 ++++++++++++------ .../mixin/transformer/MixinTransformer.java | 4 +- 2 files changed, 79 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 57a43040..20e97f33 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -24,40 +24,39 @@ */ package org.spongepowered.asm.mixin; -import java.io.File; -import java.io.Serializable; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; +import net.minecraft.launchwrapper.IClassNameTransformer; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.helpers.Booleans; +import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.filter.AbstractFilter; +import org.apache.logging.log4j.core.helpers.Booleans; +import org.apache.logging.log4j.message.Message; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.asm.util.PrettyPrinter; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; - -import net.minecraft.launchwrapper.IClassNameTransformer; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; +import java.io.File; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** @@ -406,28 +405,61 @@ public class MixinEnvironment implements ITokenProvider { static class MixinLogger { - static MixinAppender appender = new MixinAppender("MixinLogger", null, null); + static MixinFilter filter = new MixinFilter(); public MixinLogger() { + // Prep ugly hack for INIT phase org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); - log.addAppender(appender); + log.addFilter(filter); + // Set the level to DEBUG for FML logger. We don't need to check for obfuscation as it would be debug anyways in DEV + log.setLevel(Level.DEBUG); } - static class MixinAppender extends AbstractAppender { + // Commence ugly hack for INIT phase + static class MixinFilter extends AbstractFilter { - protected MixinAppender(String name, Filter filter, Layout layout) { - super(name, filter, layout); - // TODO Auto-generated constructor stub + @Override + public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final String msg, + final Object... params) { + if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg)) { + MixinEnvironment.gotoPhase(Phase.INIT); + } + // Log entries can be filtered before the blackboard has this value. We'll just look it up. + Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return filter != null && filter ? Result.NEUTRAL : Result.DENY; } @Override - public void append(LogEvent event) { - if (event.getLevel() == Level.DEBUG && "Validating minecraft".equals(event.getMessage().getFormat())) { - // transition to INIT + public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final Object msg, + final Throwable t) { + if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg)) { MixinEnvironment.gotoPhase(Phase.INIT); } + // Log entries can be filtered before the blackboard has this value. We'll just look it up. + Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return filter != null && filter ? Result.NEUTRAL : Result.DENY; + } + + @Override + public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final Message msg, + final Throwable t) { + if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg.getFormattedMessage())) { + MixinEnvironment.gotoPhase(Phase.INIT); + } + // Log entries can be filtered before the blackboard has this value. We'll just look it up. + Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return filter != null && filter ? Result.NEUTRAL : Result.DENY; + } + + @Override + public Result filter(final LogEvent event) { + if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(event.getMessage().getFormattedMessage())) { + MixinEnvironment.gotoPhase(Phase.INIT); + } + // Log entries can be filtered before the blackboard has this value. We'll just look it up. + Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return filter != null && filter ? Result.NEUTRAL : Result.DENY; } - } } @@ -954,9 +986,19 @@ public class MixinEnvironment implements ITokenProvider { } if (phase == Phase.DEFAULT) { - // remove appender + // Remove filter org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); - log.removeAppender(MixinLogger.appender); + for (Iterator iter = log.getFilters(); iter.hasNext();) { + final Filter filter = iter.next(); + if (filter instanceof MixinLogger.MixinFilter) { + // If FML isn't in obfuscated environment, we need to hotswap the log level back + if (!(Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) { + log.setLevel(Level.INFO); + } + iter.remove(); + break; + } + } } MixinEnvironment.currentPhase = phase; 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 adcc3004..4c5325c7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -354,7 +354,7 @@ public class MixinTransformer extends TreeTransformer { boolean locked = this.lock.push().isSet(); MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); - + if (this.currentEnvironment != environment && !locked) { try { this.init(environment); @@ -363,7 +363,7 @@ public class MixinTransformer extends TreeTransformer { throw new RuntimeException(ex); } } - + try { SortedSet mixins = null; boolean invalidRef = false; From d12d3f271c9a499897bb8f1d5f01ca74b8e7ae3d Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Thu, 17 Sep 2015 15:50:55 -0500 Subject: [PATCH 003/169] Always check isFMLDeobfuscated for null status. Signed-off-by: Chris Sanders --- .../asm/mixin/MixinEnvironment.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 20e97f33..b0550d23 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -411,8 +411,11 @@ public class MixinEnvironment implements ITokenProvider { // Prep ugly hack for INIT phase org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); log.addFilter(filter); - // Set the level to DEBUG for FML logger. We don't need to check for obfuscation as it would be debug anyways in DEV - log.setLevel(Level.DEBUG); + final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + if (isFMLDeobfuscated != null && !isFMLDeobfuscated) { + // Set the level to DEBUG for FML logger. We don't need to check for obfuscation as it would be debug anyways in DEV + log.setLevel(Level.DEBUG); + } } // Commence ugly hack for INIT phase @@ -425,8 +428,8 @@ public class MixinEnvironment implements ITokenProvider { MixinEnvironment.gotoPhase(Phase.INIT); } // Log entries can be filtered before the blackboard has this value. We'll just look it up. - Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return filter != null && filter ? Result.NEUTRAL : Result.DENY; + final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; } @Override @@ -436,8 +439,8 @@ public class MixinEnvironment implements ITokenProvider { MixinEnvironment.gotoPhase(Phase.INIT); } // Log entries can be filtered before the blackboard has this value. We'll just look it up. - Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return filter != null && filter ? Result.NEUTRAL : Result.DENY; + final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; } @Override @@ -447,8 +450,8 @@ public class MixinEnvironment implements ITokenProvider { MixinEnvironment.gotoPhase(Phase.INIT); } // Log entries can be filtered before the blackboard has this value. We'll just look it up. - Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return filter != null && filter ? Result.NEUTRAL : Result.DENY; + final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; } @Override @@ -457,8 +460,8 @@ public class MixinEnvironment implements ITokenProvider { MixinEnvironment.gotoPhase(Phase.INIT); } // Log entries can be filtered before the blackboard has this value. We'll just look it up. - Boolean filter = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return filter != null && filter ? Result.NEUTRAL : Result.DENY; + final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); + return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; } } } @@ -991,8 +994,9 @@ public class MixinEnvironment implements ITokenProvider { for (Iterator iter = log.getFilters(); iter.hasNext();) { final Filter filter = iter.next(); if (filter instanceof MixinLogger.MixinFilter) { + final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); // If FML isn't in obfuscated environment, we need to hotswap the log level back - if (!(Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) { + if (isFMLDeobfuscated != null && !isFMLDeobfuscated) { log.setLevel(Level.INFO); } iter.remove(); From f3c4945019c0725b02df085ff745ffd3fd0b38e9 Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Sun, 27 Sep 2015 20:16:44 -0500 Subject: [PATCH 004/169] Set debug regardless. This happens before FML sets deobfuscation. Signed-off-by: Chris Sanders --- .../java/org/spongepowered/asm/mixin/MixinEnvironment.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index b0550d23..ea2f47b3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -411,11 +411,7 @@ public class MixinEnvironment implements ITokenProvider { // Prep ugly hack for INIT phase org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); log.addFilter(filter); - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - if (isFMLDeobfuscated != null && !isFMLDeobfuscated) { - // Set the level to DEBUG for FML logger. We don't need to check for obfuscation as it would be debug anyways in DEV - log.setLevel(Level.DEBUG); - } + log.setLevel(Level.DEBUG); } // Commence ugly hack for INIT phase From b3de136706969bdc09ff340b5ecec4415b055d72 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Sat, 10 Oct 2015 11:26:55 +1300 Subject: [PATCH 005/169] Added support for lambda expressions inside mixins To support lambda expression the mixin transformer will transform invoke dynamic instructions in the same way as it transforms other invoke instructions as well as transforming their static arguments. Invoke dynamic static arguments can be any constant loadable by ldc instructions and this includes MethodHandles, so it transforms the MethodHandle as if it was a normal invoke instruction. Note any mixin class that has an invokedynamic instruction in it will now have the target class, class file version set to 52(java 8). --- .../mixin/transformer/MixinTargetContext.java | 374 ++++++++++++++---- 1 file changed, 307 insertions(+), 67 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index a5316fa5..e3cc886d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -32,16 +32,10 @@ import java.util.Map; import java.util.Set; import org.apache.logging.log4j.Level; +import org.spongepowered.asm.lib.Handle; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.AbstractInsnNode; -import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.lib.tree.FieldInsnNode; -import org.spongepowered.asm.lib.tree.FieldNode; -import org.spongepowered.asm.lib.tree.LdcInsnNode; -import org.spongepowered.asm.lib.tree.MethodInsnNode; -import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.lib.tree.TypeInsnNode; +import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.SoftOverride; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; @@ -237,13 +231,15 @@ public class MixinTargetContext implements IReferenceMapperContext { AbstractInsnNode insn = iter.next(); if (insn instanceof MethodInsnNode) { - this.transformMethodNode(method, iter, (MethodInsnNode)insn); + this.transformMethodRef(method, iter, new StaticMethodRef((MethodInsnNode)insn)); } else if (insn instanceof FieldInsnNode) { - this.transformFieldNode(method, iter, (FieldInsnNode)insn); + this.transformFieldRef(method, iter, new StaticFieldRef((FieldInsnNode)insn)); } else if (insn instanceof TypeInsnNode) { this.transformTypeNode(method, iter, (TypeInsnNode)insn); } else if (insn instanceof LdcInsnNode) { this.transformConstantNode(method, iter, (LdcInsnNode)insn); + } else if (insn instanceof InvokeDynamicInsnNode) { + this.transformInvokeDynamicNode(method, iter, (InvokeDynamicInsnNode)insn); } } } @@ -266,51 +262,56 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * Transforms method invocations in the method. Updates static and dynamic - * bindings. + * Transforms a method invocation/reference in the method. Updates static + * and dynamic bindings. * * @param method Method being processed * @param iter Insn interator - * @param methodInsn Insn to transform + * @param methodRef Method reference to transform */ - private void transformMethodNode(MethodNode method, Iterator iter, MethodInsnNode methodInsn) { - this.transformDescriptor(methodInsn); + private void transformMethodRef(MethodNode method, Iterator iter, MemberRef methodRef) { + this.transformDescriptor(methodRef); - if (methodInsn.owner.equals(this.getClassRef())) { - methodInsn.owner = this.targetClass.name; + if (methodRef.getOwner().equals(this.getClassRef())) { + methodRef.setOwner(this.targetClass.name); } else if ((this.detachedSuper || this.inheritsFromMixin)) { - if (methodInsn.getOpcode() == Opcodes.INVOKESPECIAL) { - this.updateStaticBinding(method, methodInsn); - } else if (methodInsn.getOpcode() == Opcodes.INVOKEVIRTUAL && ClassInfo.forName(methodInsn.owner).isMixin()) { - this.updateDynamicBinding(method, methodInsn); + if (methodRef.getOpcode() == Opcodes.INVOKESPECIAL) { + this.updateStaticBinding(method, methodRef); + } else if (methodRef.getOpcode() == Opcodes.INVOKEVIRTUAL && ClassInfo.forName(methodRef.getOwner()).isMixin()) { + this.updateDynamicBinding(method, methodRef); } } } /** - * Transforms field accesses in the method. Handles imaginary super accesses - * and converts them to real super-invocations and rewrites field accesses - * which refer to mixin or supermixin classes to their relevant targets. + * Transforms field access/reference in the method. Handles imaginary super + * accesses and converts them to real super-invocations and rewrites field + * accesses which refer to mixin or supermixin classes to their relevant + * targets. * * @param method Method being processed * @param iter Insn interator - * @param fieldInsn Insn to transform + * @param fieldRef Field Reference to transform */ - private void transformFieldNode(MethodNode method, Iterator iter, FieldInsnNode fieldInsn) { - if (Constants.IMAGINARY_SUPER.equals(fieldInsn.name)) { - this.processImaginarySuper(method, fieldInsn); - iter.remove(); + private void transformFieldRef(MethodNode method, Iterator iter, MemberRef fieldRef) { + if (Constants.IMAGINARY_SUPER.equals(fieldRef.getName())) { + if (fieldRef instanceof StaticFieldRef) { + this.processImaginarySuper(method, ((StaticFieldRef) fieldRef).insn); + iter.remove(); + } else { + throw new InvalidMixinException(this.mixin, "Cannot call imaginary super from method handle."); + } } - this.transformDescriptor(fieldInsn); + this.transformDescriptor(fieldRef); - if (fieldInsn.owner.equals(this.getClassRef())) { - fieldInsn.owner = this.targetClass.name; + if (fieldRef.getOwner().equals(this.getClassRef())) { + fieldRef.setOwner(this.targetClass.name); } else { - ClassInfo fieldOwner = ClassInfo.forName(fieldInsn.owner); + ClassInfo fieldOwner = ClassInfo.forName(fieldRef.getOwner()); if (fieldOwner.isMixin()) { ClassInfo actualOwner = this.targetClassInfo.findCorrespondingType(fieldOwner); - fieldInsn.owner = actualOwner != null ? actualOwner.getName() : this.targetClass.name; + fieldRef.setOwner(actualOwner != null ? actualOwner.getName() : this.targetClass.name); } } } @@ -342,13 +343,250 @@ public class MixinTargetContext implements IReferenceMapperContext { private void transformConstantNode(MethodNode method, Iterator iter, LdcInsnNode ldcInsn) { if (ldcInsn.cst instanceof Type) { Type type = (Type)ldcInsn.cst; - String desc = this.transformSingleDescriptor(type); + String desc = this.transformDescriptor(type); if (!type.toString().equals(desc)) { ldcInsn.cst = Type.getType(desc); } } } + /** + * Transforms a invoke dynamic instruction in the method being processed. + * + * @param method Method being processed + * @param iter Insn interator + * @param dynInsn Insn to transform + */ + private void transformInvokeDynamicNode(MethodNode method, Iterator iter, InvokeDynamicInsnNode dynInsn) { + System.out.println(targetClass.version); + targetClass.version = 52; + dynInsn.desc = this.transformMethodDescriptor(dynInsn.desc); + dynInsn.bsm = this.transformHandle(method, iter, dynInsn.bsm); + for (int i = 0; i < dynInsn.bsmArgs.length; i++) { + Object bsmArg = dynInsn.bsmArgs[i]; + if (bsmArg instanceof Handle) { + dynInsn.bsmArgs[i] = this.transformHandle(method, iter, ((Handle) bsmArg)); + } else if (bsmArg instanceof Type) { + Type type = ((Type) bsmArg); + String desc = this.transformDescriptor(type); + if (!type.toString().equals(desc)) { + dynInsn.bsmArgs[i] = Type.getType(desc); + } + } + } + } + + /** + * Transforms a method handle that is referenced from the method being + * processed. + * + * @param handle Handle to transform + */ + private Handle transformHandle(MethodNode method, Iterator iter, Handle handle) { + HandleRef memberRef = new HandleRef(handle); + if (memberRef.isField()) { + this.transformFieldRef(method, iter, memberRef); + } else { + this.transformMethodRef(method, iter, memberRef); + } + return memberRef.handle; + } + + /** + * Reference to a field or method that also includes invocation + * instructions. + */ + private abstract class MemberRef { + abstract boolean isField(); + + abstract int getOpcode(); + + abstract String getOwner(); + + abstract void setOwner(String owner); + + abstract String getName(); + + abstract String getDesc(); + + abstract void setDesc(String desc); + } + + /** + * A static reference to a method backed by an invoke instruction + */ + private final class StaticMethodRef extends MemberRef { + + private final MethodInsnNode insn; + + private StaticMethodRef(MethodInsnNode insn) { + this.insn = insn; + } + + @Override + boolean isField() { + return false; + } + + @Override + int getOpcode() { + return this.insn.getOpcode(); + } + + @Override + String getOwner() { + return this.insn.owner; + } + + @Override + void setOwner(String owner) { + this.insn.owner = owner; + } + + @Override + String getName() { + return this.insn.name; + } + + @Override + String getDesc() { + return this.insn.desc; + } + + @Override + void setDesc(String desc) { + this.insn.desc = desc; + } + } + + /** + * A static reference to a field backed by field get/put instruction + */ + private final class StaticFieldRef extends MemberRef { + + private final FieldInsnNode insn; + + private StaticFieldRef(FieldInsnNode insn) { + this.insn = insn; + } + + @Override + boolean isField() { + return true; + } + + @Override + int getOpcode() { + return this.insn.getOpcode(); + } + + @Override + String getOwner() { + return this.insn.owner; + } + + @Override + void setOwner(String owner) { + this.insn.owner = owner; + } + + @Override + String getName() { + return this.insn.name; + } + + @Override + String getDesc() { + return this.insn.desc; + } + + @Override + void setDesc(String desc) { + this.insn.desc = desc; + } + } + + /** + * A reference to a field or method backed by a method handle + */ + private final class HandleRef extends MemberRef { + + private Handle handle; + + private HandleRef(Handle handle) { + this.handle = handle; + } + + @Override + boolean isField() { + switch (this.handle.getTag()) { + case Opcodes.H_INVOKEVIRTUAL: + case Opcodes.H_INVOKESTATIC: + case Opcodes.H_INVOKEINTERFACE: + case Opcodes.H_INVOKESPECIAL: + case Opcodes.H_NEWINVOKESPECIAL: + return false; + case Opcodes.H_GETFIELD: + case Opcodes.H_GETSTATIC: + case Opcodes.H_PUTFIELD: + case Opcodes.H_PUTSTATIC: + return true; + default: + throw new MixinTransformerError("Invalid tag " + this.handle.getTag() + " for method handle " + this.handle + "."); + } + } + + @Override + int getOpcode() { + switch (this.handle.getTag()) { + case Opcodes.H_INVOKEVIRTUAL: + return Opcodes.INVOKEVIRTUAL; + case Opcodes.H_INVOKESTATIC: + return Opcodes.INVOKESTATIC; + case Opcodes.H_INVOKEINTERFACE: + return Opcodes.INVOKEINTERFACE; + case Opcodes.H_INVOKESPECIAL: + case Opcodes.H_NEWINVOKESPECIAL: + return Opcodes.INVOKESPECIAL; + case Opcodes.H_GETFIELD: + return Opcodes.GETFIELD; + case Opcodes.H_GETSTATIC: + return Opcodes.GETSTATIC; + case Opcodes.H_PUTFIELD: + return Opcodes.PUTFIELD; + case Opcodes.H_PUTSTATIC: + return Opcodes.PUTSTATIC; + default: + throw new MixinTransformerError("Invalid tag " + this.handle.getTag() + " for method handle " + this.handle + "."); + } + } + + @Override + String getOwner() { + return this.handle.getOwner(); + } + + @Override + void setOwner(String owner) { + this.handle = new Handle(this.handle.getTag(), owner, this.handle.getName(), this.handle.getDesc()); + } + + @Override + String getName() { + return this.handle.getName(); + } + + @Override + String getDesc() { + return this.handle.getDesc(); + } + + @Override + void setDesc(String desc) { + this.handle = new Handle(this.handle.getTag(), this.handle.getOwner(), this.handle.getName(), desc); + } + } + /** * Handle "imaginary super" invokations, these are invokations in * non-derived mixins for accessing methods known to exist in a supermixin @@ -388,7 +626,7 @@ public class MixinTargetContext implements IReferenceMapperContext { MethodInsnNode methodNode = (MethodInsnNode)insn; if (methodNode.owner.equals(this.getClassRef()) && methodNode.name.equals(method.name) && methodNode.desc.equals(method.desc)) { methodNode.setOpcode(Opcodes.INVOKESPECIAL); - this.updateStaticBinding(method, methodNode); + this.updateStaticBinding(method, new StaticMethodRef(methodNode)); return; } } @@ -402,10 +640,10 @@ public class MixinTargetContext implements IReferenceMapperContext { * which contains the specified method. * * @param method Method containing the instruction - * @param insn INVOKE instruction node + * @param methodRef Unbound reference to the method */ - private void updateStaticBinding(MethodNode method, MethodInsnNode insn) { - this.updateBinding(method, insn, Traversal.SUPER); + private void updateStaticBinding(MethodNode method, MemberRef methodRef) { + this.updateBinding(method, methodRef, Traversal.SUPER); } /** @@ -413,27 +651,28 @@ public class MixinTargetContext implements IReferenceMapperContext { * which contains the specified method. * * @param method Method containing the instruction - * @param insn INVOKE instruction node + * @param methodRef Unbound reference to the method */ - private void updateDynamicBinding(MethodNode method, MethodInsnNode insn) { - this.updateBinding(method, insn, Traversal.ALL); + private void updateDynamicBinding(MethodNode method, MemberRef methodRef) { + this.updateBinding(method, methodRef, Traversal.ALL); } - private void updateBinding(MethodNode method, MethodInsnNode insn, Traversal traversal) { - if (Constants.INIT.equals(method.name) || insn.owner.equals(this.targetClass.name) || this.targetClass.name.startsWith("<")) { + private void updateBinding(MethodNode method, MemberRef methodRef, Traversal traversal) { + if (Constants.INIT.equals(method.name) || methodRef.getOwner().equals(this.targetClass.name) || this.targetClass.name.startsWith("<")) { return; } - Method superMethod = this.targetClassInfo.findMethodInHierarchy(insn.name, insn.desc, traversal == Traversal.ALL, traversal); + Method superMethod = this.targetClassInfo.findMethodInHierarchy(methodRef.getName(), methodRef.getDesc(), traversal == Traversal.ALL, + traversal); if (superMethod != null) { if (superMethod.getOwner().isMixin()) { - throw new InvalidMixinException(this, "Invalid " + ASMHelper.getOpcodeName(insn) + " in " + this + " resolved " + insn.owner - + " -> " + superMethod.getOwner() + " for " + insn.name + insn.desc); + throw new InvalidMixinException(this, "Invalid " + ASMHelper.getOpcodeName(methodRef.getOpcode()) + " in " + this + " resolved " + + methodRef.getOwner() + " -> " + superMethod.getOwner() + " for " + methodRef.getName() + methodRef.getDesc()); } - insn.owner = superMethod.getOwner().getName(); - } else if (ClassInfo.forName(insn.owner).isMixin()) { - throw new MixinTransformerError("Error resolving " + ASMHelper.getOpcodeName(insn) + " target for " + insn.owner + "." + insn.name - + " in " + this); + methodRef.setOwner(superMethod.getOwner().getName()); + } else if (ClassInfo.forName(methodRef.getOwner()).isMixin()) { + throw new MixinTransformerError("Error resolving " + ASMHelper.getOpcodeName(methodRef.getOpcode()) + " target for " + + methodRef.getOwner() + "." + methodRef.getName() + " in " + this); } } @@ -449,18 +688,6 @@ public class MixinTargetContext implements IReferenceMapperContext { field.desc = this.transformSingleDescriptor(field.desc, false); } - /** - * Transforms a field insn descriptor in the context of this mixin target - * - * @param field Field instruction node to transform - */ - public void transformDescriptor(FieldInsnNode field) { - if (!this.inheritsFromMixin) { - return; - } - field.desc = this.transformSingleDescriptor(field.desc, false); - } - /** * Transforms a method descriptor in the context of this mixin target * @@ -474,15 +701,20 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * Transforms a method insn descriptor in the context of this mixin target + * Transforms a method or field reference descriptor in the context of this + * mixin target * - * @param method Method instruction node to transform + * @param member Reference to the method or field */ - public void transformDescriptor(MethodInsnNode method) { + public void transformDescriptor(MemberRef member) { if (!this.inheritsFromMixin) { return; } - method.desc = this.transformMethodDescriptor(method.desc); + if (member.isField()) { + member.setDesc(this.transformSingleDescriptor(member.getDesc(), false)); + } else { + member.setDesc(this.transformMethodDescriptor(member.getDesc())); + } } /** @@ -496,6 +728,14 @@ public class MixinTargetContext implements IReferenceMapperContext { } typeInsn.desc = this.transformSingleDescriptor(typeInsn.desc, true); } + + private String transformDescriptor(Type type) { + if (type.getSort() == Type.METHOD) { + return this.transformMethodDescriptor(type.getDescriptor()); + } else { + return this.transformSingleDescriptor(type); + } + } private String transformSingleDescriptor(Type type) { if (type.getSort() < Type.ARRAY) { From 9ab0dfc3df7dbb4e83745dd1ba9eac3f46ad74ea Mon Sep 17 00:00:00 2001 From: BenLewis Date: Sat, 10 Oct 2015 13:05:47 +1300 Subject: [PATCH 006/169] Removed debug statement --- .../spongepowered/asm/mixin/transformer/MixinTargetContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index e3cc886d..f31d76d9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -358,7 +358,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param dynInsn Insn to transform */ private void transformInvokeDynamicNode(MethodNode method, Iterator iter, InvokeDynamicInsnNode dynInsn) { - System.out.println(targetClass.version); + // set class version to java 8 targetClass.version = 52; dynInsn.desc = this.transformMethodDescriptor(dynInsn.desc); dynInsn.bsm = this.transformHandle(method, iter, dynInsn.bsm); From e51a2dd28830a9068b2f30531873975bc8d73452 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Sun, 11 Oct 2015 10:43:57 +1300 Subject: [PATCH 007/169] Fixed style issues and refactored transformConstantNode The refactor is to get rid of code duplication between load constant transform method and handling of invokedynamic arguments. --- .../asm/mixin/transformer/MemberRef.java | 321 ++++++++++++++++++ .../mixin/transformer/MixinTargetContext.java | 271 +++------------ .../org/spongepowered/asm/util/Constants.java | 1 + 3 files changed, 364 insertions(+), 229 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java new file mode 100644 index 00000000..570f39d7 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java @@ -0,0 +1,321 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer; + +import org.spongepowered.asm.lib.Handle; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.tree.FieldInsnNode; +import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.util.ASMHelper; + +/** + * Reference to a field or method that also includes invocation + * instructions. + * + * To instances are defined to be equal if they both refer to the same method + * and have the same invocation instructions. + */ +public abstract class MemberRef { + + /** + * A static reference to a method backed by an invoke instruction + */ + public static final class StaticMethodRef extends MemberRef { + + /** + * Method invocation instruction + */ + public final MethodInsnNode insn; + + /** + * ctor + * + * @param insn Method instruction of this member reference + */ + public StaticMethodRef(MethodInsnNode insn) { + this.insn = insn; + } + + @Override + public boolean isField() { + return false; + } + + @Override + public int getOpcode() { + return this.insn.getOpcode(); + } + + @Override + public String getOwner() { + return this.insn.owner; + } + + @Override + public void setOwner(String owner) { + this.insn.owner = owner; + } + + @Override + public String getName() { + return this.insn.name; + } + + @Override + public String getDesc() { + return this.insn.desc; + } + + @Override + public void setDesc(String desc) { + this.insn.desc = desc; + } + } + + /** + * A static reference to a field backed by field get/put instruction + */ + public static final class StaticFieldRef extends MemberRef { + + /** + * Field accessor instruction + */ + public final FieldInsnNode insn; + + /** + * ctor + * + * @param insn Field instruction this member reference + */ + public StaticFieldRef(FieldInsnNode insn) { + this.insn = insn; + } + + @Override + public boolean isField() { + return true; + } + + @Override + public int getOpcode() { + return this.insn.getOpcode(); + } + + @Override + public String getOwner() { + return this.insn.owner; + } + + @Override + public void setOwner(String owner) { + this.insn.owner = owner; + } + + @Override + public String getName() { + return this.insn.name; + } + + @Override + public String getDesc() { + return this.insn.desc; + } + + @Override + public void setDesc(String desc) { + this.insn.desc = desc; + } + } + + /** + * A reference to a field or method backed by a method handle + */ + public static final class HandleRef extends MemberRef { + + private Handle handle; + + /** + * Creates a member reference initially referring to the member referred + * to by the method handle and the invocation instruction of the method + * handle. + * + * @param handle Initial method handle. + */ + public HandleRef(Handle handle) { + this.handle = handle; + } + + /** + * Gets a method handle for the member this is object is referring to. + * + * @return Method handle representing this object + */ + public Handle getMethodHandle() { + return this.handle; + } + + @Override + public boolean isField() { + switch (this.handle.getTag()) { + case Opcodes.H_INVOKEVIRTUAL: + case Opcodes.H_INVOKESTATIC: + case Opcodes.H_INVOKEINTERFACE: + case Opcodes.H_INVOKESPECIAL: + case Opcodes.H_NEWINVOKESPECIAL: + return false; + case Opcodes.H_GETFIELD: + case Opcodes.H_GETSTATIC: + case Opcodes.H_PUTFIELD: + case Opcodes.H_PUTSTATIC: + return true; + default: + throw new MixinTransformerError("Invalid tag " + this.handle.getTag() + " for method handle " + this.handle + "."); + } + } + + @Override + public int getOpcode() { + switch (this.handle.getTag()) { + case Opcodes.H_INVOKEVIRTUAL: + return Opcodes.INVOKEVIRTUAL; + case Opcodes.H_INVOKESTATIC: + return Opcodes.INVOKESTATIC; + case Opcodes.H_INVOKEINTERFACE: + return Opcodes.INVOKEINTERFACE; + case Opcodes.H_INVOKESPECIAL: + case Opcodes.H_NEWINVOKESPECIAL: + return Opcodes.INVOKESPECIAL; + case Opcodes.H_GETFIELD: + return Opcodes.GETFIELD; + case Opcodes.H_GETSTATIC: + return Opcodes.GETSTATIC; + case Opcodes.H_PUTFIELD: + return Opcodes.PUTFIELD; + case Opcodes.H_PUTSTATIC: + return Opcodes.PUTSTATIC; + default: + throw new MixinTransformerError("Invalid tag " + this.handle.getTag() + " for method handle " + this.handle + "."); + } + } + + @Override + public String getOwner() { + return this.handle.getOwner(); + } + + @Override + public void setOwner(String owner) { + this.handle = new Handle(this.handle.getTag(), owner, this.handle.getName(), this.handle.getDesc()); + } + + @Override + public String getName() { + return this.handle.getName(); + } + + @Override + public String getDesc() { + return this.handle.getDesc(); + } + + @Override + public void setDesc(String desc) { + this.handle = new Handle(this.handle.getTag(), this.handle.getOwner(), this.handle.getName(), desc); + } + } + + /** + * Whether this member is a field. + * + * @return If this member is a field, else it is a method + */ + public abstract boolean isField(); + + /** + * The opcode of the invocation. + * + * @return The opcode of the invocation + */ + public abstract int getOpcode(); + + /** + * The internal name for the owner of this member. + * + * @return The owners name + */ + public abstract String getOwner(); + + /** + * Changes the owner of this + * + * @param owner New owner + */ + public abstract void setOwner(String owner); + + /** + * Name of this member. + * + * @return Name of this member. + */ + public abstract String getName(); + + /** + * Descriptor of this member. + * + * @return Descriptor of this member + */ + public abstract String getDesc(); + + /** + * Changes the descriptor of this member + * + * @param desc New descriptor of this member + */ + public abstract void setDesc(String desc); + + @Override + public String toString() { + return ASMHelper.getOpcodeName(this.getOpcode()) + " for " + + this.getOwner() + "." + this.getName() + (this.isField() ? ":" : "") + this.getDesc(); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof MemberRef)) { + return false; + } + + MemberRef other = (MemberRef)obj; + return this.getOpcode() == other.getOpcode() + && this.getOwner().equals(other.getOwner()) + && this.getName().equals(other.getName()) + && this.getDesc().equals(other.getDesc()); + } + + @Override + public int hashCode() { + return this.toString().hashCode(); + } +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index f31d76d9..3f4af6f4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -231,9 +231,9 @@ public class MixinTargetContext implements IReferenceMapperContext { AbstractInsnNode insn = iter.next(); if (insn instanceof MethodInsnNode) { - this.transformMethodRef(method, iter, new StaticMethodRef((MethodInsnNode)insn)); + this.transformMethodRef(method, iter, new MemberRef.StaticMethodRef((MethodInsnNode)insn)); } else if (insn instanceof FieldInsnNode) { - this.transformFieldRef(method, iter, new StaticFieldRef((FieldInsnNode)insn)); + this.transformFieldRef(method, iter, new MemberRef.StaticFieldRef((FieldInsnNode)insn)); } else if (insn instanceof TypeInsnNode) { this.transformTypeNode(method, iter, (TypeInsnNode)insn); } else if (insn instanceof LdcInsnNode) { @@ -295,8 +295,8 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private void transformFieldRef(MethodNode method, Iterator iter, MemberRef fieldRef) { if (Constants.IMAGINARY_SUPER.equals(fieldRef.getName())) { - if (fieldRef instanceof StaticFieldRef) { - this.processImaginarySuper(method, ((StaticFieldRef) fieldRef).insn); + if (fieldRef instanceof MemberRef.StaticFieldRef) { + this.processImaginarySuper(method, ((MemberRef.StaticFieldRef) fieldRef).insn); iter.remove(); } else { throw new InvalidMixinException(this.mixin, "Cannot call imaginary super from method handle."); @@ -334,20 +334,15 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * Transforms class literals in the method being processed. + * Transforms class literals and method handle loads in the method being + * processed. * * @param method Method being processed * @param iter Insn interator * @param ldcInsn Insn to transform */ private void transformConstantNode(MethodNode method, Iterator iter, LdcInsnNode ldcInsn) { - if (ldcInsn.cst instanceof Type) { - Type type = (Type)ldcInsn.cst; - String desc = this.transformDescriptor(type); - if (!type.toString().equals(desc)) { - ldcInsn.cst = Type.getType(desc); - } - } + ldcInsn.cst = this.transformConstant(method, iter, ldcInsn.cst); } /** @@ -358,233 +353,53 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param dynInsn Insn to transform */ private void transformInvokeDynamicNode(MethodNode method, Iterator iter, InvokeDynamicInsnNode dynInsn) { - // set class version to java 8 - targetClass.version = 52; dynInsn.desc = this.transformMethodDescriptor(dynInsn.desc); dynInsn.bsm = this.transformHandle(method, iter, dynInsn.bsm); for (int i = 0; i < dynInsn.bsmArgs.length; i++) { - Object bsmArg = dynInsn.bsmArgs[i]; - if (bsmArg instanceof Handle) { - dynInsn.bsmArgs[i] = this.transformHandle(method, iter, ((Handle) bsmArg)); - } else if (bsmArg instanceof Type) { - Type type = ((Type) bsmArg); - String desc = this.transformDescriptor(type); - if (!type.toString().equals(desc)) { - dynInsn.bsmArgs[i] = Type.getType(desc); - } - } + dynInsn.bsmArgs[i] = this.transformConstant(method, iter, dynInsn.bsmArgs[i]); } } + /** + * Transforms a constant in the constant pool. + * + * @param method Method being processed + * @param iter Insn interator + * @param constant Consatnt pool entry + * @return Transformed constant + */ + private Object transformConstant(MethodNode method, Iterator iter, Object constant) { + if (constant instanceof Type) { + Type type = (Type)constant; + String desc = this.transformDescriptor(type); + if (!type.toString().equals(desc)) { + return Type.getType(desc); + } else { + return constant; + } + } else if (constant instanceof Handle) { + return this.transformHandle(method, iter, (Handle)constant); + } + return constant; + } + /** * Transforms a method handle that is referenced from the method being * processed. * + * @param method Method being processed + * @param iter Insn interator * @param handle Handle to transform */ private Handle transformHandle(MethodNode method, Iterator iter, Handle handle) { - HandleRef memberRef = new HandleRef(handle); + this.targetClass.version = Constants.JAVA8_CLASSFILE_VERSION; + MemberRef.HandleRef memberRef = new MemberRef.HandleRef(handle); if (memberRef.isField()) { this.transformFieldRef(method, iter, memberRef); } else { this.transformMethodRef(method, iter, memberRef); } - return memberRef.handle; - } - - /** - * Reference to a field or method that also includes invocation - * instructions. - */ - private abstract class MemberRef { - abstract boolean isField(); - - abstract int getOpcode(); - - abstract String getOwner(); - - abstract void setOwner(String owner); - - abstract String getName(); - - abstract String getDesc(); - - abstract void setDesc(String desc); - } - - /** - * A static reference to a method backed by an invoke instruction - */ - private final class StaticMethodRef extends MemberRef { - - private final MethodInsnNode insn; - - private StaticMethodRef(MethodInsnNode insn) { - this.insn = insn; - } - - @Override - boolean isField() { - return false; - } - - @Override - int getOpcode() { - return this.insn.getOpcode(); - } - - @Override - String getOwner() { - return this.insn.owner; - } - - @Override - void setOwner(String owner) { - this.insn.owner = owner; - } - - @Override - String getName() { - return this.insn.name; - } - - @Override - String getDesc() { - return this.insn.desc; - } - - @Override - void setDesc(String desc) { - this.insn.desc = desc; - } - } - - /** - * A static reference to a field backed by field get/put instruction - */ - private final class StaticFieldRef extends MemberRef { - - private final FieldInsnNode insn; - - private StaticFieldRef(FieldInsnNode insn) { - this.insn = insn; - } - - @Override - boolean isField() { - return true; - } - - @Override - int getOpcode() { - return this.insn.getOpcode(); - } - - @Override - String getOwner() { - return this.insn.owner; - } - - @Override - void setOwner(String owner) { - this.insn.owner = owner; - } - - @Override - String getName() { - return this.insn.name; - } - - @Override - String getDesc() { - return this.insn.desc; - } - - @Override - void setDesc(String desc) { - this.insn.desc = desc; - } - } - - /** - * A reference to a field or method backed by a method handle - */ - private final class HandleRef extends MemberRef { - - private Handle handle; - - private HandleRef(Handle handle) { - this.handle = handle; - } - - @Override - boolean isField() { - switch (this.handle.getTag()) { - case Opcodes.H_INVOKEVIRTUAL: - case Opcodes.H_INVOKESTATIC: - case Opcodes.H_INVOKEINTERFACE: - case Opcodes.H_INVOKESPECIAL: - case Opcodes.H_NEWINVOKESPECIAL: - return false; - case Opcodes.H_GETFIELD: - case Opcodes.H_GETSTATIC: - case Opcodes.H_PUTFIELD: - case Opcodes.H_PUTSTATIC: - return true; - default: - throw new MixinTransformerError("Invalid tag " + this.handle.getTag() + " for method handle " + this.handle + "."); - } - } - - @Override - int getOpcode() { - switch (this.handle.getTag()) { - case Opcodes.H_INVOKEVIRTUAL: - return Opcodes.INVOKEVIRTUAL; - case Opcodes.H_INVOKESTATIC: - return Opcodes.INVOKESTATIC; - case Opcodes.H_INVOKEINTERFACE: - return Opcodes.INVOKEINTERFACE; - case Opcodes.H_INVOKESPECIAL: - case Opcodes.H_NEWINVOKESPECIAL: - return Opcodes.INVOKESPECIAL; - case Opcodes.H_GETFIELD: - return Opcodes.GETFIELD; - case Opcodes.H_GETSTATIC: - return Opcodes.GETSTATIC; - case Opcodes.H_PUTFIELD: - return Opcodes.PUTFIELD; - case Opcodes.H_PUTSTATIC: - return Opcodes.PUTSTATIC; - default: - throw new MixinTransformerError("Invalid tag " + this.handle.getTag() + " for method handle " + this.handle + "."); - } - } - - @Override - String getOwner() { - return this.handle.getOwner(); - } - - @Override - void setOwner(String owner) { - this.handle = new Handle(this.handle.getTag(), owner, this.handle.getName(), this.handle.getDesc()); - } - - @Override - String getName() { - return this.handle.getName(); - } - - @Override - String getDesc() { - return this.handle.getDesc(); - } - - @Override - void setDesc(String desc) { - this.handle = new Handle(this.handle.getTag(), this.handle.getOwner(), this.handle.getName(), desc); - } + return memberRef.getMethodHandle(); } /** @@ -626,7 +441,7 @@ public class MixinTargetContext implements IReferenceMapperContext { MethodInsnNode methodNode = (MethodInsnNode)insn; if (methodNode.owner.equals(this.getClassRef()) && methodNode.name.equals(method.name) && methodNode.desc.equals(method.desc)) { methodNode.setOpcode(Opcodes.INVOKESPECIAL); - this.updateStaticBinding(method, new StaticMethodRef(methodNode)); + this.updateStaticBinding(method, new MemberRef.StaticMethodRef(methodNode)); return; } } @@ -666,13 +481,12 @@ public class MixinTargetContext implements IReferenceMapperContext { traversal); if (superMethod != null) { if (superMethod.getOwner().isMixin()) { - throw new InvalidMixinException(this, "Invalid " + ASMHelper.getOpcodeName(methodRef.getOpcode()) + " in " + this + " resolved " - + methodRef.getOwner() + " -> " + superMethod.getOwner() + " for " + methodRef.getName() + methodRef.getDesc()); + throw new InvalidMixinException(this, "Invalid " + methodRef + " in " + this + " resolved " + superMethod.getOwner() + + " but is mixin."); } methodRef.setOwner(superMethod.getOwner().getName()); } else if (ClassInfo.forName(methodRef.getOwner()).isMixin()) { - throw new MixinTransformerError("Error resolving " + ASMHelper.getOpcodeName(methodRef.getOpcode()) + " target for " - + methodRef.getOwner() + "." + methodRef.getName() + " in " + this); + throw new MixinTransformerError("Error resolving " + methodRef + " in " + this); } } @@ -732,9 +546,8 @@ public class MixinTargetContext implements IReferenceMapperContext { private String transformDescriptor(Type type) { if (type.getSort() == Type.METHOD) { return this.transformMethodDescriptor(type.getDescriptor()); - } else { - return this.transformSingleDescriptor(type); } + return this.transformSingleDescriptor(type); } private String transformSingleDescriptor(Type type) { @@ -907,7 +720,7 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * Called immediately after the mixin is applied to targetClass + * Called imm imediately after the mixin is applied to targetClass * * @param transformedName Target class's transformed name * @param targetClass Target class diff --git a/src/main/java/org/spongepowered/asm/util/Constants.java b/src/main/java/org/spongepowered/asm/util/Constants.java index ce791d4b..f720f090 100644 --- a/src/main/java/org/spongepowered/asm/util/Constants.java +++ b/src/main/java/org/spongepowered/asm/util/Constants.java @@ -32,6 +32,7 @@ import org.spongepowered.asm.mixin.Mixin; */ public abstract class Constants { + public static final int JAVA8_CLASSFILE_VERSION = 52; public static final String INIT = ""; public static final String CLINIT = ""; public static final String IMAGINARY_SUPER = "super$"; From d742604aab4c25f3e1cbcc3b07e9c496dc0b1936 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Mon, 12 Oct 2015 13:35:47 +1300 Subject: [PATCH 008/169] Fixed java.lang.VerifyError incorrect stack frame errors --- .../asm/mixin/transformer/MixinClassWriter.java | 6 +++--- .../asm/mixin/transformer/MixinPreProcessor.java | 1 + .../asm/mixin/transformer/MixinTargetContext.java | 1 - src/main/java/org/spongepowered/asm/util/Constants.java | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java index b61c0235..7f521ec1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java @@ -53,10 +53,10 @@ public class MixinClassWriter extends ClassWriter { ClassInfo d = ClassInfo.forName(type2); if (c.hasSuperClass(d)) { - return type1; + return type2; } if (d.hasSuperClass(c)) { - return type2; + return type1; } if (c.isInterface() || d.isInterface()) { return MixinClassWriter.JAVA_LANG_OBJECT; @@ -68,7 +68,7 @@ public class MixinClassWriter extends ClassWriter { return MixinClassWriter.JAVA_LANG_OBJECT; } - } while (!c.hasSuperClass(d)); + } while (!d.hasSuperClass(c)); return c.getName(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 769da82d..53a4c4aa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -130,6 +130,7 @@ class MixinPreProcessor { MixinTargetContext createContextFor(ClassNode target) { this.prepare(); MixinTargetContext context = new MixinTargetContext(this.mixin, this.classNode, target); + target.version = Math.max(this.classNode.version, target.version); this.attach(context); return context; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 3f4af6f4..27d20f29 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -392,7 +392,6 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param handle Handle to transform */ private Handle transformHandle(MethodNode method, Iterator iter, Handle handle) { - this.targetClass.version = Constants.JAVA8_CLASSFILE_VERSION; MemberRef.HandleRef memberRef = new MemberRef.HandleRef(handle); if (memberRef.isField()) { this.transformFieldRef(method, iter, memberRef); diff --git a/src/main/java/org/spongepowered/asm/util/Constants.java b/src/main/java/org/spongepowered/asm/util/Constants.java index f720f090..ce791d4b 100644 --- a/src/main/java/org/spongepowered/asm/util/Constants.java +++ b/src/main/java/org/spongepowered/asm/util/Constants.java @@ -32,7 +32,6 @@ import org.spongepowered.asm.mixin.Mixin; */ public abstract class Constants { - public static final int JAVA8_CLASSFILE_VERSION = 52; public static final String INIT = ""; public static final String CLINIT = ""; public static final String IMAGINARY_SUPER = "super$"; From 2b715538bd782256884852dd0920236952178c6f Mon Sep 17 00:00:00 2001 From: BenLewis Date: Mon, 12 Oct 2015 14:26:10 +1300 Subject: [PATCH 009/169] Fixed typo --- .../spongepowered/asm/mixin/transformer/MixinTargetContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 27d20f29..007a639d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -719,7 +719,7 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * Called imm imediately after the mixin is applied to targetClass + * Called imediately after the mixin is applied to targetClass * * @param transformedName Target class's transformed name * @param targetClass Target class From b4f06960dcb58aa2012a9be3a0fd49bace86d250 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Wed, 14 Oct 2015 17:43:57 +1300 Subject: [PATCH 010/169] Renamed MemberRef inner classes --- .../asm/mixin/transformer/MemberRef.java | 21 +++++++++---------- .../mixin/transformer/MixinTargetContext.java | 21 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java index 570f39d7..fc0bf2d5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.mixin.transformer; -import org.spongepowered.asm.lib.Handle; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; @@ -42,7 +41,7 @@ public abstract class MemberRef { /** * A static reference to a method backed by an invoke instruction */ - public static final class StaticMethodRef extends MemberRef { + public static final class Method extends MemberRef { /** * Method invocation instruction @@ -54,7 +53,7 @@ public abstract class MemberRef { * * @param insn Method instruction of this member reference */ - public StaticMethodRef(MethodInsnNode insn) { + public Method(MethodInsnNode insn) { this.insn = insn; } @@ -97,7 +96,7 @@ public abstract class MemberRef { /** * A static reference to a field backed by field get/put instruction */ - public static final class StaticFieldRef extends MemberRef { + public static final class Field extends MemberRef { /** * Field accessor instruction @@ -109,7 +108,7 @@ public abstract class MemberRef { * * @param insn Field instruction this member reference */ - public StaticFieldRef(FieldInsnNode insn) { + public Field(FieldInsnNode insn) { this.insn = insn; } @@ -152,9 +151,9 @@ public abstract class MemberRef { /** * A reference to a field or method backed by a method handle */ - public static final class HandleRef extends MemberRef { + public static final class Handle extends MemberRef { - private Handle handle; + private org.spongepowered.asm.lib.Handle handle; /** * Creates a member reference initially referring to the member referred @@ -163,7 +162,7 @@ public abstract class MemberRef { * * @param handle Initial method handle. */ - public HandleRef(Handle handle) { + public Handle(org.spongepowered.asm.lib.Handle handle) { this.handle = handle; } @@ -172,7 +171,7 @@ public abstract class MemberRef { * * @return Method handle representing this object */ - public Handle getMethodHandle() { + public org.spongepowered.asm.lib.Handle getMethodHandle() { return this.handle; } @@ -227,7 +226,7 @@ public abstract class MemberRef { @Override public void setOwner(String owner) { - this.handle = new Handle(this.handle.getTag(), owner, this.handle.getName(), this.handle.getDesc()); + this.handle = new org.spongepowered.asm.lib.Handle(this.handle.getTag(), owner, this.handle.getName(), this.handle.getDesc()); } @Override @@ -242,7 +241,7 @@ public abstract class MemberRef { @Override public void setDesc(String desc) { - this.handle = new Handle(this.handle.getTag(), this.handle.getOwner(), this.handle.getName(), desc); + this.handle = new org.spongepowered.asm.lib.Handle(this.handle.getTag(), this.handle.getOwner(), this.handle.getName(), desc); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 007a639d..c18799c0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -39,7 +39,6 @@ import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.SoftOverride; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; -import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.ClassInfo.Traversal; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; @@ -231,9 +230,9 @@ public class MixinTargetContext implements IReferenceMapperContext { AbstractInsnNode insn = iter.next(); if (insn instanceof MethodInsnNode) { - this.transformMethodRef(method, iter, new MemberRef.StaticMethodRef((MethodInsnNode)insn)); + this.transformMethodRef(method, iter, new MemberRef.Method((MethodInsnNode)insn)); } else if (insn instanceof FieldInsnNode) { - this.transformFieldRef(method, iter, new MemberRef.StaticFieldRef((FieldInsnNode)insn)); + this.transformFieldRef(method, iter, new MemberRef.Field((FieldInsnNode)insn)); } else if (insn instanceof TypeInsnNode) { this.transformTypeNode(method, iter, (TypeInsnNode)insn); } else if (insn instanceof LdcInsnNode) { @@ -253,7 +252,7 @@ public class MixinTargetContext implements IReferenceMapperContext { private void validateMethod(MethodNode method) { // Any method tagged with @SoftOverride must have an implementation visible from if (ASMHelper.getInvisibleAnnotation(method, SoftOverride.class) != null) { - Method superMethod = this.targetClassInfo.findMethodInHierarchy(method.name, method.desc, false, Traversal.SUPER); + ClassInfo.Method superMethod = this.targetClassInfo.findMethodInHierarchy(method.name, method.desc, false, Traversal.SUPER); if (superMethod == null || !superMethod.isInjected()) { throw new InvalidMixinException(this, "Mixin method " + method.name + method.desc + " is tagged with @SoftOverride but no " + "valid method was found in superclasses of " + this.targetClass.name); @@ -295,8 +294,8 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private void transformFieldRef(MethodNode method, Iterator iter, MemberRef fieldRef) { if (Constants.IMAGINARY_SUPER.equals(fieldRef.getName())) { - if (fieldRef instanceof MemberRef.StaticFieldRef) { - this.processImaginarySuper(method, ((MemberRef.StaticFieldRef) fieldRef).insn); + if (fieldRef instanceof MemberRef.Field) { + this.processImaginarySuper(method, ((MemberRef.Field) fieldRef).insn); iter.remove(); } else { throw new InvalidMixinException(this.mixin, "Cannot call imaginary super from method handle."); @@ -392,7 +391,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param handle Handle to transform */ private Handle transformHandle(MethodNode method, Iterator iter, Handle handle) { - MemberRef.HandleRef memberRef = new MemberRef.HandleRef(handle); + MemberRef.Handle memberRef = new MemberRef.Handle(handle); if (memberRef.isField()) { this.transformFieldRef(method, iter, memberRef); } else { @@ -440,7 +439,7 @@ public class MixinTargetContext implements IReferenceMapperContext { MethodInsnNode methodNode = (MethodInsnNode)insn; if (methodNode.owner.equals(this.getClassRef()) && methodNode.name.equals(method.name) && methodNode.desc.equals(method.desc)) { methodNode.setOpcode(Opcodes.INVOKESPECIAL); - this.updateStaticBinding(method, new MemberRef.StaticMethodRef(methodNode)); + this.updateStaticBinding(method, new MemberRef.Method(methodNode)); return; } } @@ -476,8 +475,8 @@ public class MixinTargetContext implements IReferenceMapperContext { return; } - Method superMethod = this.targetClassInfo.findMethodInHierarchy(methodRef.getName(), methodRef.getDesc(), traversal == Traversal.ALL, - traversal); + ClassInfo.Method superMethod = this.targetClassInfo.findMethodInHierarchy(methodRef.getName(), methodRef.getDesc(), + traversal == Traversal.ALL, traversal); if (superMethod != null) { if (superMethod.getOwner().isMixin()) { throw new InvalidMixinException(this, "Invalid " + methodRef + " in " + this + " resolved " + superMethod.getOwner() @@ -719,7 +718,7 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * Called imediately after the mixin is applied to targetClass + * Called immediately after the mixin is applied to targetClass * * @param transformedName Target class's transformed name * @param targetClass Target class From 10b0cec45e065f51d9581d2a25af4dc3ae8bd86f Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Wed, 14 Oct 2015 20:22:25 -0400 Subject: [PATCH 011/169] Fix implemented interface methods report --- .../asm/mixin/transformer/ClassInfo.java | 448 +++++++++--------- ...ixinTransformerModuleInterfaceChecker.java | 30 +- 2 files changed, 240 insertions(+), 238 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index a86fa7ee..14ee1f78 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -52,80 +52,80 @@ import com.google.common.collect.ImmutableSet; /** * Information about a class, used as a way of keeping track of class hierarchy * information needed to support more complex mixin behaviour such as detached - * superclass and mixin inheritance. + * superclass and mixin inheritance. */ public class ClassInfo extends TreeInfo { - + public static final int INCLUDE_PRIVATE = 0x0002; public static final int INCLUDE_STATIC = 0x0008; - + /** *

To all intents and purposes, the "real" class hierarchy and the mixin * class hierarchy exist in parallel, this means that for some hierarchy * validation operations we need to walk across to the other * hierarchy in order to allow meaningful validation to occur.

- * + * *

This enum defines the type of traversal operations which are allowed * for a particular lookup.

- * + * *

Each traversal type has a next property which defines * the traversal type to use on the next step of the hierarchy - * validation. For example, the type {@link #IMMEDIATE} which requires an + * validation. For example, the type {@link #IMMEDIATE} which requires an * immediate match falls through to {@link #NONE} on the next step, which * prevents further traversals from occurring in the lookup.

*/ public static enum Traversal { - + /** * No traversals are allowed. */ NONE(null, false), - + /** * Traversal is allowed at all stages. */ ALL(null, true), - + /** * Traversal is allowed at the bottom of the hierarchy but no further. */ IMMEDIATE(Traversal.NONE, true), - + /** * Traversal is allowed only on superclasses and not at the bottom of * the hierarchy. */ SUPER(Traversal.ALL, false); - + private final Traversal next; - + private final boolean traverse; - + private Traversal(Traversal next, boolean traverse) { this.next = next != null ? next : this; this.traverse = traverse; } - + public Traversal next() { return this.next; } - + public boolean canTraverse() { return this.traverse; } } - + /** * Information about frames in a method */ public static class FrameData { - + private static final String[] FRAMETYPES = { "NEW", "FULL", "APPEND", "CHOP", "SAME", "SAME1" }; - + public final int index; - + public final int type; - + public final int locals; FrameData(int index, int type, int locals) { @@ -133,13 +133,13 @@ public class ClassInfo extends TreeInfo { this.type = type; this.locals = locals; } - + FrameData(int index, FrameNode frameNode) { this.index = index; this.type = frameNode.type; this.locals = frameNode.local != null ? frameNode.local.size() : 0; } - + /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -148,54 +148,54 @@ public class ClassInfo extends TreeInfo { return String.format("FrameData[index=%d, type=%s, locals=%d]", this.index, FrameData.FRAMETYPES[this.type + 1], this.locals); } } - + /** * Information about a member in this class */ abstract static class Member { - + static enum Type { METHOD, FIELD } - + /** - * Member type + * Member type */ private final Type type; - + /** - * The original name of the member + * The original name of the member */ private final String memberName; - + /** * The member's signature */ private final String memberDesc; - + /** * True if this member was injected by a mixin, false if it was * originally part of the class */ private final boolean isInjected; - + /** * Access modifiers */ private final int modifiers; - + /** * Current name of the member, may be different from {@link #memberName} * if the member has been renamed */ private String currentName; - + protected Member(Member member) { this(member.type, member.memberName, member.memberDesc, member.modifiers, member.isInjected); this.currentName = member.currentName; } - + protected Member(Type type, String name, String desc, int access) { this(type, name, desc, access, false); } @@ -208,23 +208,23 @@ public class ClassInfo extends TreeInfo { this.currentName = name; this.modifiers = access; } - + public String getOriginalName() { return this.memberName; } - + public String getName() { return this.currentName; } - + public String getDesc() { return this.memberDesc; } - + public boolean isInjected() { return this.isInjected; } - + public boolean isRenamed() { return this.currentName != this.memberName; } @@ -236,7 +236,7 @@ public class ClassInfo extends TreeInfo { public boolean isStatic() { return (this.modifiers & Opcodes.ACC_STATIC) != 0; } - + public boolean matchesFlags(int flags) { return (((~this.modifiers | (flags & ClassInfo.INCLUDE_PRIVATE)) & ClassInfo.INCLUDE_PRIVATE) != 0 && ((~this.modifiers | (flags & ClassInfo.INCLUDE_STATIC)) & ClassInfo.INCLUDE_STATIC) != 0); @@ -244,7 +244,7 @@ public class ClassInfo extends TreeInfo { // Abstract because this has to be static in order to contain the enum public abstract ClassInfo getOwner(); - + public int getAccess() { return this.modifiers; } @@ -252,45 +252,45 @@ public class ClassInfo extends TreeInfo { public void renameTo(String name) { this.currentName = name; } - + public boolean equals(String name, String desc) { return (this.memberName.equals(name) || this.currentName.equals(name)) && this.memberDesc.equals(desc); } - + @Override public boolean equals(Object obj) { if (!(obj instanceof Member)) { return false; } - + Member other = (Member)obj; - return (other.memberName.equals(this.memberName) + return (other.memberName.equals(this.memberName) || other.currentName.equals(this.currentName)) && other.memberDesc.equals(this.memberDesc); } - + @Override public int hashCode() { return this.toString().hashCode(); } - + @Override public String toString() { return this.memberName + this.memberDesc; } - + public boolean isAbstract() { return (this.modifiers & Opcodes.ACC_ABSTRACT) != 0; } } - + /** * A method */ public class Method extends Member { - + private final List frames; public Method(Member member) { @@ -301,12 +301,12 @@ public class ClassInfo extends TreeInfo { public Method(MethodNode method) { this(method, false); } - + public Method(MethodNode method, boolean injected) { super(Type.METHOD, method.name, method.desc, method.access, injected); this.frames = this.gatherFrames(method); } - + public Method(String name, String desc) { super(Type.METHOD, name, desc, Opcodes.ACC_PUBLIC, false); this.frames = null; @@ -321,7 +321,7 @@ public class ClassInfo extends TreeInfo { super(Type.METHOD, name, desc, access, injected); this.frames = null; } - + private List gatherFrames(MethodNode method) { List frames = new ArrayList(); for (Iterator iter = method.instructions.iterator(); iter.hasNext();) { @@ -332,7 +332,7 @@ public class ClassInfo extends TreeInfo { } return frames; } - + public List getFrames() { return this.frames; } @@ -340,58 +340,58 @@ public class ClassInfo extends TreeInfo { @Override public ClassInfo getOwner() { return ClassInfo.this; - } + } @Override public boolean equals(Object obj) { if (!(obj instanceof Method)) { return false; } - + return super.equals(obj); } } - + /** * A field */ class Field extends Member { - + public Field(Member member) { super(member); } - + public Field(FieldNode field) { this(field, false); } - + public Field(FieldNode field, boolean injected) { super(Type.FIELD, field.name, field.desc, field.access, injected); } - + public Field(String name, String desc, int access) { super(Type.FIELD, name, desc, access, false); } - + public Field(String name, String desc, int access, boolean injected) { super(Type.FIELD, name, desc, access, injected); } - + @Override public ClassInfo getOwner() { return ClassInfo.this; - } - + } + @Override public boolean equals(Object obj) { if (!(obj instanceof Field)) { return false; } - + return super.equals(obj); } } - + private static final Logger logger = LogManager.getLogger("mixin"); private static final String JAVA_LANG_OBJECT = "java/lang/Object"; @@ -401,90 +401,90 @@ public class ClassInfo extends TreeInfo { * information we generate */ private static final Map cache = new HashMap(); - + private static final ClassInfo OBJECT = new ClassInfo(); - + static { ClassInfo.cache.put(ClassInfo.JAVA_LANG_OBJECT, ClassInfo.OBJECT); } - + /** * Class name (binary name) */ private final String name; - + /** * Class superclass name (binary name) */ private final String superName; - + /** * Outer class name */ private final String outerName; - + /** * True either if this is not an inner class or if it is an inner class but * does not contain a reference to its outer class. */ private final boolean isProbablyStatic; - + /** * Interfaces */ private final Set interfaces; - + /** - * Public and protected methods (instance) methods in this class + * Public and protected methods (instance) methods in this class */ private final Set methods; - + /** * Public and protected fields in this class */ private final Set fields; - + /** * Mixins which target this class */ private final Set mixins = new HashSet(); - + /** - * Map of mixin types to corresponding supertypes, to avoid repeated - * lookups + * Map of mixin types to corresponding supertypes, to avoid repeated + * lookups */ private final Map correspondingTypes = new HashMap(); - + /** - * Mixin info if this class is a mixin itself + * Mixin info if this class is a mixin itself */ private final MixinInfo mixin; - + /** - * True if this is a mixin rather than a class + * True if this is a mixin rather than a class */ private final boolean isMixin; - + /** - * True if this is an interface + * True if this is an interface */ private final boolean isInterface; - + /** * Access flags */ private final int access; - + /** - * Superclass reference, not initialised until required + * Superclass reference, not initialised until required */ private ClassInfo superClass; - + /** - * Outer class reference, not initialised until required + * Outer class reference, not initialised until required */ private ClassInfo outerClass; - + /** * Private constructor used to initialise the ClassInfo for {@link Object} */ @@ -513,10 +513,10 @@ public class ClassInfo extends TreeInfo { this.isMixin = false; this.mixin = null; } - + /** * Initialise a ClassInfo from the supplied {@link ClassNode} - * + * * @param classNode Class node to inspect */ private ClassInfo(ClassNode classNode) { @@ -531,7 +531,7 @@ public class ClassInfo extends TreeInfo { this.mixin = this.isMixin ? ((MixinClassNode)classNode).getMixin() : null; this.interfaces.addAll(classNode.interfaces); - + for (MethodNode method : classNode.methods) { this.addMethod(method, this.isMixin); } @@ -548,18 +548,18 @@ public class ClassInfo extends TreeInfo { outerName = outerName.substring(1, outerName.length() - 1); } } - } - + } + if ((field.access & Opcodes.ACC_STATIC) == 0) { this.fields.add(new Field(field, this.isMixin)); } } } - + this.isProbablyStatic = isProbablyStatic; this.outerName = outerName; } - + void addInterface(String iface) { this.interfaces.add(iface); } @@ -573,7 +573,7 @@ public class ClassInfo extends TreeInfo { this.methods.add(new Method(method, injected)); } } - + /** * Add a mixin which targets this class */ @@ -583,21 +583,21 @@ public class ClassInfo extends TreeInfo { } this.mixins.add(mixin); } - + /** * Get all mixins which target this class */ public Set getMixins() { return Collections.unmodifiableSet(this.mixins); } - + /** * Get whether this class is a mixin */ public boolean isMixin() { return this.isMixin; } - + /** * Get whether this class has ACC_PUBLIC */ @@ -618,58 +618,58 @@ public class ClassInfo extends TreeInfo { public boolean isSynthetic() { return (this.access & Opcodes.ACC_SYNTHETIC) != 0; } - + /** - * Get whether this class is probably static (or is not an inner class) + * Get whether this class is probably static (or is not an inner class) */ public boolean isProbablyStatic() { return this.isProbablyStatic; } - + /** * Get whether this class is an inner class */ public boolean isInner() { return this.outerName != null; } - + /** * Get whether this is an interface or not */ public boolean isInterface() { return this.isInterface; } - + /** * Returns the answer to life, the universe and everything */ public Set getInterfaces() { return Collections.unmodifiableSet(this.interfaces); } - + @Override public String toString() { return this.name; } - + public int getAccess() { return this.access; } - + /** * Get the class name (binary name) */ public String getName() { return this.name; } - + /** * Get the superclass name (binary name) */ public String getSuperName() { return this.superName; } - + /** * Get the superclass info, can return null if the superclass cannot be * resolved @@ -678,17 +678,17 @@ public class ClassInfo extends TreeInfo { if (this.superClass == null && this.superName != null) { this.superClass = ClassInfo.forName(this.superName); } - + return this.superClass; } - + /** * Get the name of the outer class, or null if this is not an inner class */ public String getOuterName() { return this.outerName; } - + /** * Get the outer class info, can return null if the outer class cannot be * resolved or if this is not an inner class @@ -697,10 +697,10 @@ public class ClassInfo extends TreeInfo { if (this.outerClass == null && this.outerName != null) { this.outerClass = ClassInfo.forName(this.outerName); } - + return this.outerClass; } - + /** * Class targets */ @@ -711,55 +711,57 @@ public class ClassInfo extends TreeInfo { targets.addAll(this.mixin.getTargets()); return targets; } - + return ImmutableList.of(this); } - + /** * Get class/interface methods - * + * * @return read-only view of class methods */ public Set getMethods() { return Collections.unmodifiableSet(this.methods); } - + /** * If this is an interface, returns a set containing all methods in this * interface and all super interfaces. If this is a class, returns a set * containing all methods for all interfaces implemented by this class and * all super interfaces of those interfaces. - * + * + * @param includeMixins Whether to include methods from mixins targeting this class info * @return read-only view of class methods */ - public Set getInterfaceMethods() { + public Set getInterfaceMethods(boolean includeMixins) { Set methods = new HashSet(); - ClassInfo superClass = this.addMethodsRecursive(methods); + ClassInfo superClass = this.addMethodsRecursive(methods, includeMixins); if (!this.isInterface) { while (superClass != null && superClass != ClassInfo.OBJECT) { - superClass = superClass.addMethodsRecursive(methods); + superClass = superClass.addMethodsRecursive(methods, includeMixins); } } - + // Remove default methods. for (Iterator it = methods.iterator(); it.hasNext();) { if (!it.next().isAbstract()) { it.remove(); } } - + return Collections.unmodifiableSet(methods); } /** * Recursive function used by {@link #getInterfaceMethods} to add all * interface methods to the supplied set - * + * * @param methods Method set to add to + * @param includeMixins Whether to include methods from mixins targeting this class info * @return superclass reference, used to make the code above more fluent */ - private ClassInfo addMethodsRecursive(Set methods) { + private ClassInfo addMethodsRecursive(Set methods, boolean includeMixins) { if (this.isInterface) { for (Method method : this.methods) { // Default methods take priority. They are removed later. @@ -769,22 +771,22 @@ public class ClassInfo extends TreeInfo { } methods.add(method); } - } else if (!this.isMixin) { + } else if (!this.isMixin && includeMixins) { for (MixinInfo mixin : this.mixins) { - mixin.getClassInfo().addMethodsRecursive(methods); + mixin.getClassInfo().addMethodsRecursive(methods, includeMixins); } } - + for (String iface : this.interfaces) { - ClassInfo.forName(iface).addMethodsRecursive(methods); + ClassInfo.forName(iface).addMethodsRecursive(methods, includeMixins); } - + return this.getSuperClass(); } - + /** * Test whether this class has the specified superclass in its hierarchy - * + * * @param superClass Name of the superclass to search for in the hierarchy * @return true if the specified class appears in the class's hierarchy * anywhere @@ -795,7 +797,7 @@ public class ClassInfo extends TreeInfo { /** * Test whether this class has the specified superclass in its hierarchy - * + * * @param superClass Name of the superclass to search for in the hierarchy * @param traversal Traversal type to allow during this lookup * @return true if the specified class appears in the class's hierarchy @@ -805,13 +807,13 @@ public class ClassInfo extends TreeInfo { if (ClassInfo.JAVA_LANG_OBJECT.equals(superClass)) { return true; } - + return this.findSuperClass(superClass, traversal) != null; } - + /** * Test whether this class has the specified superclass in its hierarchy - * + * * @param superClass Superclass to search for in the hierarchy * @return true if the specified class appears in the class's hierarchy * anywhere @@ -822,7 +824,7 @@ public class ClassInfo extends TreeInfo { /** * Test whether this class has the specified superclass in its hierarchy - * + * * @param superClass Superclass to search for in the hierarchy * @param traversal Traversal type to allow during this lookup * @return true if the specified class appears in the class's hierarchy @@ -839,9 +841,9 @@ public class ClassInfo extends TreeInfo { /** * Search for the specified superclass in this class's hierarchy. If found * returns the ClassInfo, otherwise returns null - * + * * @param superClass Superclass name to search for - * @return Matched superclass or null if not found + * @return Matched superclass or null if not found */ public ClassInfo findSuperClass(String superClass) { return this.findSuperClass(superClass, Traversal.NONE); @@ -850,10 +852,10 @@ public class ClassInfo extends TreeInfo { /** * Search for the specified superclass in this class's hierarchy. If found * returns the ClassInfo, otherwise returns null - * + * * @param superClass Superclass name to search for * @param traversal Traversal type to allow during this lookup - * @return Matched superclass or null if not found + * @return Matched superclass or null if not found */ public ClassInfo findSuperClass(String superClass, Traversal traversal) { ClassInfo superClassInfo = this.getSuperClass(); @@ -879,7 +881,7 @@ public class ClassInfo extends TreeInfo { } } } - + return null; } @@ -888,7 +890,7 @@ public class ClassInfo extends TreeInfo { * specified mixin. This is used during mixin application to translate a * mixin reference to a "real class" reference in the context of this * class. - * + * * @param mixin Mixin class to search for * @return corresponding (target) class for the specified mixin or null if * no corresponding mixin was found @@ -897,7 +899,7 @@ public class ClassInfo extends TreeInfo { if (mixin == null || !mixin.isMixin || this.isMixin) { return null; } - + ClassInfo correspondingType = this.correspondingTypes.get(mixin); if (correspondingType == null) { correspondingType = this.findSuperTypeForMixin(mixin); @@ -912,24 +914,24 @@ public class ClassInfo extends TreeInfo { */ private ClassInfo findSuperTypeForMixin(ClassInfo mixin) { ClassInfo superClass = this; - + while (superClass != null && superClass != ClassInfo.OBJECT) { for (MixinInfo minion : superClass.mixins) { if (minion.getClassInfo().equals(mixin)) { return superClass; } } - + superClass = superClass.getSuperClass(); } - + return null; } /** * Find out whether this (mixin) class has another mixin in its superclass * hierarchy. This method always returns false for non-mixin classes. - * + * * @return true if and only if one or more mixins are found in the hierarchy * of this mixin */ @@ -937,9 +939,9 @@ public class ClassInfo extends TreeInfo { if (!this.isMixin) { return false; } - + ClassInfo superClass = this.getSuperClass(); - + while (superClass != null && superClass != ClassInfo.OBJECT) { if (superClass.isMixin) { return true; @@ -949,12 +951,12 @@ public class ClassInfo extends TreeInfo { return false; } - + /** * Find out whether this (non-mixin) class has a mixin targetting * any of its superclasses. This method always returns false for * mixin classes. - * + * * @return true if and only if one or more classes in this class's hierarchy * are targetted by a mixin */ @@ -962,22 +964,22 @@ public class ClassInfo extends TreeInfo { if (this.isMixin) { return false; } - + ClassInfo superClass = this.getSuperClass(); - + while (superClass != null && superClass != ClassInfo.OBJECT) { if (superClass.mixins.size() > 0) { return true; } superClass = superClass.getSuperClass(); } - + return false; } /** * Finds the specified private or protected method in this class's hierarchy - * + * * @param method Method to search for * @param includeThisClass True to return this class if the method exists * here, or false to search only superclasses @@ -989,7 +991,7 @@ public class ClassInfo extends TreeInfo { /** * Finds the specified private or protected method in this class's hierarchy - * + * * @param method Method to search for * @param includeThisClass True to return this class if the method exists * here, or false to search only superclasses @@ -999,10 +1001,10 @@ public class ClassInfo extends TreeInfo { public Method findMethodInHierarchy(MethodNode method, boolean includeThisClass, int flags) { return this.findMethodInHierarchy(method.name, method.desc, includeThisClass, Traversal.NONE, flags); } - + /** * Finds the specified public or protected method in this class's hierarchy - * + * * @param method Method to search for * @param includeThisClass True to return this class if the method exists * here, or false to search only superclasses @@ -1011,10 +1013,10 @@ public class ClassInfo extends TreeInfo { public Method findMethodInHierarchy(MethodInsnNode method, boolean includeThisClass) { return this.findMethodInHierarchy(method.name, method.desc, includeThisClass, Traversal.NONE); } - + /** * Finds the specified public or protected method in this class's hierarchy - * + * * @param method Method to search for * @param includeThisClass True to return this class if the method exists * here, or false to search only superclasses @@ -1024,10 +1026,10 @@ public class ClassInfo extends TreeInfo { public Method findMethodInHierarchy(MethodInsnNode method, boolean includeThisClass, int flags) { return this.findMethodInHierarchy(method.name, method.desc, includeThisClass, Traversal.NONE, flags); } - + /** * Finds the specified public or protected method in this class's hierarchy - * + * * @param name Method name to search for * @param desc Method descriptor * @param includeThisClass True to return this class if the method exists @@ -1040,7 +1042,7 @@ public class ClassInfo extends TreeInfo { /** * Finds the specified public or protected method in this class's hierarchy - * + * * @param name Method name to search for * @param desc Method descriptor * @param includeThisClass True to return this class if the method exists @@ -1051,10 +1053,10 @@ public class ClassInfo extends TreeInfo { public Method findMethodInHierarchy(String name, String desc, boolean includeThisClass, Traversal traversal) { return this.findMethodInHierarchy(name, desc, includeThisClass, traversal, 0); } - + /** * Finds the specified public or protected method in this class's hierarchy - * + * * @param name Method name to search for * @param desc Method descriptor * @param includeThisClass True to return this class if the method exists @@ -1066,10 +1068,10 @@ public class ClassInfo extends TreeInfo { public Method findMethodInHierarchy(String name, String desc, boolean includeThisClass, Traversal traversal, int flags) { return this.findInHierarchy(name, desc, includeThisClass, traversal, flags, Type.METHOD); } - + /** * Finds the specified private or protected field in this class's hierarchy - * + * * @param field Field to search for * @param includeThisClass True to return this class if the field exists * here, or false to search only superclasses @@ -1078,10 +1080,10 @@ public class ClassInfo extends TreeInfo { public Field findFieldInHierarchy(FieldNode field, boolean includeThisClass) { return this.findFieldInHierarchy(field.name, field.desc, includeThisClass, Traversal.NONE); } - + /** * Finds the specified private or protected field in this class's hierarchy - * + * * @param field Field to search for * @param includeThisClass True to return this class if the field exists * here, or false to search only superclasses @@ -1091,10 +1093,10 @@ public class ClassInfo extends TreeInfo { public Field findFieldInHierarchy(FieldNode field, boolean includeThisClass, int flags) { return this.findFieldInHierarchy(field.name, field.desc, includeThisClass, Traversal.NONE, flags); } - + /** * Finds the specified public or protected field in this class's hierarchy - * + * * @param field Field to search for * @param includeThisClass True to return this class if the field exists * here, or false to search only superclasses @@ -1103,10 +1105,10 @@ public class ClassInfo extends TreeInfo { public Field findFieldInHierarchy(FieldInsnNode field, boolean includeThisClass) { return this.findFieldInHierarchy(field.name, field.desc, includeThisClass, Traversal.NONE); } - + /** * Finds the specified public or protected field in this class's hierarchy - * + * * @param field Field to search for * @param includeThisClass True to return this class if the field exists * here, or false to search only superclasses @@ -1116,10 +1118,10 @@ public class ClassInfo extends TreeInfo { public Field findFieldInHierarchy(FieldInsnNode field, boolean includeThisClass, int flags) { return this.findFieldInHierarchy(field.name, field.desc, includeThisClass, Traversal.NONE, flags); } - + /** * Finds the specified public or protected field in this class's hierarchy - * + * * @param name Field name to search for * @param desc Field descriptor * @param includeThisClass True to return this class if the field exists @@ -1132,7 +1134,7 @@ public class ClassInfo extends TreeInfo { /** * Finds the specified public or protected field in this class's hierarchy - * + * * @param name Field name to search for * @param desc Field descriptor * @param includeThisClass True to return this class if the field exists @@ -1143,10 +1145,10 @@ public class ClassInfo extends TreeInfo { public Field findFieldInHierarchy(String name, String desc, boolean includeThisClass, Traversal traversal) { return this.findFieldInHierarchy(name, desc, includeThisClass, traversal, 0); } - + /** * Finds the specified public or protected field in this class's hierarchy - * + * * @param name Field name to search for * @param desc Field descriptor * @param includeThisClass True to return this class if the field exists @@ -1158,11 +1160,11 @@ public class ClassInfo extends TreeInfo { public Field findFieldInHierarchy(String name, String desc, boolean includeThisClass, Traversal traversal, int flags) { return this.findInHierarchy(name, desc, includeThisClass, traversal, flags, Type.FIELD); } - + /** * Finds a public or protected member in the hierarchy of this class which - * matches the supplied details - * + * matches the supplied details + * * @param name Member name to search * @param desc Member descriptor * @param includeThisClass True to return this class if the field exists @@ -1178,17 +1180,17 @@ public class ClassInfo extends TreeInfo { if (member != null) { return member; } - + if (traversal.canTraverse()) { for (MixinInfo mixin : this.mixins) { M mixinMember = mixin.getClassInfo().findMember(name, desc, flags, type); if (mixinMember != null) { return this.cloneMember(mixinMember); } - } + } } } - + ClassInfo superClassInfo = this.getSuperClass(); if (superClassInfo != null) { for (ClassInfo superTarget : superClassInfo.getTargets()) { @@ -1198,16 +1200,16 @@ public class ClassInfo extends TreeInfo { } } } - + return null; } - + /** * Effectively a clone method for member, placed here so that the enclosing * instance for the inner class is this class and not the enclosing instance - * of the existing class. Basically creates a cloned member with this + * of the existing class. Basically creates a cloned member with this * ClassInfo as its parent. - * + * * @param member * @return */ @@ -1216,23 +1218,23 @@ public class ClassInfo extends TreeInfo { if (member instanceof Method) { return (M)new Method(member); } - + return (M)new Field(member); } - + /** * Finds the specified public or protected method in this class - * + * * @param method Method to search for * @return the method object or null if the method could not be resolved */ public Method findMethod(MethodNode method) { return this.findMethod(method.name, method.desc, method.access); } - + /** * Finds the specified public or protected method in this class - * + * * @param method Method to search for * @param flags search flags * @return the method object or null if the method could not be resolved @@ -1240,20 +1242,20 @@ public class ClassInfo extends TreeInfo { public Method findMethod(MethodNode method, int flags) { return this.findMethod(method.name, method.desc, flags); } - + /** * Finds the specified public or protected method in this class - * + * * @param method Method to search for * @return the method object or null if the method could not be resolved */ public Method findMethod(MethodInsnNode method) { return this.findMethod(method.name, method.desc, 0); } - + /** * Finds the specified public or protected method in this class - * + * * @param method Method to search for * @param flags search flags * @return the method object or null if the method could not be resolved @@ -1261,10 +1263,10 @@ public class ClassInfo extends TreeInfo { public Method findMethod(MethodInsnNode method, int flags) { return this.findMethod(method.name, method.desc, flags); } - + /** * Finds the specified public or protected method in this class - * + * * @param name Method name to search for * @param desc Method signature to search for * @param flags search flags @@ -1273,20 +1275,20 @@ public class ClassInfo extends TreeInfo { public Method findMethod(String name, String desc, int flags) { return this.findMember(name, desc, flags, Type.METHOD); } - + /** * Finds the specified field in this class - * + * * @param field Field to search for * @return the field object or null if the field could not be resolved */ public Field findField(FieldNode field) { return this.findField(field.name, field.desc, field.access); } - + /** * Finds the specified public or protected method in this class - * + * * @param field Field to search for * @param flags search flags * @return the field object or null if the field could not be resolved @@ -1294,10 +1296,10 @@ public class ClassInfo extends TreeInfo { public Field findField(FieldInsnNode field, int flags) { return this.findField(field.name, field.desc, flags); } - + /** * Finds the specified field in this class - * + * * @param name Field name to search for * @param desc Field signature to search for * @param flags search flags @@ -1309,7 +1311,7 @@ public class ClassInfo extends TreeInfo { /** * Finds the specified member in this class - * + * * @param name Field name to search for * @param desc Field signature to search for * @param flags search flags @@ -1319,13 +1321,13 @@ public class ClassInfo extends TreeInfo { private M findMember(String name, String desc, int flags, Type memberType) { @SuppressWarnings("unchecked") Set members = (Set)(memberType == Type.METHOD ? this.methods : this.fields); - + for (M member : members) { if (member.equals(name, desc) && member.matchesFlags(flags)) { return member; } } - + return null; } @@ -1339,7 +1341,7 @@ public class ClassInfo extends TreeInfo { } return ((ClassInfo)other).name.equals(this.name); } - + /* (non-Javadoc) * @see java.lang.Object#hashCode() */ @@ -1353,7 +1355,7 @@ public class ClassInfo extends TreeInfo { * the class was already defined, then the original ClassInfo is returned * from the internal cache. Otherwise a new ClassInfo is created and * returned. - * + * * @param classNode * @return */ @@ -1363,21 +1365,21 @@ public class ClassInfo extends TreeInfo { info = new ClassInfo(classNode); ClassInfo.cache.put(classNode.name, info); } - + return info; } /** * Return a ClassInfo for the specified class name, fetches the ClassInfo * from the cache where possible - * + * * @param className Binary name of the class to look up * @return ClassInfo for the specified class name or null if the specified * name cannot be resolved for some reason */ public static ClassInfo forName(String className) { className = className.replace('.', '/'); - + ClassInfo info = ClassInfo.cache.get(className); if (info == null) { try { @@ -1386,19 +1388,19 @@ public class ClassInfo extends TreeInfo { } catch (Exception ex) { ex.printStackTrace(); } - + // Put null in the cache if load failed ClassInfo.cache.put(className, info); ClassInfo.logger.trace("Added class metadata for {} to metadata cache", className); } - + return info; } /** * Return a ClassInfo for the specified class type, fetches the ClassInfo * from the cache where possible and generates the class meta if not. - * + * * @param type Type to look up * @return ClassInfo for the supplied type or null if the supplied type * cannot be found or is a primitive type diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java index 3a0f6e17..4643f620 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java @@ -52,35 +52,35 @@ import com.google.common.io.Files; * implemented and generates reports to the console and to files on disk */ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformerModule { - + /** * CSV Report file */ private final File csv; - + /** * Text Report file */ private final File report; - + /** * Methods from interfaces that are already in the class before mixins are * applied. */ private final Multimap interfaceMethods = HashMultimap.create(); - + public MixinTransformerModuleInterfaceChecker() { File debugOutputFolder = new File(MixinTransformer.DEBUG_OUTPUT, "audit"); debugOutputFolder.mkdirs(); this.csv = new File(debugOutputFolder, "mixin_implementation_report.csv"); this.report = new File(debugOutputFolder, "mixin_implementation_report.txt"); - + try { Files.write("Class,Method,Signature,Interface\n", this.csv, Charsets.ISO_8859_1); } catch (IOException ex) { // well this sucks } - + try { String dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); Files.write("Mixin Implementation Report generated on " + dateTime + "\n", this.report, Charsets.ISO_8859_1); @@ -97,7 +97,7 @@ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformer @Override public void preApply(String transformedName, ClassNode targetClass, SortedSet mixins) { ClassInfo targetClassInfo = ClassInfo.forName(targetClass.name); - for (Method m : targetClassInfo.getInterfaceMethods()) { + for (Method m : targetClassInfo.getInterfaceMethods(false)) { this.interfaceMethods.put(targetClassInfo, m); } } @@ -114,26 +114,26 @@ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformer String className = targetClassInfo.getName().replace('/', '.'); int missingMethodCount = 0; PrettyPrinter printer = new PrettyPrinter(); - + printer.add("Class: %s", className).hr(); printer.add("%-32s %-47s %s", "Return Type", "Missing Method", "From Interface").hr(); - Set interfaceMethods = targetClassInfo.getInterfaceMethods(); - Set implementedMethods = new HashSet(targetClassInfo.getSuperClass().getInterfaceMethods()); + Set interfaceMethods = targetClassInfo.getInterfaceMethods(true); + Set implementedMethods = new HashSet(targetClassInfo.getSuperClass().getInterfaceMethods(true)); implementedMethods.addAll(this.interfaceMethods.removeAll(targetClassInfo)); - + for (Method method : interfaceMethods) { Method found = targetClassInfo.findMethodInHierarchy(method.getName(), method.getDesc(), true, Traversal.ALL); if (found != null) { continue; } - + // Don't blame the subclass for not implementing methods that it does not need to implement. if (implementedMethods.contains(method)) { continue; } - + if (missingMethodCount > 0) { printer.add(); } @@ -143,7 +143,7 @@ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformer missingMethodCount++; printer.add("%-32s%s", signaturePrinter.getReturnType(), signaturePrinter); printer.add("%-80s %s", "", iface); - + this.appendToCSVReport(className, method, iface); } @@ -164,7 +164,7 @@ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformer private void appendToTextReport(PrettyPrinter printer) { FileOutputStream fos = null; - + try { fos = new FileOutputStream(this.report, true); PrintStream stream = new PrintStream(fos); From a8558bb5f0b7df57e54c9fd467dd6e161f1a018a Mon Sep 17 00:00:00 2001 From: BenLewis Date: Tue, 20 Oct 2015 10:53:41 +1300 Subject: [PATCH 012/169] Add java agent to reload mixin --- .../spongepowered/tools/agent/MixinAgent.java | 148 ++++++++++++++++++ .../tools/agent/MixinClassLoader.java | 49 ++++++ .../asm/mixin/MixinEnvironment.java | 9 +- .../asm/mixin/transformer/MixinConfig.java | 35 ++++- .../asm/mixin/transformer/MixinInfo.java | 7 +- .../mixin/transformer/MixinTransformer.java | 46 +++++- .../asm/mixin/transformer/debug/IHotSwap.java | 42 +++++ 7 files changed, 322 insertions(+), 14 deletions(-) create mode 100644 src/agent/java/org/spongepowered/tools/agent/MixinAgent.java create mode 100644 src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java new file mode 100644 index 00000000..4807bb3e --- /dev/null +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -0,0 +1,148 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.agent; + +import net.minecraft.launchwrapper.Launch; +import org.spongepowered.asm.mixin.transformer.MixinTransformer; +import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; + +import java.lang.instrument.ClassFileTransformer; +import java.lang.instrument.IllegalClassFormatException; +import java.lang.instrument.Instrumentation; +import java.lang.instrument.UnmodifiableClassException; +import java.security.ProtectionDomain; +import java.util.ArrayList; +import java.util.List; + +/** + * A java agent that re-transforms a mixin's target class if the mixin has been + * redefined. This agent enables hot-swapping of mixins. + * + * This class is a singleton because it needs to conofrm to the IHotSwap interface. + */ +public class MixinAgent implements IHotSwap{ + + private class Transformer implements ClassFileTransformer{ + + @Override + public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException { + if(classBeingRedefined == null) + return null; + byte[] mixinBytecode = MixinAgent.classLoader.getOriginalBytecode(classBeingRedefined); + if(mixinBytecode != null){ + List targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); + try { + for (String target:targets) { + instrumentation.retransformClasses(Launch.classLoader.findClass(target)); + } + } catch (UnmodifiableClassException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + return mixinBytecode; + } + return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); + } + } + + /** + * Class loader used to load mixin classes + */ + private static final MixinClassLoader classLoader = new MixinClassLoader(); + + /** + * Instance used to register the transformer + */ + private static Instrumentation instrumentation = null; + + /** + * Instances of all agents + */ + private static List agents = new ArrayList(); + + private final MixinTransformer classTransformer; + + /** + * Constructs an agent from a class transformer in which it will use to + * transform the class. + * + * @param classTransformer Class transformer that will transform a mixin's + * target class + */ + public MixinAgent(MixinTransformer classTransformer) { + this.classTransformer = classTransformer; + MixinAgent.agents.add(this); + if (MixinAgent.instrumentation != null) + initTransformer(); + } + + private void initTransformer() { + MixinAgent.instrumentation.addTransformer(new Transformer()); + } + + @Override + public void registerMixinClass(String name, byte[] bytecode) { + MixinAgent.classLoader.addMixinClass(name, bytecode); + } + + /** + * Initialize the agents + * + * @param instrumentation Instance to use to transform the mixins + */ + public static void init(Instrumentation instrumentation) { + MixinAgent.instrumentation = instrumentation; + for (MixinAgent agent:agents) { + agent.initTransformer(); + } + } + + /** + * Initialize the agent + * + * This will be called automatically if the jar is in a -javaagent java + * command line argument + * + * @param arg Ignored + * @param instrumentation Instance to use to transform the mixins + */ + public static void premain(String arg, Instrumentation instrumentation){ + init(instrumentation); + } + + /** + * Initialize the agent + * + * This will be called automatically if the agent is loaded after jvm + * startup + * + * @param arg Ignored + * @param instrumentation Instance to use to transform the mixins + */ + public static void agentmain(String arg, Instrumentation instrumentation) { + init(instrumentation); + } +} diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java new file mode 100644 index 00000000..264e59b6 --- /dev/null +++ b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java @@ -0,0 +1,49 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.agent; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.HashMap; +import java.util.Map; + +class MixinClassLoader extends ClassLoader { + + private static final Logger logger = LogManager.getLogger("mixin.agent"); + + private Map, byte[]> bytecodes = new HashMap, byte[]>(); + + void addMixinClass(String name, byte[] bytes){ + logger.debug("add class "+name+" to class loader"); + try { + logger.catching(e); + } + } + + byte[] getOriginalBytecode(Class clazz){ + return this.bytecodes.get(clazz); + } +} diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index ea2f47b3..7b327b4f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -290,8 +290,13 @@ public class MixinEnvironment implements ITokenProvider { /** * Ignore all constraints on mixin annotations, output warnings instead */ - IGNORE_CONSTRAINTS("ignoreConstraints"); - + IGNORE_CONSTRAINTS("ignoreConstraints"), + + /** + * Enables the hot-swap agent + */ + HOT_SWAP("hotSwap"); + /** * Prefix for mixin options */ diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 1a0e9df5..22183140 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -46,6 +46,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; import org.spongepowered.asm.util.VersionNumber; import com.google.gson.Gson; @@ -274,20 +275,20 @@ class MixinConfig implements Comparable, IMixinConfig { * either the hasMixinsFor() or getMixinsFor() methods. *

*/ - void initialise() { + void initialise(IHotSwap hotSwapper) { if (this.initialised) { return; } this.initialised = true; - this.initialiseMixins(this.mixinClasses, false); + this.initialiseMixins(this.mixinClasses, false, hotSwapper); switch (MixinEnvironment.getCurrentEnvironment().getSide()) { case CLIENT: - this.initialiseMixins(this.mixinClassesClient, false); + this.initialiseMixins(this.mixinClassesClient, false, hotSwapper); break; case SERVER: - this.initialiseMixins(this.mixinClassesServer, false); + this.initialiseMixins(this.mixinClassesServer, false, hotSwapper); break; case UNKNOWN: //$FALL-THROUGH$ @@ -297,10 +298,10 @@ class MixinConfig implements Comparable, IMixinConfig { } } - void postInitialise() { + void postInitialise(IHotSwap hotSwapper) { if (this.plugin != null) { List pluginMixins = this.plugin.getMixins(); - this.initialiseMixins(pluginMixins, true); + this.initialiseMixins(pluginMixins, true, hotSwapper); } for (Iterator iter = this.mixins.iterator(); iter.hasNext();) { @@ -328,7 +329,7 @@ class MixinConfig implements Comparable, IMixinConfig { } } - private void initialiseMixins(List mixinClasses, boolean suppressPlugin) { + private void initialiseMixins(List mixinClasses, boolean suppressPlugin, IHotSwap hotSwapper) { if (mixinClasses == null) { return; } @@ -349,6 +350,7 @@ class MixinConfig implements Comparable, IMixinConfig { this.mixinsFor(targetClassName).add(mixin); this.unhandledTargets.add(targetClassName); } + hotSwapper.registerMixinClass(mixin.getClassName(), mixin.getClassBytes()); this.mixins.add(mixin); } } catch (Exception ex) { @@ -504,6 +506,25 @@ class MixinConfig implements Comparable, IMixinConfig { } return mixins; } + + public List reloadMixin(String mixinClass, byte[] bytes) { + for (Iterator iter = this.mixins.iterator(); iter.hasNext();) { + MixinInfo mixin = iter.next(); + if (mixin.getClassName().equals(mixinClass)) { + mixin.reloadMixin(bytes); + try { + mixin.validate(); + } catch (Exception e) { + this.logger.error(e.getMessage(), e); + this.removeMixin(mixin); + iter.remove(); + return Collections.emptyList(); + } + return mixin.getTargetClasses(); + } + } + return null; + } @Override public String toString() { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 58a62684..f1977ff0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -122,7 +122,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * Mixin bytes (read once, generate tree on demand) */ - private final transient byte[] mixinBytes; + private transient byte[] mixinBytes; /** * Configuration plugin @@ -539,6 +539,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { return mixinBytes; } + void reloadMixin(byte[] mixinBytes) { + this.mixinBytes = mixinBytes; + this.validationClassNode = getClassNode(0); + } + /* (non-Javadoc) * @see java.lang.Comparable#compareTo(java.lang.Object) */ 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 4c5325c7..11f7cb41 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -56,6 +56,7 @@ import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler.ErrorAction; import org.spongepowered.asm.mixin.transformer.debug.IDecompiler; +import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; import org.spongepowered.asm.transformers.TreeTransformer; import org.spongepowered.asm.util.Constants; @@ -277,6 +278,11 @@ public class MixinTransformer extends TreeTransformer { */ private final IDecompiler decompiler; + /** + * Hot-Swap agent + */ + private final IHotSwap hotSwapper; + /** * ctor */ @@ -294,7 +300,9 @@ public class MixinTransformer extends TreeTransformer { TreeInfo.setLock(this.lock); this.decompiler = this.initDecompiler(new File(MixinTransformer.DEBUG_OUTPUT, "java")); - + + this.hotSwapper = this.initHotSwapper(); + try { FileUtils.deleteDirectory(this.classExportDir); } catch (IOException ex) { @@ -321,6 +329,26 @@ public class MixinTransformer extends TreeTransformer { return null; } + private IHotSwap initHotSwapper() { + if (!MixinEnvironment.getCurrentEnvironment().getOption(Option.HOT_SWAP)) { + return null; + } + + try { + this.logger.info("Attempting to load Hot-Swap agent"); + @SuppressWarnings("unchecked") + Class clazz = + (Class)Class.forName("org.spongepowered.tools.agent.MixinAgent"); + Constructor ctor = clazz.getDeclaredConstructor(MixinTransformer.class); + return ctor.newInstance(this); + } catch (Throwable th) { + this.logger.info("Hot-swap agent could not be loaded, hot swapping of mixins won't work. {}: {}", + th.getClass().getSimpleName(), th.getMessage()); + } + + return null; + } + /** * Force-load all classes targetted by mixins but not yet applied */ @@ -404,7 +432,7 @@ public class MixinTransformer extends TreeTransformer { if (environment.getOption(Option.DUMP_TARGET_ON_FAILURE)) { this.dumpClass(transformedName.replace('.', '/') + ".target", basicClass); } - + this.handleMixinErrorState(transformedName, th); } } @@ -421,6 +449,16 @@ public class MixinTransformer extends TreeTransformer { } } + public List reload(String mixinClass, byte[] bytes) { + if (this.lock.getDepth() > 0) + throw new MixinApplyError("Cannot reload mixin if re-entrant lock entered"); + List targets = new ArrayList(); + for (MixinConfig config:this.configs) { + targets.addAll(config.reloadMixin(mixinClass, bytes)); + } + return targets; + } + private void init(MixinEnvironment environment) { this.verboseLoggingLevel = (environment.getOption(Option.DEBUG_VERBOSE)) ? Level.INFO : Level.DEBUG; this.logger.log(this.verboseLoggingLevel, "Preparing mixins for {}", environment); @@ -481,7 +519,7 @@ public class MixinTransformer extends TreeTransformer { private void initConfigs() { for (MixinConfig config : this.pendingConfigs) { try { - config.initialise(); + config.initialise(this.hotSwapper); } catch (Exception ex) { this.logger.error("Error encountered whilst initialising mixin config '" + config.getName() + "': " + ex.getMessage(), ex); } @@ -505,7 +543,7 @@ public class MixinTransformer extends TreeTransformer { for (MixinConfig config : this.pendingConfigs) { try { - config.postInitialise(); + config.postInitialise(this.hotSwapper); } catch (Exception ex) { this.logger.error("Error encountered during mixin config postInit setp'" + config.getName() + "': " + ex.getMessage(), ex); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java b/src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java new file mode 100644 index 00000000..dceecdbd --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java @@ -0,0 +1,42 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer.debug; + +/** + * Interface to allow the hot-swap agent to be loaded on-demand + */ +public interface IHotSwap { + + /** + * Registers a mixin class with the agent. + * + * This is needed as the mixin needs to be loaded to be redefined. + * + * @param name Fully qualified name of the mixin class + * @param bytecode Bytecode of the mixin + */ + public abstract void registerMixinClass(String name, byte[] bytecode); + +} From 7b0a8f5d0577f8d8ea3845aa079070e1785fcc10 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Tue, 20 Oct 2015 10:54:52 +1300 Subject: [PATCH 013/169] Fix typo --- .../java/org/spongepowered/tools/agent/MixinClassLoader.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java index 264e59b6..22c87e77 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java @@ -39,6 +39,9 @@ class MixinClassLoader extends ClassLoader { void addMixinClass(String name, byte[] bytes){ logger.debug("add class "+name+" to class loader"); try { + Class clazz = this.defineClass(name, bytes, 0, bytes.length); + bytecodes.put(clazz, bytes); + }catch(Throwable e){ logger.catching(e); } } From 4ffea5561b92a9e51f34c717e0bfe52e540962e0 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Wed, 21 Oct 2015 10:36:01 +1300 Subject: [PATCH 014/169] Fixed issues with detecting chnaged mixin classes --- build.gradle | 22 +++++++++++-- .../spongepowered/tools/agent/MixinAgent.java | 21 +++++++----- .../tools/agent/MixinClassLoader.java | 33 +++++++++++++++++-- .../asm/mixin/transformer/MixinConfig.java | 4 ++- 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index b97e08e5..d950f965 100644 --- a/build.gradle +++ b/build.gradle @@ -92,6 +92,9 @@ sourceSets { fernflower { compileClasspath += main.output } + agent { + compileClasspath += main.output + } } // Dependencies for renamed ASM @@ -132,7 +135,6 @@ task renamedASM { dependencies { compile 'org.slf4j:slf4j-api:1.7.7' compile 'com.google.guava:guava:17.0' - compile 'net.minecraft:launchwrapper:1.11' compile 'com.google.code.gson:gson:2.2.4' compile 'commons-io:commons-io:2.4' compile 'commons-codec:commons-codec:1.9' @@ -150,6 +152,7 @@ dependencies { // remapped ASM compile tasks.renamedASM.outputs.files apCompile tasks.renamedASM.outputs.files + agentCompile tasks.renamedASM.outputs.files // fernflower bridge fernflowerCompile 'commons-io:commons-io:2.4' @@ -157,6 +160,9 @@ dependencies { fernflowerCompile 'com.google.guava:guava:17.0' fernflowerCompile 'org.jetbrains.java.decompiler:fernflower:sponge-SNAPSHOT' compile 'org.jetbrains.java.decompiler:fernflower:sponge-SNAPSHOT' + + compile 'net.minecraft:launchwrapper:1.11' + agentCompile 'net.minecraft:launchwrapper:1.11' } // Filter, process, and include resources @@ -212,7 +218,10 @@ jar { // Include fernflower bridge from sourceSets.fernflower.output - + + // Include hotswap agent + from sourceSets.agent.output + // Renamed ASM from zipTree(tasks.renamedASM.outputs.files[0]) @@ -226,7 +235,12 @@ jar { "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")", "Implementation-Title": name, "Implementation-Version": version + "+" + ciSystem + "-b" + buildNumber + ".git-" + commit, - "Implementation-Vendor": url) + "Implementation-Vendor": url, + // for hotswap agent + "Premain-Class": "org.spongepowered.tools.agent.MixinAgent", + "Agent-Class": "org.spongepowered.tools.agent.MixinAgent", + "Can-Redefine-Classes": true, + "Can-Retransform-Classes": true) } // generate shadow jar so we can use the AP standalone @@ -259,6 +273,8 @@ task sourceJar(type: Jar) { from sourceSets.ap.resources from sourceSets.fernflower.java from sourceSets.fernflower.resources + from sourceSets.agent.java + from sourceSets.agent.resources classifier = "sources" } diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 4807bb3e..0a6a8590 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -25,6 +25,8 @@ package org.spongepowered.tools.agent; import net.minecraft.launchwrapper.Launch; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; @@ -50,17 +52,18 @@ public class MixinAgent implements IHotSwap{ public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException { if(classBeingRedefined == null) return null; + MixinAgent.logger.info("Redefining class "+className); byte[] mixinBytecode = MixinAgent.classLoader.getOriginalBytecode(classBeingRedefined); if(mixinBytecode != null){ + MixinAgent.logger.info("Redefining mixin "+className); List targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); - try { - for (String target:targets) { + for (String target:targets) { + MixinAgent.logger.debug("Re-transforming target class "+target); + try { instrumentation.retransformClasses(Launch.classLoader.findClass(target)); + } catch (Exception e) { + MixinAgent.logger.error("Error while re-transforming target class "+target); } - } catch (UnmodifiableClassException e) { - e.printStackTrace(); - } catch (ClassNotFoundException e) { - e.printStackTrace(); } return mixinBytecode; } @@ -73,6 +76,8 @@ public class MixinAgent implements IHotSwap{ */ private static final MixinClassLoader classLoader = new MixinClassLoader(); + private static final Logger logger = LogManager.getLogger("mixin.agent"); + /** * Instance used to register the transformer */ @@ -100,12 +105,12 @@ public class MixinAgent implements IHotSwap{ } private void initTransformer() { - MixinAgent.instrumentation.addTransformer(new Transformer()); + MixinAgent.instrumentation.addTransformer(new Transformer(), true); } @Override public void registerMixinClass(String name, byte[] bytecode) { - MixinAgent.classLoader.addMixinClass(name, bytecode); + MixinAgent.classLoader.addMixinClass(name); } /** diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java index 22c87e77..f8b78997 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java @@ -26,7 +26,15 @@ package org.spongepowered.tools.agent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.lib.ClassWriter; +import org.spongepowered.asm.lib.MethodVisitor; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; import java.util.HashMap; import java.util.Map; @@ -36,10 +44,14 @@ class MixinClassLoader extends ClassLoader { private Map, byte[]> bytecodes = new HashMap, byte[]>(); - void addMixinClass(String name, byte[] bytes){ - logger.debug("add class "+name+" to class loader"); + void addMixinClass(String name){ + logger.debug("Mixin class "+name+" added to class loader"); try { + byte[] bytes = materialize(name); Class clazz = this.defineClass(name, bytes, 0, bytes.length); + // apparently the class needs to be instantiated at least once + // to be including in list returned by allClasses() method in jdi api + clazz.newInstance(); bytecodes.put(clazz, bytes); }catch(Throwable e){ logger.catching(e); @@ -49,4 +61,21 @@ class MixinClassLoader extends ClassLoader { byte[] getOriginalBytecode(Class clazz){ return this.bytecodes.get(clazz); } + + private byte[] materialize(String name) { + ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); + cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), null); + + // create init method + MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "", "()V", null, null); + mv.visitCode(); + mv.visitVarInsn(Opcodes.ALOAD, 0); + mv.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getInternalName(Object.class), "", "()V", false); + mv.visitInsn(Opcodes.RETURN); + mv.visitMaxs(1, 1); + mv.visitEnd(); + + cw.visitEnd(); + return cw.toByteArray(); + } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 22183140..c88eaa0a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -350,7 +350,9 @@ class MixinConfig implements Comparable, IMixinConfig { this.mixinsFor(targetClassName).add(mixin); this.unhandledTargets.add(targetClassName); } - hotSwapper.registerMixinClass(mixin.getClassName(), mixin.getClassBytes()); + if (hotSwapper != null) { + hotSwapper.registerMixinClass(mixin.getClassName(), mixin.getClassBytes()); + } this.mixins.add(mixin); } } catch (Exception ex) { From 5a7eaeae79b33b5afbe3e7fe8e9e1782ea4a8ab4 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Wed, 21 Oct 2015 11:55:03 +1300 Subject: [PATCH 015/169] Fix transformation errors --- .../spongepowered/tools/agent/MixinAgent.java | 29 ++++++++++++++----- .../asm/mixin/transformer/MixinConfig.java | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 0a6a8590..bcf1cc8e 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -33,7 +33,6 @@ import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.IllegalClassFormatException; import java.lang.instrument.Instrumentation; -import java.lang.instrument.UnmodifiableClassException; import java.security.ProtectionDomain; import java.util.ArrayList; import java.util.List; @@ -50,24 +49,37 @@ public class MixinAgent implements IHotSwap{ @Override public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException { + MixinAgent.logger.info("Redefining class "+className); if(classBeingRedefined == null) return null; - MixinAgent.logger.info("Redefining class "+className); byte[] mixinBytecode = MixinAgent.classLoader.getOriginalBytecode(classBeingRedefined); if(mixinBytecode != null){ MixinAgent.logger.info("Redefining mixin "+className); - List targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); + List targets; + try { + targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); + } catch (Throwable th) { + // catch everything as otherwise it is ignored + MixinAgent.logger.error("Error while finding targets for mixin "+className, th); + return mixinBytecode; + } for (String target:targets) { MixinAgent.logger.debug("Re-transforming target class "+target); try { - instrumentation.retransformClasses(Launch.classLoader.findClass(target)); - } catch (Exception e) { - MixinAgent.logger.error("Error while re-transforming target class "+target); + instrumentation.retransformClasses(Launch.classLoader.findClass(target.replace('/', '.'))); + } catch (Throwable th) { + MixinAgent.logger.error("Error while re-transforming target class "+target, th); } } return mixinBytecode; } - return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); + try { + MixinAgent.logger.info("Redefining class "+className); + return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); + } catch (Throwable th) { + MixinAgent.logger.error("Error while re-transforming class "+className, th); + return null; + } } } @@ -120,6 +132,9 @@ public class MixinAgent implements IHotSwap{ */ public static void init(Instrumentation instrumentation) { MixinAgent.instrumentation = instrumentation; + if(!MixinAgent.instrumentation.isRetransformClassesSupported()) { + MixinAgent.logger.error("The instrumentation doesn't support re-transformations"); + } for (MixinAgent agent:agents) { agent.initTransformer(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index c88eaa0a..7dfb381c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -525,7 +525,7 @@ class MixinConfig implements Comparable, IMixinConfig { return mixin.getTargetClasses(); } } - return null; + return Collections.emptyList(); } @Override From bc8296da0e60fe6992effa3cf32a6a3cbb8e45aa Mon Sep 17 00:00:00 2001 From: BenLewis Date: Thu, 22 Oct 2015 08:17:29 +1300 Subject: [PATCH 016/169] Tidy up code --- .../spongepowered/tools/agent/MixinAgent.java | 89 ++++++++++++------- .../tools/agent/MixinClassLoader.java | 70 ++++++++++++--- .../asm/mixin/transformer/MixinConfig.java | 9 +- .../asm/mixin/transformer/MixinInfo.java | 7 +- .../mixin/transformer/MixinTransformer.java | 16 +++- .../asm/mixin/transformer/debug/IHotSwap.java | 13 ++- 6 files changed, 154 insertions(+), 50 deletions(-) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index bcf1cc8e..22023a28 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -30,6 +30,7 @@ import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; +import java.lang.instrument.ClassDefinition; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.IllegalClassFormatException; import java.lang.instrument.Instrumentation; @@ -38,46 +39,60 @@ import java.util.ArrayList; import java.util.List; /** - * A java agent that re-transforms a mixin's target class if the mixin has been - * redefined. This agent enables hot-swapping of mixins. - * - * This class is a singleton because it needs to conofrm to the IHotSwap interface. + * An agent that re-transforms a mixin's target classes if the mixin has been + * redefined. Basically this agent enables hot-swapping of mixins. */ -public class MixinAgent implements IHotSwap{ +public class MixinAgent implements IHotSwap { - private class Transformer implements ClassFileTransformer{ + /** + * Class file transformer that re-transforms mixin's target classes if the + * mixin has been redefined. + */ + private class Transformer implements ClassFileTransformer { @Override - public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException { - MixinAgent.logger.info("Redefining class "+className); - if(classBeingRedefined == null) + public byte[] transform(ClassLoader loader, + String className, + Class classBeingRedefined, + ProtectionDomain protectionDomain, + byte[] classfileBuffer) throws IllegalClassFormatException { + if (classBeingRedefined == null) { return null; - byte[] mixinBytecode = MixinAgent.classLoader.getOriginalBytecode(classBeingRedefined); - if(mixinBytecode != null){ - MixinAgent.logger.info("Redefining mixin "+className); + } + byte[] mixinBytecode = MixinAgent.classLoader.getFakeMixinBytecode(classBeingRedefined); + if (mixinBytecode != null) { + MixinAgent.logger.info("Redefining mixin " + className); List targets; try { targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); } catch (Throwable th) { // catch everything as otherwise it is ignored - MixinAgent.logger.error("Error while finding targets for mixin "+className, th); + MixinAgent.logger.error("Error while finding targets for mixin " + className, th); return mixinBytecode; } - for (String target:targets) { - MixinAgent.logger.debug("Re-transforming target class "+target); + for (String target : targets) { + String targetName = target.replace('/', '.'); + MixinAgent.logger.debug("Re-transforming target class " + target); try { - instrumentation.retransformClasses(Launch.classLoader.findClass(target.replace('/', '.'))); + Class targetClass = Launch.classLoader.findClass(targetName); + byte[] targetBytecode = MixinAgent.classLoader.getOriginalTargetBytecode(targetName); + if (targetBytecode == null) { + MixinAgent.logger.error("Target class " + targetName + " hasn't registered its bytecode"); + continue; + } + targetBytecode = MixinAgent.this.classTransformer.transform(null, targetName, targetBytecode); + instrumentation.redefineClasses(new ClassDefinition(targetClass, targetBytecode)); } catch (Throwable th) { - MixinAgent.logger.error("Error while re-transforming target class "+target, th); + MixinAgent.logger.error("Error while re-transforming target class " + target, th); } } return mixinBytecode; } try { - MixinAgent.logger.info("Redefining class "+className); + MixinAgent.logger.info("Redefining class " + className); return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); } catch (Throwable th) { - MixinAgent.logger.error("Error while re-transforming class "+className, th); + MixinAgent.logger.error("Error while re-transforming class " + className, th); return null; } } @@ -100,11 +115,14 @@ public class MixinAgent implements IHotSwap{ */ private static List agents = new ArrayList(); + /** + * MixinTransformer instance to use to transform the mixin's target classes + */ private final MixinTransformer classTransformer; /** * Constructs an agent from a class transformer in which it will use to - * transform the class. + * transform mixin's target class. * * @param classTransformer Class transformer that will transform a mixin's * target class @@ -112,8 +130,9 @@ public class MixinAgent implements IHotSwap{ public MixinAgent(MixinTransformer classTransformer) { this.classTransformer = classTransformer; MixinAgent.agents.add(this); - if (MixinAgent.instrumentation != null) - initTransformer(); + if (MixinAgent.instrumentation != null) { + this.initTransformer(); + } } private void initTransformer() { @@ -121,19 +140,25 @@ public class MixinAgent implements IHotSwap{ } @Override - public void registerMixinClass(String name, byte[] bytecode) { + public void registerMixinClass(String name) { MixinAgent.classLoader.addMixinClass(name); } + @Override + public void registerTargetClass(String name, byte[] bytecode) { + MixinAgent.classLoader.addTargetClass(name, bytecode); + } + /** - * Initialize the agents + * Sets the instrumentation instance so that the mixin agents can redefine + * mixins. * - * @param instrumentation Instance to use to transform the mixins + * @param instrumentation Instance to use to redefine the mixins */ public static void init(Instrumentation instrumentation) { MixinAgent.instrumentation = instrumentation; - if(!MixinAgent.instrumentation.isRetransformClassesSupported()) { - MixinAgent.logger.error("The instrumentation doesn't support re-transformations"); + if (!MixinAgent.instrumentation.isRedefineClassesSupported()) { + MixinAgent.logger.error("The instrumentation doesn't support re-definition of classes"); } for (MixinAgent agent:agents) { agent.initTransformer(); @@ -141,7 +166,7 @@ public class MixinAgent implements IHotSwap{ } /** - * Initialize the agent + * Initialize the java agent * * This will be called automatically if the jar is in a -javaagent java * command line argument @@ -149,18 +174,18 @@ public class MixinAgent implements IHotSwap{ * @param arg Ignored * @param instrumentation Instance to use to transform the mixins */ - public static void premain(String arg, Instrumentation instrumentation){ + public static void premain(String arg, Instrumentation instrumentation) { init(instrumentation); } /** - * Initialize the agent + * Initialize the java agent * - * This will be called automatically if the agent is loaded after jvm + * This will be called automatically if the java agent is loaded after jvm * startup * * @param arg Ignored - * @param instrumentation Instance to use to transform the mixins + * @param instrumentation Instance to use to re-define the mixins */ public static void agentmain(String arg, Instrumentation instrumentation) { init(instrumentation); diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java index f8b78997..950432bb 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java @@ -31,38 +31,84 @@ import org.spongepowered.asm.lib.MethodVisitor; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; import java.util.HashMap; import java.util.Map; +/** + * Class loader that is used to load fake mixin classes so that they can be + * re-defined. + */ class MixinClassLoader extends ClassLoader { private static final Logger logger = LogManager.getLogger("mixin.agent"); - private Map, byte[]> bytecodes = new HashMap, byte[]>(); + /** + * Mapping of mixin mixin classes to their fake classes + */ + private Map, byte[]> mixins = new HashMap, byte[]>(); - void addMixinClass(String name){ - logger.debug("Mixin class "+name+" added to class loader"); + /** + * Mapping that keep track of bytecode for classes that are targeted by + * mixins + */ + private Map targets = new HashMap(); + + /** + * Add a fake mixin class + * + * @param name Name of the fake class + */ + void addMixinClass(String name) { + logger.debug("Mixin class " + name + " added to class loader"); try { byte[] bytes = materialize(name); Class clazz = this.defineClass(name, bytes, 0, bytes.length); // apparently the class needs to be instantiated at least once // to be including in list returned by allClasses() method in jdi api clazz.newInstance(); - bytecodes.put(clazz, bytes); - }catch(Throwable e){ + this.mixins.put(clazz, bytes); + } catch (Throwable e) { logger.catching(e); } } - byte[] getOriginalBytecode(Class clazz){ - return this.bytecodes.get(clazz); + /** + * Registers the bytecode for a class targeted by a mixin + * + * @param name Name of the target clas + * @param bytecode Bytecode of the target class + */ + void addTargetClass(String name, byte[] bytecode) { + this.targets.put(name, bytecode); } - private byte[] materialize(String name) { + /** + * Gets the bytecode for a fake mixin class + * + * @param clazz Mixin class + * @return Bytecode of the fake mixin class + */ + byte[] getFakeMixinBytecode(Class clazz) { + return this.mixins.get(clazz); + } + + /** + * Gets the original bytecode for a target class + * + * @param name Name of the target class + * @return Original bytecode + */ + byte[] getOriginalTargetBytecode(String name) { + return this.targets.get(name); + } + + /** + * Generates the simplest possible class that is instantiable + * + * @param name Name of the generated class + * @return Bytecode of the generated class + */ + private static byte[] materialize(String name) { ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), null); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 7dfb381c..a07a4f33 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -351,7 +351,7 @@ class MixinConfig implements Comparable, IMixinConfig { this.unhandledTargets.add(targetClassName); } if (hotSwapper != null) { - hotSwapper.registerMixinClass(mixin.getClassName(), mixin.getClassBytes()); + hotSwapper.registerMixinClass(mixin.getClassName()); } this.mixins.add(mixin); } @@ -509,6 +509,13 @@ class MixinConfig implements Comparable, IMixinConfig { return mixins; } + /** + * Updates a mixin with new bytecode + * + * @param mixinClass Name of the mixin class + * @param bytes New bytecode + * @return List of classes that need to be updated + */ public List reloadMixin(String mixinClass, byte[] bytes) { for (Iterator iter = this.mixins.iterator(); iter.hasNext();) { MixinInfo mixin = iter.next(); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index f1977ff0..b74d2a28 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -539,9 +539,14 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { return mixinBytes; } + /** + * Updates this mixin with new bytecode + * + * @param mixinBytes New bytecode + */ void reloadMixin(byte[] mixinBytes) { this.mixinBytes = mixinBytes; - this.validationClassNode = getClassNode(0); + this.validationClassNode = this.getClassNode(0); } /* (non-Javadoc) 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 11f7cb41..5020cd9d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -425,7 +425,11 @@ public class MixinTransformer extends TreeTransformer { this.logger.warn("Re-entrance detected, this will cause serious problems.", new RuntimeException()); throw new MixinApplyError("Re-entrance error."); } - + + if (this.hotSwapper != null) { + this.hotSwapper.registerTargetClass(transformedName, basicClass); + } + try { basicClass = this.applyMixins(transformedName, basicClass, mixins); } catch (InvalidMixinException th) { @@ -449,9 +453,17 @@ public class MixinTransformer extends TreeTransformer { } } + /** + * Update a mixin class with new bytecode. + * + * @param mixinClass Name of the mixin + * @param bytes New bytecode + * @return List of classes that need to be updated + */ public List reload(String mixinClass, byte[] bytes) { - if (this.lock.getDepth() > 0) + if (this.lock.getDepth() > 0) { throw new MixinApplyError("Cannot reload mixin if re-entrant lock entered"); + } List targets = new ArrayList(); for (MixinConfig config:this.configs) { targets.addAll(config.reloadMixin(mixinClass, bytes)); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java b/src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java index dceecdbd..cca77c9a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/debug/IHotSwap.java @@ -35,8 +35,17 @@ public interface IHotSwap { * This is needed as the mixin needs to be loaded to be redefined. * * @param name Fully qualified name of the mixin class - * @param bytecode Bytecode of the mixin */ - public abstract void registerMixinClass(String name, byte[] bytecode); + public abstract void registerMixinClass(String name); + /** + * Registers a class targeted by at least one mixin. + * + * This is used to rollback the target class to a state before the mixin's + * where applied. + * + * @param name Name of the class + * @param bytecode Bytecode of the class before mixin's have been applied + */ + public abstract void registerTargetClass(String name, byte[] bytecode); } From 09b01109b8d0a607595f3ac4546585043e3523be Mon Sep 17 00:00:00 2001 From: BenLewis Date: Fri, 23 Oct 2015 17:36:10 +1300 Subject: [PATCH 017/169] Refactored MixinInfo to handle errors on reload gracefully Also - Fixed formatting error - Fixed changing of classinfo's on reload validation - Changed agent to return some invalid bytecode on error, to clearly signal an error occured --- .../spongepowered/tools/agent/MixinAgent.java | 31 ++- ...Loader.java => MixinAgentClassLoader.java} | 8 +- .../asm/mixin/transformer/MixinConfig.java | 8 - .../asm/mixin/transformer/MixinInfo.java | 241 ++++++++++++------ .../transformer/MixinReloadException.java | 44 ++++ .../mixin/transformer/MixinTransformer.java | 2 +- 6 files changed, 237 insertions(+), 97 deletions(-) rename src/agent/java/org/spongepowered/tools/agent/{MixinClassLoader.java => MixinAgentClassLoader.java} (94%) create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 22023a28..64522bad 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -27,6 +27,7 @@ package org.spongepowered.tools.agent; import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.mixin.transformer.MixinReloadException; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; @@ -51,11 +52,8 @@ public class MixinAgent implements IHotSwap { private class Transformer implements ClassFileTransformer { @Override - public byte[] transform(ClassLoader loader, - String className, - Class classBeingRedefined, - ProtectionDomain protectionDomain, - byte[] classfileBuffer) throws IllegalClassFormatException { + public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain domain, byte[] classfileBuffer) + throws IllegalClassFormatException { if (classBeingRedefined == null) { return null; } @@ -65,10 +63,13 @@ public class MixinAgent implements IHotSwap { List targets; try { targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); + } catch (MixinReloadException e) { + MixinAgent.logger.error("mixin " + e.getMixinInfo() + " cannot be reloaded, needs a restart to be applied: " + e.getMessage()); + return ERROR_BYTECODE; } catch (Throwable th) { // catch everything as otherwise it is ignored MixinAgent.logger.error("Error while finding targets for mixin " + className, th); - return mixinBytecode; + return ERROR_BYTECODE; } for (String target : targets) { String targetName = target.replace('/', '.'); @@ -78,12 +79,13 @@ public class MixinAgent implements IHotSwap { byte[] targetBytecode = MixinAgent.classLoader.getOriginalTargetBytecode(targetName); if (targetBytecode == null) { MixinAgent.logger.error("Target class " + targetName + " hasn't registered its bytecode"); - continue; + return ERROR_BYTECODE; } targetBytecode = MixinAgent.this.classTransformer.transform(null, targetName, targetBytecode); instrumentation.redefineClasses(new ClassDefinition(targetClass, targetBytecode)); } catch (Throwable th) { MixinAgent.logger.error("Error while re-transforming target class " + target, th); + return ERROR_BYTECODE; } } return mixinBytecode; @@ -93,15 +95,22 @@ public class MixinAgent implements IHotSwap { return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); } catch (Throwable th) { MixinAgent.logger.error("Error while re-transforming class " + className, th); - return null; + return ERROR_BYTECODE; } } } + /** + * Bytecode that signals an error. When returned from the class file + * transformer this causes a class file format exception and indicates in + * the ide that somethings went wrong. + */ + public static byte[] ERROR_BYTECODE = new byte[]{1}; + /** * Class loader used to load mixin classes */ - private static final MixinClassLoader classLoader = new MixinClassLoader(); + private static final MixinAgentClassLoader classLoader = new MixinAgentClassLoader(); private static final Logger logger = LogManager.getLogger("mixin.agent"); @@ -175,7 +184,7 @@ public class MixinAgent implements IHotSwap { * @param instrumentation Instance to use to transform the mixins */ public static void premain(String arg, Instrumentation instrumentation) { - init(instrumentation); + MixinAgent.init(instrumentation); } /** @@ -188,6 +197,6 @@ public class MixinAgent implements IHotSwap { * @param instrumentation Instance to use to re-define the mixins */ public static void agentmain(String arg, Instrumentation instrumentation) { - init(instrumentation); + MixinAgent.init(instrumentation); } } diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java similarity index 94% rename from src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java rename to src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java index 950432bb..5aa06541 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java @@ -38,7 +38,7 @@ import java.util.Map; * Class loader that is used to load fake mixin classes so that they can be * re-defined. */ -class MixinClassLoader extends ClassLoader { +class MixinAgentClassLoader extends ClassLoader { private static final Logger logger = LogManager.getLogger("mixin.agent"); @@ -59,9 +59,9 @@ class MixinClassLoader extends ClassLoader { * @param name Name of the fake class */ void addMixinClass(String name) { - logger.debug("Mixin class " + name + " added to class loader"); + MixinAgentClassLoader.logger.debug("Mixin class " + name + " added to class loader"); try { - byte[] bytes = materialize(name); + byte[] bytes = this.materialise(name); Class clazz = this.defineClass(name, bytes, 0, bytes.length); // apparently the class needs to be instantiated at least once // to be including in list returned by allClasses() method in jdi api @@ -108,7 +108,7 @@ class MixinClassLoader extends ClassLoader { * @param name Name of the generated class * @return Bytecode of the generated class */ - private static byte[] materialize(String name) { + private byte[] materialise(String name) { ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), null); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index a07a4f33..2138bf48 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -521,14 +521,6 @@ class MixinConfig implements Comparable, IMixinConfig { MixinInfo mixin = iter.next(); if (mixin.getClassName().equals(mixinClass)) { mixin.reloadMixin(bytes); - try { - mixin.validate(); - } catch (Exception e) { - this.logger.error(e.getMessage(), e); - this.removeMixin(mixin); - iter.remove(); - return Collections.emptyList(); - } return mixin.getTargetClasses(); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index b74d2a28..140407e9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -65,7 +65,103 @@ import com.google.common.collect.Lists; * Runtime information bundle about a mixin */ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { - + + /** + * State that can be reloaded. + */ + private class ValidationState { + /** + * Mixin bytes (read once, generate tree on demand) + */ + byte[] mixinBytes; + + /** + * All interfaces implemented by this mixin, including soft implementations + */ + final Set interfaces = new HashSet(); + + /** + * Interfaces soft-implemented using {@link Implements} + */ + final List softImplements = new ArrayList(); + + /** + * Synthetic inner classes + */ + final Set syntheticInnerClasses = new HashSet(); + + /** + * Mixin ClassInfo + */ + final ClassInfo classInfo; + + /** + * True if the superclass of the mixin is not the direct superclass + * of one or more targets + */ + boolean detachedSuper; + + /** + * Initial ClassNode created for mixin validation, not used for actual + * application + */ + ClassNode validationClassNode; + + ValidationState(byte[] mixinBytes, ClassInfo classInfo) { + this.mixinBytes = mixinBytes; + this.validationClassNode = this.getClassNode(0); + this.classInfo = classInfo; + } + + ValidationState(byte[] mixinBytes) { + this.mixinBytes = mixinBytes; + this.validationClassNode = this.getClassNode(0); + this.classInfo = ClassInfo.fromClassNode(this.validationClassNode); + } + + /** + * Gets a new tree from the bytecode + * + * @param flags Flags passed into classReader + * @return Tree representing the bytecode + */ + ClassNode getClassNode(int flags) { + MixinClassNode classNode = new MixinClassNode(MixinInfo.this); + ClassReader classReader = new ClassReader(this.mixinBytes); + classReader.accept(classNode, flags); + return classNode; + } + } + + private class ReloadedState extends ValidationState { + final ValidationState parent; + + ReloadedState(ValidationState parent, byte[] mixinBytes) { + super(mixinBytes, parent.classInfo); + this.parent = parent; + } + + void validateChanges() { + if (!this.syntheticInnerClasses.equals(this.parent.syntheticInnerClasses)) { + throw new MixinReloadException(MixinInfo.this, "Cannot change inner classes"); + } + if (!this.interfaces.equals(this.parent.interfaces)) { + throw new MixinReloadException(MixinInfo.this, "Cannot change interfaces"); + } + if (!new HashSet(this.softImplements).equals(new HashSet(this.parent.softImplements))) { + throw new MixinReloadException(MixinInfo.this, "Cannot change soft interfaces"); + } + List targets = MixinInfo.this.readTargetClasses(this.validationClassNode, true); + if (!new HashSet(targets).equals(new HashSet(MixinInfo.this.targetClasses))) { + throw new MixinReloadException(MixinInfo.this, "Cannot change target classes"); + } + int priority = MixinInfo.this.readPriority(this.validationClassNode); + if (priority != MixinInfo.this.priority) { + throw new MixinReloadException(MixinInfo.this, "Cannot change mixin priority"); + } + } + } + /** * Global order of mixin infos, used to determine ordering between mixins * with equivalent priority @@ -94,11 +190,6 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private final String className; - /** - * Mixin ClassInfo - */ - private final transient ClassInfo classInfo; - /** * Mixin priority, read from the {@link Mixin} annotation on the mixin class */ @@ -118,48 +209,26 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Intrinsic order (for sorting mixins with identical priority) */ private final transient int order = MixinInfo.mixinOrder++; - - /** - * Mixin bytes (read once, generate tree on demand) - */ - private transient byte[] mixinBytes; /** * Configuration plugin */ private final transient IMixinConfigPlugin plugin; - - /** - * All interfaces implemented by this mixin, including soft implementations - */ - private final transient Set interfaces = new HashSet(); /** - * Interfaces soft-implemented using {@link Implements} + * Holds state that currently is not fully initialised */ - private final transient List softImplements = new ArrayList(); - + private transient ValidationState uninitialisedState; + /** - * Synthetic inner classes + * Holds state that can be reloaded */ - private final transient Set syntheticInnerClasses = new HashSet(); - + private transient ValidationState validationState; + /** * The environment phase in which this mixin was initialised */ private final transient Phase phase; - - /** - * Initial ClassNode created for mixin validation, not used for actual - * application - */ - private transient ClassNode validationClassNode; - - /** - * True if the superclass of the mixin is not the direct superclass - * of one or more targets - */ - private boolean detachedSuper; /** * Internal ctor, called by {@link MixinConfig} @@ -180,23 +249,33 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { this.phase = MixinEnvironment.getCurrentEnvironment().getPhase(); // Read the class bytes and transform - this.mixinBytes = this.loadMixinClass(this.className, runTransformers); - - ClassNode classNode = this.getClassNode(0); + byte[] mixinBytes = this.loadMixinClass(this.className, runTransformers); + this.uninitialisedState = new ValidationState(mixinBytes); + + ClassNode classNode = this.uninitialisedState.getClassNode(0); this.priority = this.readPriority(classNode); this.targetClasses = this.readTargetClasses(classNode, suppressPlugin); this.targetClassNames = Collections.unmodifiableList(Lists.transform(this.targetClasses, Functions.toStringFunction())); - this.validationClassNode = classNode; - this.classInfo = ClassInfo.fromClassNode(classNode); } void validate() { - this.detachedSuper = this.validateTargetClasses(this.validationClassNode); - this.validateMixin(this.validationClassNode); - this.readImplementations(this.validationClassNode); - this.readInnerClasses(this.validationClassNode); - new MixinPreProcessor(this, this.validationClassNode).prepare(); - this.validationClassNode = null; + try { + ClassNode classNode = this.uninitialisedState.validationClassNode; + this.uninitialisedState.detachedSuper = this.validateTargetClasses(classNode); + this.validateMixin(this.uninitialisedState); + this.readImplementations(this.uninitialisedState); + this.readInnerClasses(this.uninitialisedState); + if (this.uninitialisedState instanceof ReloadedState) { + ((ReloadedState) this.uninitialisedState).validateChanges(); + } else { + new MixinPreProcessor(this, classNode).prepare(); + } + this.uninitialisedState.validationClassNode = null; + // the state is now fully initialised and validated + this.validationState = this.uninitialisedState; + } finally { + this.uninitialisedState = null; + } } /** @@ -296,21 +375,21 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * Performs pre-flight checks on the mixin * - * @param classNode + * @param state ReloadableState to validate */ - private void validateMixin(ClassNode classNode) { + private void validateMixin(ValidationState state) { // isInner (shouldn't) return true for static inner classes - if (!this.classInfo.isProbablyStatic()) { + if (!state.classInfo.isProbablyStatic()) { throw new InvalidMixinException(this, "Inner class mixin must be declared static"); } // Can't have remappable fields or methods on a multi-target mixin, because after obfuscation the fields will remap to conflicting names if (this.targetClasses.size() > 1) { - for (FieldNode field : classNode.fields) { + for (FieldNode field : state.validationClassNode.fields) { this.checkRemappable(Shadow.class, field.name, ASMHelper.getVisibleAnnotation(field, Shadow.class)); } - for (MethodNode method : classNode.methods) { + for (MethodNode method : state.validationClassNode.methods) { this.checkRemappable(Shadow.class, method.name, ASMHelper.getVisibleAnnotation(method, Shadow.class)); AnnotationNode overwrite = ASMHelper.getVisibleAnnotation(method, Overwrite.class); if (overwrite != null && ((method.access & Opcodes.ACC_STATIC) == 0 || (method.access & Opcodes.ACC_PUBLIC) == 0)) { @@ -330,10 +409,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * Read and process any {@link Implements} annotations on the mixin */ - private void readImplementations(ClassNode classNode) { - this.interfaces.addAll(classNode.interfaces); + private void readImplementations(ValidationState state) { + state.interfaces.addAll(state.validationClassNode.interfaces); - AnnotationNode implementsAnnotation = ASMHelper.getInvisibleAnnotation(classNode, Implements.class); + AnnotationNode implementsAnnotation = ASMHelper.getInvisibleAnnotation(state.validationClassNode, Implements.class); if (implementsAnnotation == null) { return; } @@ -345,9 +424,12 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { for (AnnotationNode interfaceNode : interfaces) { InterfaceInfo interfaceInfo = InterfaceInfo.fromAnnotation(this, interfaceNode); - this.softImplements.add(interfaceInfo); - this.interfaces.add(interfaceInfo.getInternalName()); - this.classInfo.addInterface(interfaceInfo.getInternalName()); + state.softImplements.add(interfaceInfo); + state.interfaces.add(interfaceInfo.getInternalName()); + // only add interface if its initial initialisation + if (!(state instanceof ReloadedState)) { + state.classInfo.addInterface(interfaceInfo.getInternalName()); + } } } @@ -356,12 +438,13 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * classes so that we can add them to the passthrough set in our parent * config. */ - private void readInnerClasses(ClassNode classNode) { - for (InnerClassNode inner : classNode.innerClasses) { + private void readInnerClasses(ValidationState state) { + for (InnerClassNode inner : state.validationClassNode.innerClasses) { ClassInfo innerClass = ClassInfo.forName(inner.name); if (innerClass.isSynthetic() && innerClass.isProbablyStatic()) { - if ((inner.outerName != null && inner.outerName.equals(this.classInfo.getName())) || inner.name.startsWith(classNode.name + "$")) { - this.syntheticInnerClasses.add(inner.name); + if ((inner.outerName != null && inner.outerName.equals(state.classInfo.getName())) || + inner.name.startsWith(state.validationClassNode.name + "$")) { + state.syntheticInnerClasses.add(inner.name); } else { throw new InvalidMixinException(this, "Unhandled synthetic inner class found: " + inner.name); } @@ -369,8 +452,19 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } } + /** + * Current state, either the initialised state or the uninitialised state if + * it initialising for the first time. Should never return null. + */ + private ValidationState getCurrentState() { + if (this.validationState == null) { + return this.uninitialisedState; + } + return this.validationState; + } + ClassInfo getClassInfo() { - return this.classInfo; + return this.getCurrentState().classInfo; } /** @@ -409,7 +503,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ @Override public String getClassRef() { - return this.classInfo.getName(); + return this.getClassInfo().getName(); } /** @@ -417,7 +511,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ @Override public byte[] getClassBytes() { - return this.mixinBytes; + return this.getCurrentState().mixinBytes; } /** @@ -426,7 +520,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ @Override public boolean isDetachedSuper() { - return this.detachedSuper; + return this.getCurrentState().detachedSuper; } /** @@ -449,10 +543,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ @Override public ClassNode getClassNode(int flags) { - MixinClassNode classNode = new MixinClassNode(this); - ClassReader classReader = new ClassReader(this.mixinBytes); - classReader.accept(classNode, flags); - return classNode; + return this.getCurrentState().getClassNode(flags); } /** @@ -467,14 +558,14 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Get the soft implementations for this mixin */ List getSoftImplements() { - return Collections.unmodifiableList(this.softImplements); + return Collections.unmodifiableList(this.getCurrentState().softImplements); } /** * Get the synthetic inner classes for this mixin */ public Set getSyntheticInnerClasses() { - return Collections.unmodifiableSet(this.syntheticInnerClasses); + return Collections.unmodifiableSet(this.getCurrentState().syntheticInnerClasses); } /** @@ -498,7 +589,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @return mixin interfaces */ public Set getInterfaces() { - return this.interfaces; + return this.getCurrentState().interfaces; } /** @@ -545,8 +636,12 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param mixinBytes New bytecode */ void reloadMixin(byte[] mixinBytes) { - this.mixinBytes = mixinBytes; - this.validationClassNode = this.getClassNode(0); + if (this.uninitialisedState != null) { + throw new IllegalStateException("Cannot reload mixin while it is initialising"); + } + ReloadedState state = new ReloadedState(this.validationState, mixinBytes); + this.uninitialisedState = state; + this.validate(); } /* (non-Javadoc) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java new file mode 100644 index 00000000..c9ad46f6 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java @@ -0,0 +1,44 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer; + +/** + * An exception that occurs when a mixin reloads and does something it is + * normally allowed to do but isn't due to reloading restrictions. + */ +public class MixinReloadException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private final MixinInfo mixinInfo; + + public MixinReloadException(MixinInfo mixinInfo, String message) { + super(message); + this.mixinInfo = mixinInfo; + } + + public MixinInfo getMixinInfo() { + return this.mixinInfo; + } +} 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 5020cd9d..a86d11b1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -465,7 +465,7 @@ public class MixinTransformer extends TreeTransformer { throw new MixinApplyError("Cannot reload mixin if re-entrant lock entered"); } List targets = new ArrayList(); - for (MixinConfig config:this.configs) { + for (MixinConfig config : this.configs) { targets.addAll(config.reloadMixin(mixinClass, bytes)); } return targets; From bbdac72be56e89587c87616a1cb08c27759131ef Mon Sep 17 00:00:00 2001 From: BenLewis Date: Sat, 24 Oct 2015 09:07:41 +1300 Subject: [PATCH 018/169] Fixed false positive of changes to soft interfaces --- .../asm/mixin/transformer/InterfaceInfo.java | 22 +++++++++++++ .../asm/mixin/transformer/MixinInfo.java | 31 ++++++++++++------- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java index 1b3baaec..d51321db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java @@ -178,4 +178,26 @@ public class InterfaceInfo extends TreeInfo { return new InterfaceInfo(mixin, prefix, iface); } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + InterfaceInfo that = (InterfaceInfo) o; + + return this.mixin.equals(that.mixin) && this.prefix.equals(that.prefix) && this.iface.equals(that.iface); + } + + @Override + public int hashCode() { + int result = this.mixin.hashCode(); + result = 31 * result + this.prefix.hashCode(); + result = 31 * result + this.iface.hashCode(); + return result; + } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 140407e9..b21ffe91 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -76,7 +76,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { byte[] mixinBytes; /** - * All interfaces implemented by this mixin, including soft implementations + * All interfaces implemented by this mixin, including soft + * implementations */ final Set interfaces = new HashSet(); @@ -96,8 +97,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { final ClassInfo classInfo; /** - * True if the superclass of the mixin is not the direct superclass - * of one or more targets + * True if the superclass of the mixin is not the direct + * superclass of one or more targets */ boolean detachedSuper; @@ -134,6 +135,9 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } private class ReloadedState extends ValidationState { + /** + * The previous validation state to compare the changes to + */ final ValidationState parent; ReloadedState(ValidationState parent, byte[] mixinBytes) { @@ -141,6 +145,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { this.parent = parent; } + /** + * Validates that the changes are allowed to be made, these restrictions + * only exits while reloading mixins. + */ void validateChanges() { if (!this.syntheticInnerClasses.equals(this.parent.syntheticInnerClasses)) { throw new MixinReloadException(MixinInfo.this, "Cannot change inner classes"); @@ -216,12 +224,12 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { private final transient IMixinConfigPlugin plugin; /** - * Holds state that currently is not fully initialised + * Holds state that currently is not fully initialised or validated */ private transient ValidationState uninitialisedState; /** - * Holds state that can be reloaded + * Holds the current validated state */ private transient ValidationState validationState; @@ -375,7 +383,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * Performs pre-flight checks on the mixin * - * @param state ReloadableState to validate + * @param state State to validate */ private void validateMixin(ValidationState state) { // isInner (shouldn't) return true for static inner classes @@ -442,8 +450,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { for (InnerClassNode inner : state.validationClassNode.innerClasses) { ClassInfo innerClass = ClassInfo.forName(inner.name); if (innerClass.isSynthetic() && innerClass.isProbablyStatic()) { - if ((inner.outerName != null && inner.outerName.equals(state.classInfo.getName())) || - inner.name.startsWith(state.validationClassNode.name + "$")) { + if ((inner.outerName != null && inner.outerName.equals(state.classInfo.getName())) + || inner.name.startsWith(state.validationClassNode.name + "$")) { state.syntheticInnerClasses.add(inner.name); } else { throw new InvalidMixinException(this, "Unhandled synthetic inner class found: " + inner.name); @@ -453,8 +461,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } /** - * Current state, either the initialised state or the uninitialised state if - * it initialising for the first time. Should never return null. + * Current state, either the validated state or the uninitialised state if + * the mixin is initialising for the first time. Should never return null. */ private ValidationState getCurrentState() { if (this.validationState == null) { @@ -639,8 +647,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { if (this.uninitialisedState != null) { throw new IllegalStateException("Cannot reload mixin while it is initialising"); } - ReloadedState state = new ReloadedState(this.validationState, mixinBytes); - this.uninitialisedState = state; + this.uninitialisedState = new ReloadedState(this.validationState, mixinBytes); this.validate(); } From 61dd93eaa02b70b701b18ad930a5a18c760ab955 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Sun, 25 Oct 2015 07:38:08 +1300 Subject: [PATCH 019/169] Fixed formatting errors --- .../org/spongepowered/tools/agent/MixinAgent.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 64522bad..bb0e7ce3 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -65,11 +65,11 @@ public class MixinAgent implements IHotSwap { targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); } catch (MixinReloadException e) { MixinAgent.logger.error("mixin " + e.getMixinInfo() + " cannot be reloaded, needs a restart to be applied: " + e.getMessage()); - return ERROR_BYTECODE; + return MixinAgent.ERROR_BYTECODE; } catch (Throwable th) { // catch everything as otherwise it is ignored MixinAgent.logger.error("Error while finding targets for mixin " + className, th); - return ERROR_BYTECODE; + return MixinAgent.ERROR_BYTECODE; } for (String target : targets) { String targetName = target.replace('/', '.'); @@ -79,13 +79,13 @@ public class MixinAgent implements IHotSwap { byte[] targetBytecode = MixinAgent.classLoader.getOriginalTargetBytecode(targetName); if (targetBytecode == null) { MixinAgent.logger.error("Target class " + targetName + " hasn't registered its bytecode"); - return ERROR_BYTECODE; + return MixinAgent.ERROR_BYTECODE; } targetBytecode = MixinAgent.this.classTransformer.transform(null, targetName, targetBytecode); instrumentation.redefineClasses(new ClassDefinition(targetClass, targetBytecode)); } catch (Throwable th) { MixinAgent.logger.error("Error while re-transforming target class " + target, th); - return ERROR_BYTECODE; + return MixinAgent.ERROR_BYTECODE; } } return mixinBytecode; @@ -95,7 +95,7 @@ public class MixinAgent implements IHotSwap { return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); } catch (Throwable th) { MixinAgent.logger.error("Error while re-transforming class " + className, th); - return ERROR_BYTECODE; + return MixinAgent.ERROR_BYTECODE; } } } @@ -105,7 +105,7 @@ public class MixinAgent implements IHotSwap { * transformer this causes a class file format exception and indicates in * the ide that somethings went wrong. */ - public static byte[] ERROR_BYTECODE = new byte[]{1}; + public static final byte[] ERROR_BYTECODE = new byte[]{1}; /** * Class loader used to load mixin classes From 75f738cf28160f0d0950bcd7cf815754490e465b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 25 Oct 2015 01:37:03 +0100 Subject: [PATCH 020/169] Fix issue with arrays of primitive types in local variable tables --- .../org/spongepowered/asm/mixin/transformer/MixinVerifier.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java index c7869a82..99276ea1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java @@ -94,6 +94,9 @@ public class MixinVerifier extends SimpleVerifier { return false; } ClassInfo typeInfo = ClassInfo.forType(type); + if (typeInfo == null) { + return false; + } if (typeInfo.isInterface()) { typeInfo = ClassInfo.forName("java/lang/Object"); } From b86b843bb30bc25a464be3de478b9b3cd7e43f57 Mon Sep 17 00:00:00 2001 From: BenLewis Date: Sun, 25 Oct 2015 19:02:40 +1300 Subject: [PATCH 021/169] Fixed re-entrant error caused by both the launch classloader and the java agent trying to transform a class at the same time --- .../spongepowered/asm/mixin/transformer/MixinTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a86d11b1..4cd00bcf 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -374,7 +374,7 @@ public class MixinTransformer extends TreeTransformer { * #transform(java.lang.String, java.lang.String, byte[]) */ @Override - public byte[] transform(String name, String transformedName, byte[] basicClass) { + public synchronized byte[] transform(String name, String transformedName, byte[] basicClass) { if (basicClass == null || transformedName == null || this.errorState) { return basicClass; } From 960b215139a340be2976c07a4e6f270e2856dfaf Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Thu, 29 Oct 2015 16:39:39 -0500 Subject: [PATCH 022/169] Revert "Set debug regardless. This happens before FML sets deobfuscation." This reverts commit f3c4945019c0725b02df085ff745ffd3fd0b38e9. Revert "Always check isFMLDeobfuscated for null status." This reverts commit d12d3f271c9a499897bb8f1d5f01ca74b8e7ae3d. Revert "Perform nasty filter switch to gurarantee that we'll switch into INIT." This reverts commit bdda81fb265a56ab0262e9b71fd87f7f7441becb. --- .../asm/mixin/MixinEnvironment.java | 114 ++++++------------ .../mixin/transformer/MixinTransformer.java | 4 +- 2 files changed, 38 insertions(+), 80 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index ea2f47b3..57a43040 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -24,39 +24,40 @@ */ package org.spongepowered.asm.mixin; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; -import net.minecraft.launchwrapper.IClassNameTransformer; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; +import java.io.File; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.filter.AbstractFilter; import org.apache.logging.log4j.core.helpers.Booleans; -import org.apache.logging.log4j.message.Message; +import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.appender.AbstractAppender; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.asm.util.PrettyPrinter; -import java.io.File; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; + +import net.minecraft.launchwrapper.IClassNameTransformer; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; /** @@ -405,60 +406,28 @@ public class MixinEnvironment implements ITokenProvider { static class MixinLogger { - static MixinFilter filter = new MixinFilter(); + static MixinAppender appender = new MixinAppender("MixinLogger", null, null); public MixinLogger() { - // Prep ugly hack for INIT phase org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); - log.addFilter(filter); - log.setLevel(Level.DEBUG); + log.addAppender(appender); } - // Commence ugly hack for INIT phase - static class MixinFilter extends AbstractFilter { + static class MixinAppender extends AbstractAppender { - @Override - public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final String msg, - final Object... params) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg)) { - MixinEnvironment.gotoPhase(Phase.INIT); - } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; + protected MixinAppender(String name, Filter filter, Layout layout) { + super(name, filter, layout); + // TODO Auto-generated constructor stub } @Override - public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final Object msg, - final Throwable t) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg)) { + public void append(LogEvent event) { + if (event.getLevel() == Level.DEBUG && "Validating minecraft".equals(event.getMessage().getFormat())) { + // transition to INIT MixinEnvironment.gotoPhase(Phase.INIT); } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; - } - - @Override - public Result filter(final org.apache.logging.log4j.core.Logger logger, final Level level, final Marker marker, final Message msg, - final Throwable t) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(msg.getFormattedMessage())) { - MixinEnvironment.gotoPhase(Phase.INIT); - } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; - } - - @Override - public Result filter(final LogEvent event) { - if (MixinEnvironment.getCurrentPhase().equals(Phase.PREINIT) && "Validating minecraft".equals(event.getMessage().getFormattedMessage())) { - MixinEnvironment.gotoPhase(Phase.INIT); - } - // Log entries can be filtered before the blackboard has this value. We'll just look it up. - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - return isFMLDeobfuscated != null && isFMLDeobfuscated ? Result.NEUTRAL : Result.DENY; } + } } @@ -985,20 +954,9 @@ public class MixinEnvironment implements ITokenProvider { } if (phase == Phase.DEFAULT) { - // Remove filter + // remove appender org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); - for (Iterator iter = log.getFilters(); iter.hasNext();) { - final Filter filter = iter.next(); - if (filter instanceof MixinLogger.MixinFilter) { - final Boolean isFMLDeobfuscated = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - // If FML isn't in obfuscated environment, we need to hotswap the log level back - if (isFMLDeobfuscated != null && !isFMLDeobfuscated) { - log.setLevel(Level.INFO); - } - iter.remove(); - break; - } - } + log.removeAppender(MixinLogger.appender); } MixinEnvironment.currentPhase = phase; 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 4c5325c7..adcc3004 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -354,7 +354,7 @@ public class MixinTransformer extends TreeTransformer { boolean locked = this.lock.push().isSet(); MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); - + if (this.currentEnvironment != environment && !locked) { try { this.init(environment); @@ -363,7 +363,7 @@ public class MixinTransformer extends TreeTransformer { throw new RuntimeException(ex); } } - + try { SortedSet mixins = null; boolean invalidRef = false; From 65c103eb5a36fa3f863fb21659e714603bcf2947 Mon Sep 17 00:00:00 2001 From: Chris Sanders Date: Thu, 29 Oct 2015 18:53:09 -0500 Subject: [PATCH 023/169] Need to actually start the appender. Signed-off-by: Chris Sanders --- .../asm/mixin/MixinEnvironment.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 57a43040..123d57a5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -24,6 +24,27 @@ */ package org.spongepowered.asm.mixin; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; +import net.minecraft.launchwrapper.IClassNameTransformer; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.helpers.Booleans; +import org.spongepowered.asm.launch.MixinBootstrap; +import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; +import org.spongepowered.asm.mixin.transformer.MixinTransformer; +import org.spongepowered.asm.util.ITokenProvider; +import org.spongepowered.asm.util.PrettyPrinter; + import java.io.File; import java.io.Serializable; import java.lang.reflect.Method; @@ -36,29 +57,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.helpers.Booleans; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.appender.AbstractAppender; -import org.spongepowered.asm.launch.MixinBootstrap; -import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; -import org.spongepowered.asm.mixin.transformer.MixinTransformer; -import org.spongepowered.asm.util.ITokenProvider; -import org.spongepowered.asm.util.PrettyPrinter; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; - -import net.minecraft.launchwrapper.IClassNameTransformer; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; - /** * The mixin environment manages global state information for the mixin @@ -410,6 +408,7 @@ public class MixinEnvironment implements ITokenProvider { public MixinLogger() { org.apache.logging.log4j.core.Logger log = (org.apache.logging.log4j.core.Logger)LogManager.getLogger("FML"); + appender.start(); log.addAppender(appender); } From dc8461901332f69f519592e100f9f97f62181fee Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 2 Nov 2015 11:35:02 +0000 Subject: [PATCH 024/169] Checkstyle fixes --- .../org/spongepowered/asm/mixin/transformer/ClassInfo.java | 6 ++++-- .../asm/mixin/transformer/MixinTargetContext.java | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 14ee1f78..5c851ea6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -730,7 +730,8 @@ public class ClassInfo extends TreeInfo { * containing all methods for all interfaces implemented by this class and * all super interfaces of those interfaces. * - * @param includeMixins Whether to include methods from mixins targeting this class info + * @param includeMixins Whether to include methods from mixins targeting + * this class info * @return read-only view of class methods */ public Set getInterfaceMethods(boolean includeMixins) { @@ -758,7 +759,8 @@ public class ClassInfo extends TreeInfo { * interface methods to the supplied set * * @param methods Method set to add to - * @param includeMixins Whether to include methods from mixins targeting this class info + * @param includeMixins Whether to include methods from mixins targeting + * this class info * @return superclass reference, used to make the code above more fluent */ private ClassInfo addMethodsRecursive(Set methods, boolean includeMixins) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index c18799c0..4b66f66f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -373,9 +373,8 @@ public class MixinTargetContext implements IReferenceMapperContext { String desc = this.transformDescriptor(type); if (!type.toString().equals(desc)) { return Type.getType(desc); - } else { - return constant; } + return constant; } else if (constant instanceof Handle) { return this.transformHandle(method, iter, (Handle)constant); } From 13ac04cc88fe7465c406467540abe1c85da347d6 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 2 Nov 2015 11:46:10 +0000 Subject: [PATCH 025/169] Clean up unnecessary synthetics --- .../spongepowered/tools/agent/MixinAgent.java | 10 +++--- .../asm/mixin/transformer/MixinInfo.java | 33 ++++++++++++------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index bb0e7ce3..85132c6f 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -49,7 +49,7 @@ public class MixinAgent implements IHotSwap { * Class file transformer that re-transforms mixin's target classes if the * mixin has been redefined. */ - private class Transformer implements ClassFileTransformer { + class Transformer implements ClassFileTransformer { @Override public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain domain, byte[] classfileBuffer) @@ -110,14 +110,14 @@ public class MixinAgent implements IHotSwap { /** * Class loader used to load mixin classes */ - private static final MixinAgentClassLoader classLoader = new MixinAgentClassLoader(); + static final MixinAgentClassLoader classLoader = new MixinAgentClassLoader(); - private static final Logger logger = LogManager.getLogger("mixin.agent"); + static final Logger logger = LogManager.getLogger("mixin.agent"); /** * Instance used to register the transformer */ - private static Instrumentation instrumentation = null; + static Instrumentation instrumentation = null; /** * Instances of all agents @@ -127,7 +127,7 @@ public class MixinAgent implements IHotSwap { /** * MixinTransformer instance to use to transform the mixin's target classes */ - private final MixinTransformer classTransformer; + final MixinTransformer classTransformer; /** * Constructs an agent from a class transformer in which it will use to diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index b21ffe91..0a8b6c66 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -70,6 +70,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * State that can be reloaded. */ private class ValidationState { + /** * Mixin bytes (read once, generate tree on demand) */ @@ -135,14 +136,15 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } private class ReloadedState extends ValidationState { + /** * The previous validation state to compare the changes to */ - final ValidationState parent; + private final ValidationState previous; - ReloadedState(ValidationState parent, byte[] mixinBytes) { - super(mixinBytes, parent.classInfo); - this.parent = parent; + ReloadedState(ValidationState previous, byte[] mixinBytes) { + super(mixinBytes, previous.classInfo); + this.previous = previous; } /** @@ -150,21 +152,21 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * only exits while reloading mixins. */ void validateChanges() { - if (!this.syntheticInnerClasses.equals(this.parent.syntheticInnerClasses)) { + if (!this.syntheticInnerClasses.equals(this.previous.syntheticInnerClasses)) { throw new MixinReloadException(MixinInfo.this, "Cannot change inner classes"); } - if (!this.interfaces.equals(this.parent.interfaces)) { + if (!this.interfaces.equals(this.previous.interfaces)) { throw new MixinReloadException(MixinInfo.this, "Cannot change interfaces"); } - if (!new HashSet(this.softImplements).equals(new HashSet(this.parent.softImplements))) { + if (!new HashSet(this.softImplements).equals(new HashSet(this.previous.softImplements))) { throw new MixinReloadException(MixinInfo.this, "Cannot change soft interfaces"); } List targets = MixinInfo.this.readTargetClasses(this.validationClassNode, true); - if (!new HashSet(targets).equals(new HashSet(MixinInfo.this.targetClasses))) { + if (!new HashSet(targets).equals(new HashSet(MixinInfo.this.getTargets0()))) { throw new MixinReloadException(MixinInfo.this, "Cannot change target classes"); } int priority = MixinInfo.this.readPriority(this.validationClassNode); - if (priority != MixinInfo.this.priority) { + if (priority != MixinInfo.this.getPriority()) { throw new MixinReloadException(MixinInfo.this, "Cannot change mixin priority"); } } @@ -293,7 +295,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param suppressPlugin * @return */ - private List readTargetClasses(ClassNode classNode, boolean suppressPlugin) { + protected List readTargetClasses(ClassNode classNode, boolean suppressPlugin) { AnnotationNode mixin = ASMHelper.getInvisibleAnnotation(classNode, Mixin.class); if (mixin == null) { throw new InvalidMixinException(this, String.format("The mixin '%s' is missing an @Mixin annotation", this.className)); @@ -351,7 +353,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param classNode * @return */ - private int readPriority(ClassNode classNode) { + protected int readPriority(ClassNode classNode) { AnnotationNode mixin = ASMHelper.getInvisibleAnnotation(classNode, Mixin.class); if (mixin == null) { throw new InvalidMixinException(this, String.format("The mixin '%s' is missing an @Mixin annotation", this.className)); @@ -580,7 +582,14 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Get the target class list for this mixin */ public List getTargets() { - return Collections.unmodifiableList(this.targetClasses); + return Collections.unmodifiableList(this.getTargets0()); + } + + /** + * Internal method to avoid synthetic bridge generation + */ + protected List getTargets0() { + return this.targetClasses; } /** From 7eb61bc53a0937b2d2f6c1676d85882eeede17da Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 17 Nov 2015 15:53:31 +0000 Subject: [PATCH 026/169] Begin compatibility level support, java 8 must now be explicitly enabled --- .../tools/agent/MixinAgentClassLoader.java | 4 +- .../asm/launch/MixinLaunchAgentDefault.java | 6 + .../asm/launch/MixinTweaker.java | 17 ++ .../asm/mixin/MixinEnvironment.java | 152 ++++++++++++++---- .../mixin/transformer/MixinApplicator.java | 7 +- .../asm/mixin/transformer/MixinInfo.java | 32 ++-- .../mixin/transformer/MixinPreProcessor.java | 1 - .../mixin/transformer/MixinTargetContext.java | 35 ++++ .../spongepowered/asm/util/JavaVersion.java | 55 +++++++ 9 files changed, 258 insertions(+), 51 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/util/JavaVersion.java diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java index 5aa06541..5eaa2946 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java @@ -30,6 +30,7 @@ import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.MethodVisitor; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.mixin.MixinEnvironment; import java.util.HashMap; import java.util.Map; @@ -110,7 +111,8 @@ class MixinAgentClassLoader extends ClassLoader { */ private byte[] materialise(String name) { ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); - cw.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC, name.replace('.', '/'), null, Type.getInternalName(Object.class), null); + cw.visit(MixinEnvironment.getCompatibilityLevel().classVersion(), Opcodes.ACC_PUBLIC, name.replace('.', '/'), null, + Type.getInternalName(Object.class), null); // create init method MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "", "()V", null, null); diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java index ae3e978e..05afe077 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java @@ -37,6 +37,7 @@ public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { protected static final String MFATT_MIXINCONFIGS = "MixinConfigs"; protected static final String MFATT_TOKENPROVIDERS = "MixinTokenProviders"; protected static final String MFATT_MAINCLASS = "Main-Class"; + protected static final String MFATT_COMPATIBILITY = "MixinCompatibilityLevel"; public MixinLaunchAgentDefault(URI uri) { super(uri); @@ -44,6 +45,11 @@ public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { @Override public void prepare() { + String compatibilityLevel = this.attributes.get(MixinLaunchAgentDefault.MFATT_COMPATIBILITY); + if (compatibilityLevel != null) { + MixinTweaker.setCompatibilityLevel(compatibilityLevel); + } + String mixinConfigs = this.attributes.get(MixinLaunchAgentDefault.MFATT_MIXINCONFIGS); if (mixinConfigs != null) { for (String config : mixinConfigs.split(",")) { diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index eb6fbcbc..66677eaf 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -39,6 +39,7 @@ import net.minecraft.launchwrapper.LaunchClassLoader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; @@ -195,6 +196,22 @@ public class MixinTweaker implements ITweaker { public String[] getLaunchArguments() { return new String[]{}; } + + /** + * Set the desired compatibility level as a string, used by agents to set + * compatibility level from jar manifest + * + * @param level compatibility level as a string + */ + static void setCompatibilityLevel(String level) { + try { + CompatibilityLevel value = CompatibilityLevel.valueOf(level.toUpperCase()); + MixinTweaker.logger.debug("Setting mixin compatibility level: {}", value); + MixinEnvironment.setCompatibilityLevel(value); + } catch (IllegalArgumentException ex) { + MixinTweaker.logger.warn("Invalid compatibility level specified: {}", level); + } + } /** * Add a config from a jar manifest source or the command line. Supports diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index edabde12..b1294206 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -24,27 +24,6 @@ */ package org.spongepowered.asm.mixin; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; -import net.minecraft.launchwrapper.IClassNameTransformer; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; -import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.appender.AbstractAppender; -import org.apache.logging.log4j.core.helpers.Booleans; -import org.spongepowered.asm.launch.MixinBootstrap; -import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; -import org.spongepowered.asm.mixin.transformer.MixinTransformer; -import org.spongepowered.asm.util.ITokenProvider; -import org.spongepowered.asm.util.PrettyPrinter; - import java.io.File; import java.io.Serializable; import java.lang.reflect.Method; @@ -57,6 +36,31 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.launchwrapper.IClassNameTransformer; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.helpers.Booleans; +import org.spongepowered.asm.launch.MixinBootstrap; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; +import org.spongepowered.asm.mixin.transformer.MixinTransformer; +import org.spongepowered.asm.util.ITokenProvider; +import org.spongepowered.asm.util.JavaVersion; +import org.spongepowered.asm.util.PrettyPrinter; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Sets; + /** * The mixin environment manages global state information for the mixin @@ -339,6 +343,58 @@ public class MixinEnvironment implements ITokenProvider { } } + /** + * Operational compatibility level for the mixin subsystem + */ + public static enum CompatibilityLevel { + + JAVA_6(Opcodes.V1_6, false), + + JAVA_7(Opcodes.V1_7, false) { + + @Override + boolean isSupported() { + return JavaVersion.current() >= 1.7; + } + + }, + + JAVA_8(Opcodes.V1_8, true) { + + @Override + boolean isSupported() { + return JavaVersion.current() >= 1.8; + } + + }; + + private final int classVersion; + + private final boolean resolveMethodsInInterfaces; + + private CompatibilityLevel(int classVersion, boolean resolveMethodsInInterfaces) { + this.classVersion = classVersion; + this.resolveMethodsInInterfaces = resolveMethodsInInterfaces; + } + + boolean isSupported() { + return true; + } + + public int classVersion() { + return this.classVersion; + } + + public boolean resolveMethodsInInterfaces() { + return this.resolveMethodsInInterfaces; + } + + public boolean isAtLeast(CompatibilityLevel level) { + return this.ordinal() >= level.ordinal(); + } + + } + /** * Tweaker used to notify the environment when we transition from preinit to * default @@ -461,6 +517,11 @@ public class MixinEnvironment implements ITokenProvider { */ private static Phase currentPhase = Phase.NOT_INITIALISED; + /** + * Current compatibility level + */ + private static CompatibilityLevel compatibility = CompatibilityLevel.JAVA_6; + /** * Show debug header info on first environment construction */ @@ -469,7 +530,7 @@ public class MixinEnvironment implements ITokenProvider { /** * Logger */ - private final Logger logger = LogManager.getLogger("mixin"); + private static final Logger logger = LogManager.getLogger("mixin"); /** * The phase for this environment @@ -553,13 +614,14 @@ public class MixinEnvironment implements ITokenProvider { private void printHeader(Object version) { Side side = this.getSide(); String codeSource = this.getCodeSource(); - this.logger.info("SpongePowered MIXIN Subsystem Version={} Source={} Env={}", version, codeSource, side); + MixinEnvironment.logger.info("SpongePowered MIXIN Subsystem Version={} Source={} Env={}", version, codeSource, side); if (this.getOption(Option.DEBUG_VERBOSE)) { PrettyPrinter printer = new PrettyPrinter(32); printer.add("SpongePowered MIXIN (Verbose debugging enabled)").centre().hr(); printer.add("%25s : %s", "Code source", codeSource); - printer.add("%25s : %s", "Internal Version", version).hr(); + printer.add("%25s : %s", "Internal Version", version); + printer.add("%25s : %s", "Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr(); for (Option option : Option.values()) { printer.add("%25s : %s%s", option.property, option.parent == null ? "" : " - ", this.getOption(option)); } @@ -640,7 +702,7 @@ public class MixinEnvironment implements ITokenProvider { IEnvironmentTokenProvider provider = providerClass.newInstance(); this.registerTokenProvider(provider); } catch (Throwable th) { - this.logger.error("Error instantiating " + providerName, th); + MixinEnvironment.logger.error("Error instantiating " + providerName, th); } } return this; @@ -656,7 +718,7 @@ public class MixinEnvironment implements ITokenProvider { if (provider != null && !this.tokenProviderClasses.contains(provider.getClass().getName())) { String providerName = provider.getClass().getName(); TokenProviderWrapper wrapper = new TokenProviderWrapper(provider, this); - this.logger.info("Adding new token provider {} to {}", providerName, this); + MixinEnvironment.logger.info("Adding new token provider {} to {}", providerName, this); this.tokenProviders.add(wrapper); this.tokenProviderClasses.add(providerName); Collections.sort(this.tokenProviders); @@ -847,7 +909,7 @@ public class MixinEnvironment implements ITokenProvider { * list just once per environment and cache the result. */ private void buildTransformerDelegationList() { - this.logger.debug("Rebuilding transformer delegation list:"); + MixinEnvironment.logger.debug("Rebuilding transformer delegation list:"); this.transformers = new ArrayList(); for (IClassTransformer transformer : Launch.classLoader.getTransformers()) { String transformerName = transformer.getClass().getName(); @@ -859,18 +921,18 @@ public class MixinEnvironment implements ITokenProvider { } } if (include && !transformerName.contains(MixinTransformer.class.getName())) { - this.logger.debug(" Adding: {}", transformerName); + MixinEnvironment.logger.debug(" Adding: {}", transformerName); this.transformers.add(transformer); } else { - this.logger.debug(" Excluding: {}", transformerName); + MixinEnvironment.logger.debug(" Excluding: {}", transformerName); } } - this.logger.debug("Transformer delegation list created with {} entries", this.transformers.size()); + MixinEnvironment.logger.debug("Transformer delegation list created with {} entries", this.transformers.size()); for (IClassTransformer transformer : Launch.classLoader.getTransformers()) { if (transformer instanceof IClassNameTransformer) { - this.logger.debug("Found name transformer: {}", transformer.getClass().getName()); + MixinEnvironment.logger.debug("Found name transformer: {}", transformer.getClass().getName()); this.nameTransformer = (IClassNameTransformer) transformer; } } @@ -904,7 +966,9 @@ public class MixinEnvironment implements ITokenProvider { if (MixinEnvironment.currentPhase == Phase.NOT_INITIALISED) { MixinEnvironment.currentPhase = phase; MixinEnvironment.getEnvironment(phase); - new MixinLogger(); + + @SuppressWarnings("unused") + MixinLogger logSpy = new MixinLogger(); } } @@ -943,6 +1007,30 @@ public class MixinEnvironment implements ITokenProvider { return MixinEnvironment.currentEnvironment; } + /** + * Get the current compatibility level + */ + public static CompatibilityLevel getCompatibilityLevel() { + return MixinEnvironment.compatibility; + } + + /** + * Set desired compatibility level for the entire environment + * + * @param level Level to set, ignored if less than the current level + * @throws IllegalArgumentException if the specified level is not supported + */ + public static void setCompatibilityLevel(CompatibilityLevel level) throws IllegalArgumentException { + if (level != MixinEnvironment.compatibility && level.isAtLeast(MixinEnvironment.compatibility)) { + if (!level.isSupported()) { + throw new IllegalArgumentException("The requested compatibility level " + level + " could not be set. Level is not supported"); + } + + MixinEnvironment.compatibility = level; + MixinEnvironment.logger.info("Compatibility level set to {}", level); + } + } + /** * Internal callback * diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 9ef1870b..c571d41b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -237,6 +237,7 @@ public class MixinApplicator { if (mixin.shouldSetSourceFile()) { this.targetClass.sourceFile = mixin.getSourceFile(); } + this.targetClass.version = Math.max(this.targetClass.version, mixin.getMinRequiredClassVersion()); } /** @@ -676,9 +677,9 @@ public class MixinApplicator { if (node instanceof JumpInsnNode) { throw new InvalidMixinException(mixin, "Unsupported opcode in initialiser"); } - AbstractInsnNode iThinkWereACloneNow = node.clone(labels); - ctor.instructions.insert(insn, iThinkWereACloneNow); - insn = iThinkWereACloneNow; + AbstractInsnNode imACloneNow = node.clone(labels); + ctor.instructions.insert(insn, imACloneNow); + insn = imACloneNow; } return; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 0a8b6c66..4b3dd05b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -107,18 +107,18 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Initial ClassNode created for mixin validation, not used for actual * application */ - ClassNode validationClassNode; + ClassNode classNode; ValidationState(byte[] mixinBytes, ClassInfo classInfo) { this.mixinBytes = mixinBytes; - this.validationClassNode = this.getClassNode(0); + this.classNode = this.getClassNode(0); this.classInfo = classInfo; } ValidationState(byte[] mixinBytes) { this.mixinBytes = mixinBytes; - this.validationClassNode = this.getClassNode(0); - this.classInfo = ClassInfo.fromClassNode(this.validationClassNode); + this.classNode = this.getClassNode(0); + this.classInfo = ClassInfo.fromClassNode(this.classNode); } /** @@ -161,11 +161,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { if (!new HashSet(this.softImplements).equals(new HashSet(this.previous.softImplements))) { throw new MixinReloadException(MixinInfo.this, "Cannot change soft interfaces"); } - List targets = MixinInfo.this.readTargetClasses(this.validationClassNode, true); + List targets = MixinInfo.this.readTargetClasses(this.classNode, true); if (!new HashSet(targets).equals(new HashSet(MixinInfo.this.getTargets0()))) { throw new MixinReloadException(MixinInfo.this, "Cannot change target classes"); } - int priority = MixinInfo.this.readPriority(this.validationClassNode); + int priority = MixinInfo.this.readPriority(this.classNode); if (priority != MixinInfo.this.getPriority()) { throw new MixinReloadException(MixinInfo.this, "Cannot change mixin priority"); } @@ -270,7 +270,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { void validate() { try { - ClassNode classNode = this.uninitialisedState.validationClassNode; + ClassNode classNode = this.uninitialisedState.classNode; this.uninitialisedState.detachedSuper = this.validateTargetClasses(classNode); this.validateMixin(this.uninitialisedState); this.readImplementations(this.uninitialisedState); @@ -280,7 +280,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } else { new MixinPreProcessor(this, classNode).prepare(); } - this.uninitialisedState.validationClassNode = null; + this.uninitialisedState.classNode = null; // the state is now fully initialised and validated this.validationState = this.uninitialisedState; } finally { @@ -392,14 +392,18 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { if (!state.classInfo.isProbablyStatic()) { throw new InvalidMixinException(this, "Inner class mixin must be declared static"); } + + if (state.classNode.version > MixinEnvironment.getCompatibilityLevel().classVersion()) { + throw new InvalidMixinException(this, "Unsupported mixin class version " + state.classNode.version); + } // Can't have remappable fields or methods on a multi-target mixin, because after obfuscation the fields will remap to conflicting names if (this.targetClasses.size() > 1) { - for (FieldNode field : state.validationClassNode.fields) { + for (FieldNode field : state.classNode.fields) { this.checkRemappable(Shadow.class, field.name, ASMHelper.getVisibleAnnotation(field, Shadow.class)); } - for (MethodNode method : state.validationClassNode.methods) { + for (MethodNode method : state.classNode.methods) { this.checkRemappable(Shadow.class, method.name, ASMHelper.getVisibleAnnotation(method, Shadow.class)); AnnotationNode overwrite = ASMHelper.getVisibleAnnotation(method, Overwrite.class); if (overwrite != null && ((method.access & Opcodes.ACC_STATIC) == 0 || (method.access & Opcodes.ACC_PUBLIC) == 0)) { @@ -420,9 +424,9 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Read and process any {@link Implements} annotations on the mixin */ private void readImplementations(ValidationState state) { - state.interfaces.addAll(state.validationClassNode.interfaces); + state.interfaces.addAll(state.classNode.interfaces); - AnnotationNode implementsAnnotation = ASMHelper.getInvisibleAnnotation(state.validationClassNode, Implements.class); + AnnotationNode implementsAnnotation = ASMHelper.getInvisibleAnnotation(state.classNode, Implements.class); if (implementsAnnotation == null) { return; } @@ -449,11 +453,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * config. */ private void readInnerClasses(ValidationState state) { - for (InnerClassNode inner : state.validationClassNode.innerClasses) { + for (InnerClassNode inner : state.classNode.innerClasses) { ClassInfo innerClass = ClassInfo.forName(inner.name); if (innerClass.isSynthetic() && innerClass.isProbablyStatic()) { if ((inner.outerName != null && inner.outerName.equals(state.classInfo.getName())) - || inner.name.startsWith(state.validationClassNode.name + "$")) { + || inner.name.startsWith(state.classNode.name + "$")) { state.syntheticInnerClasses.add(inner.name); } else { throw new InvalidMixinException(this, "Unhandled synthetic inner class found: " + inner.name); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 53a4c4aa..769da82d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -130,7 +130,6 @@ class MixinPreProcessor { MixinTargetContext createContextFor(ClassNode target) { this.prepare(); MixinTargetContext context = new MixinTargetContext(this.mixin, this.classNode, target); - target.version = Math.max(this.classNode.version, target.version); this.attach(context); return context; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 4b66f66f..51bd7c61 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -36,6 +36,8 @@ import org.spongepowered.asm.lib.Handle; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; +import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.SoftOverride; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; @@ -99,6 +101,12 @@ public class MixinTargetContext implements IReferenceMapperContext { * True if this mixin's superclass is detached from the target superclass */ private final boolean detachedSuper; + + /** + * Minimum class version required to apply this mixin, target class will be + * upgraded if the version is below this value + */ + private int minRequiredClassVersion = CompatibilityLevel.JAVA_6.classVersion(); /** * ctor @@ -114,6 +122,7 @@ public class MixinTargetContext implements IReferenceMapperContext { this.targetClassInfo = ClassInfo.forName(target.name); this.inheritsFromMixin = mixin.getClassInfo().hasMixinInHierarchy() || this.targetClassInfo.hasMixinTargetInHierarchy(); this.detachedSuper = !this.classNode.superName.equals(this.targetClass.superName); + this.requireVersion(classNode.version); } /** @@ -192,6 +201,13 @@ public class MixinTargetContext implements IReferenceMapperContext { public ClassInfo getTargetClassInfo() { return this.targetClassInfo; } + + /** + * Get the minimum required class version for this mixin + */ + public int getMinRequiredClassVersion() { + return this.minRequiredClassVersion; + } /** * Find the corresponding class type for the supplied mixin class in this @@ -352,6 +368,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param dynInsn Insn to transform */ private void transformInvokeDynamicNode(MethodNode method, Iterator iter, InvokeDynamicInsnNode dynInsn) { + this.requireVersion(Opcodes.V1_7); dynInsn.desc = this.transformMethodDescriptor(dynInsn.desc); dynInsn.bsm = this.transformHandle(method, iter, dynInsn.bsm); for (int i = 0; i < dynInsn.bsmArgs.length; i++) { @@ -608,6 +625,23 @@ public class MixinTargetContext implements IReferenceMapperContext { return target; } + /** + * Mark this mixin as requiring the specified class version in the context + * of the current target + * + * @param version version to require + */ + protected void requireVersion(int version) { + this.minRequiredClassVersion = Math.max(this.minRequiredClassVersion, version); + + // This validation is done on the mixin beforehand, however it's still + // possible that an upstream transformer can inject java 7 instructions + // without updating the class version. + if (version > MixinEnvironment.getCompatibilityLevel().classVersion()) { + throw new InvalidMixinException(this, "Unsupported mixin class version " + version); + } + } + /** * Get the mixin info for this mixin */ @@ -725,4 +759,5 @@ public class MixinTargetContext implements IReferenceMapperContext { public void postApply(String transformedName, ClassNode targetClass) { this.mixin.postApply(transformedName, targetClass); } + } diff --git a/src/main/java/org/spongepowered/asm/util/JavaVersion.java b/src/main/java/org/spongepowered/asm/util/JavaVersion.java new file mode 100644 index 00000000..342d6dfc --- /dev/null +++ b/src/main/java/org/spongepowered/asm/util/JavaVersion.java @@ -0,0 +1,55 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.util; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Small helper to resolve the current java version + */ +public abstract class JavaVersion { + + private static double current = 0.0; + + private JavaVersion() {} + + public static double current() { + if (JavaVersion.current == 0.0) { + JavaVersion.current = JavaVersion.resolveCurrentVersion(); + } + return JavaVersion.current; + } + + private static double resolveCurrentVersion() { + String version = System.getProperty("java.version"); + Matcher matcher = Pattern.compile("[0-9]+\\.[0-9]+").matcher(version); + if (matcher.find()) { + return Double.parseDouble(matcher.group()); + } + return 1.6; + } + +} From 8438e29533089a2bbad840d0ba3a2d0f579dd853 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 17 Nov 2015 15:53:59 +0000 Subject: [PATCH 027/169] Resolve methods in interfaces if supported? --- .../asm/mixin/transformer/ClassInfo.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 5c851ea6..1be6b324 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -43,6 +43,7 @@ import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.FrameNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.transformer.ClassInfo.Member.Type; import com.google.common.collect.ImmutableList; @@ -1202,6 +1203,16 @@ public class ClassInfo extends TreeInfo { } } } + + if (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces()) { + for (String implemented : this.interfaces) { + ClassInfo iface = ClassInfo.forName(implemented); + M member = iface.findInHierarchy(name, desc, true, traversal.next(), flags & ~ClassInfo.INCLUDE_PRIVATE, type); + if (member != null) { + return member; + } + } + } return null; } From e0e00da2762b7cfb31602bf5f5ed557e8e53cfbf Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 17 Nov 2015 15:54:42 +0000 Subject: [PATCH 028/169] Version bump to 0.4.7 --- gradle.properties | 2 +- src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a8b235bd..699cd8cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.6 +buildVersion=0.4.7 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index e48bcec4..e516137d 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.6"; + public static final String VERSION = "0.4.7"; /** * Blackboard key where the subsystem version will be stored to indicate From bd93ef2806557bd8b25b5f5e2509c8d9a81c3237 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 19 Nov 2015 02:05:41 +0000 Subject: [PATCH 029/169] Add mixed-in interfaces to target class metadata --- .../org/spongepowered/asm/mixin/transformer/MixinApplicator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index c571d41b..77d6fd19 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -224,6 +224,7 @@ public class MixinApplicator { for (String interfaceName : mixin.getInterfaces()) { if (!this.targetClass.interfaces.contains(interfaceName)) { this.targetClass.interfaces.add(interfaceName); + mixin.getTargetClassInfo().addInterface(interfaceName); } } } From 3a25ffa10fd2e459153133e52e98e58764d7881b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 19 Nov 2015 13:25:33 +0000 Subject: [PATCH 030/169] Collapse vestigial if --- .../asm/mixin/transformer/MixinApplicator.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 77d6fd19..1efe2b3f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -524,14 +524,12 @@ public class MixinApplicator { MethodNode ctor = null; for (MethodNode mixinMethod : mixin.getMethods()) { - if (Constants.INIT.equals(mixinMethod.name)) { - if (MixinApplicator.hasLineNumbers(mixinMethod)) { - if (ctor == null) { - ctor = mixinMethod; - } else { - // Not an error condition, just weird - this.logger.warn(String.format("Mixin %s has multiple constructors, %s was selected\n", mixin, ctor.desc)); - } + if (Constants.INIT.equals(mixinMethod.name) && MixinApplicator.hasLineNumbers(mixinMethod)) { + if (ctor == null) { + ctor = mixinMethod; + } else { + // Not an error condition, just weird + this.logger.warn(String.format("Mixin %s has multiple constructors, %s was selected\n", mixin, ctor.desc)); } } } From f32d67a23c7086cb79f24d03abdd474544180872 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 21 Nov 2015 02:20:16 +0000 Subject: [PATCH 031/169] Handle gaps in local variable table when failing over to surrogates --- .../asm/mixin/injection/callback/CallbackInjector.java | 4 ++-- .../org/spongepowered/asm/mixin/injection/struct/Target.java | 3 ++- src/main/java/org/spongepowered/asm/util/Locals.java | 3 ++- 3 files changed, 6 insertions(+), 4 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 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--; } } } From 237efbc625e5e3184509251858f8deca4d30b420 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 23 Nov 2015 12:33:12 +0000 Subject: [PATCH 032/169] Minor housekeeping --- .../spongepowered/tools/agent/MixinAgent.java | 75 ++++++++++++------- .../tools/agent/MixinAgentClassLoader.java | 4 +- .../asm/mixin/transformer/MixinInfo.java | 10 +-- 3 files changed, 54 insertions(+), 35 deletions(-) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 85132c6f..156a2252 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -57,39 +57,17 @@ public class MixinAgent implements IHotSwap { if (classBeingRedefined == null) { return null; } + byte[] mixinBytecode = MixinAgent.classLoader.getFakeMixinBytecode(classBeingRedefined); if (mixinBytecode != null) { - MixinAgent.logger.info("Redefining mixin " + className); - List targets; - try { - targets = MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); - } catch (MixinReloadException e) { - MixinAgent.logger.error("mixin " + e.getMixinInfo() + " cannot be reloaded, needs a restart to be applied: " + e.getMessage()); - return MixinAgent.ERROR_BYTECODE; - } catch (Throwable th) { - // catch everything as otherwise it is ignored - MixinAgent.logger.error("Error while finding targets for mixin " + className, th); + List targets = this.reloadMixin(className, classfileBuffer); + if (targets == null || !this.reApplyMixins(targets)) { return MixinAgent.ERROR_BYTECODE; } - for (String target : targets) { - String targetName = target.replace('/', '.'); - MixinAgent.logger.debug("Re-transforming target class " + target); - try { - Class targetClass = Launch.classLoader.findClass(targetName); - byte[] targetBytecode = MixinAgent.classLoader.getOriginalTargetBytecode(targetName); - if (targetBytecode == null) { - MixinAgent.logger.error("Target class " + targetName + " hasn't registered its bytecode"); - return MixinAgent.ERROR_BYTECODE; - } - targetBytecode = MixinAgent.this.classTransformer.transform(null, targetName, targetBytecode); - instrumentation.redefineClasses(new ClassDefinition(targetClass, targetBytecode)); - } catch (Throwable th) { - MixinAgent.logger.error("Error while re-transforming target class " + target, th); - return MixinAgent.ERROR_BYTECODE; - } - } + return mixinBytecode; } + try { MixinAgent.logger.info("Redefining class " + className); return MixinAgent.this.classTransformer.transform(null, className, classfileBuffer); @@ -98,6 +76,47 @@ public class MixinAgent implements IHotSwap { return MixinAgent.ERROR_BYTECODE; } } + + private List reloadMixin(String className, byte[] classfileBuffer) { + MixinAgent.logger.info("Redefining mixin {}", className); + try { + return MixinAgent.this.classTransformer.reload(className.replace('/', '.'), classfileBuffer); + } catch (MixinReloadException e) { + MixinAgent.logger.error("Mixin {} cannot be reloaded, needs a restart to be applied: {} ", e.getMixinInfo(), e.getMessage()); + } catch (Throwable th) { + // catch everything as otherwise it is ignored + MixinAgent.logger.error("Error while finding targets for mixin " + className, th); + } + return null; + } + + /** + * Re-apply all mixins to the supplied list of target classes. + * + * @param targets Target classes to re-transform + * @return true if all targets were transformed, false if transformation + * failed + */ + private boolean reApplyMixins(List targets) { + for (String target : targets) { + String targetName = target.replace('/', '.'); + MixinAgent.logger.debug("Re-transforming target class {}", target); + try { + Class targetClass = Launch.classLoader.findClass(targetName); + byte[] targetBytecode = MixinAgent.classLoader.getOriginalTargetBytecode(targetName); + if (targetBytecode == null) { + MixinAgent.logger.error("Target class {} bytecode is not registered", targetName); + return false; + } + targetBytecode = MixinAgent.this.classTransformer.transform(null, targetName, targetBytecode); + MixinAgent.instrumentation.redefineClasses(new ClassDefinition(targetClass, targetBytecode)); + } catch (Throwable th) { + MixinAgent.logger.error("Error while re-transforming target class " + target, th); + return false; + } + } + return true; + } } /** @@ -169,7 +188,7 @@ public class MixinAgent implements IHotSwap { if (!MixinAgent.instrumentation.isRedefineClassesSupported()) { MixinAgent.logger.error("The instrumentation doesn't support re-definition of classes"); } - for (MixinAgent agent:agents) { + for (MixinAgent agent : MixinAgent.agents) { agent.initTransformer(); } } diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java index 5eaa2946..eb9ea2fc 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java @@ -60,7 +60,7 @@ class MixinAgentClassLoader extends ClassLoader { * @param name Name of the fake class */ void addMixinClass(String name) { - MixinAgentClassLoader.logger.debug("Mixin class " + name + " added to class loader"); + MixinAgentClassLoader.logger.debug("Mixin class {} added to class loader", name); try { byte[] bytes = this.materialise(name); Class clazz = this.defineClass(name, bytes, 0, bytes.length); @@ -69,7 +69,7 @@ class MixinAgentClassLoader extends ClassLoader { clazz.newInstance(); this.mixins.put(clazz, bytes); } catch (Throwable e) { - logger.catching(e); + MixinAgentClassLoader.logger.catching(e); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 4b3dd05b..9ce92e85 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -225,6 +225,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private final transient IMixinConfigPlugin plugin; + /** + * The environment phase in which this mixin was initialised + */ + private final transient Phase phase; + /** * Holds state that currently is not fully initialised or validated */ @@ -235,11 +240,6 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private transient ValidationState validationState; - /** - * The environment phase in which this mixin was initialised - */ - private final transient Phase phase; - /** * Internal ctor, called by {@link MixinConfig} * From c804069f5c3577192cfe295f9dbdbcbd6b36993f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 23 Nov 2015 22:57:01 +0000 Subject: [PATCH 033/169] Rethrow spurious NPE as something more meaningful --- .../org/spongepowered/asm/mixin/transformer/ClassInfo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 1be6b324..3ab1a80b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -1207,6 +1207,9 @@ public class ClassInfo extends TreeInfo { if (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces()) { for (String implemented : this.interfaces) { ClassInfo iface = ClassInfo.forName(implemented); + if (iface == null) { + throw new RuntimeException(new ClassNotFoundException(implemented)); + } M member = iface.findInHierarchy(name, desc, true, traversal.next(), flags & ~ClassInfo.INCLUDE_PRIVATE, type); if (member != null) { return member; From 1d3a5345e968cba6c9c3988ca8eb2b0312da065d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 23 Nov 2015 22:57:43 +0000 Subject: [PATCH 034/169] Add some simple validation (idiot checking) to MemberInfo --- .../tools/obfuscation/AnnotatedMixin.java | 13 ++++ .../asm/launch/MixinTweakContainer.java | 2 +- .../mixin/injection/struct/InjectionInfo.java | 2 +- .../injection/struct/InjectionPointData.java | 4 +- .../InvalidMemberDescriptorException.java | 43 ++++++++++++ .../mixin/injection/struct/MemberInfo.java | 68 +++++++++++++++++++ 6 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 656a8ff0..7e154ffb 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -47,6 +47,7 @@ import javax.tools.Diagnostic.Kind; import net.minecraftforge.srg2source.rangeapplier.MethodData; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.util.Constants; import org.spongepowered.asm.util.ConstraintParser; @@ -497,6 +498,12 @@ class AnnotatedMixin { if (targetMember.name == null) { return; } + + try { + targetMember.validate(); + } catch (InvalidMemberDescriptorException ex) { + this.mixins.printMessage(Kind.ERROR, ex.getMessage(), method, inject); + } if (targetMember.desc != null) { this.validateReferencedTarget(method, inject, targetMember, "@Inject"); @@ -562,6 +569,12 @@ class AnnotatedMixin { return; } + try { + targetMember.validate(); + } catch (InvalidMemberDescriptorException ex) { + this.mixins.printMessage(Kind.ERROR, ex.getMessage(), element, inject); + } + MemberInfo remappedReference = null; if (targetMember.isField()) { String obfField = this.mixins.getObfField(targetMember.toSrg()); diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java index a5809cb6..d140042a 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java @@ -34,7 +34,7 @@ import net.minecraft.launchwrapper.LaunchClassLoader; /** - * A collection of {@link IMixinLaunchAgent launch agents) + * A collection of {@link IMixinLaunchAgent} launch agents) */ public class MixinTweakContainer { 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 3170d598..a3880925 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 @@ -139,7 +139,7 @@ public abstract class InjectionInfo { throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " is missing 'at' value(s)"); } - MemberInfo targetMember = MemberInfo.parse(method, this.mixin); + MemberInfo targetMember = MemberInfo.parseAndValidate(method, this.mixin); if (targetMember.owner != null && !targetMember.owner.equals(this.mixin.getTargetClassRef())) { throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " specifies a target class '" diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java index 57222c07..ffd148ae 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java @@ -102,7 +102,7 @@ public class InjectionPointData { } public MemberInfo get(String key) { - return MemberInfo.parse(this.get(key, ""), this.mixin); + return MemberInfo.parseAndValidate(this.get(key, ""), this.mixin); } private int parseInt(String string, int defaultValue) { @@ -122,7 +122,7 @@ public class InjectionPointData { } public MemberInfo getTarget() { - return MemberInfo.parse(this.target, this.mixin); + return MemberInfo.parseAndValidate(this.target, this.mixin); } public int getOrdinal() { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java new file mode 100644 index 00000000..3b01deb4 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java @@ -0,0 +1,43 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.struct; + +public class InvalidMemberDescriptorException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public InvalidMemberDescriptorException(String message) { + super(message); + } + + public InvalidMemberDescriptorException(Throwable cause) { + super(cause); + } + + public InvalidMemberDescriptorException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 2019777f..943827f8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -26,6 +26,7 @@ package org.spongepowered.asm.mixin.injection.struct; import net.minecraftforge.srg2source.rangeapplier.MethodData; +import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; @@ -257,6 +258,50 @@ public class MemberInfo { public boolean isField() { return this.desc != null && !this.desc.startsWith("("); } + + /** + * Perform ultra-simple validation of the descriptor, checks that the parts + * of the descriptor are basically sane. + * + * @return fluent + * + * @throws InvalidMemberDescriptorException if any validation check fails + */ + public MemberInfo validate() throws InvalidMemberDescriptorException { + // Extremely naive class name validation, just to spot really egregious errors + if (this.owner != null && !this.owner.matches("(?i)^[\\w\\p{Sc}/]+$")) { + throw new InvalidMemberDescriptorException("Invalid owner: " + this.owner); + } + + // Also naive validation, we're looking for stupid errors here + if (this.name != null && !this.name.matches("(?i)^?$")) { + throw new InvalidMemberDescriptorException("Invalid name: " + this.name); + } + + if (this.desc != null) { + if (!this.desc.matches("^(\\([\\w\\[/;]*\\))?\\[?[\\w/;]+$")) { + throw new InvalidMemberDescriptorException("Invalid descriptor: " + this.desc); + } + if (this.isField()) { + if (!this.desc.equals(Type.getType(this.desc).getDescriptor())) { + throw new InvalidMemberDescriptorException("Invalid field type in descriptor: " + this.desc); + } + } else { + try { + Type.getArgumentTypes(this.desc); + } catch (Exception ex) { + throw new InvalidMemberDescriptorException("Invalid descriptor: " + this.desc); + } + + String retString = this.desc.substring(this.desc.indexOf(')') + 1); + if (!retString.equals(Type.getType(retString).getDescriptor())) { + throw new InvalidMemberDescriptorException("Invalid return type \"" + retString + "\" in descriptor: " + this.desc); + } + } + } + + return this; + } /** * Test whether this MemberInfo matches the supplied values. Null values are @@ -338,6 +383,27 @@ public class MemberInfo { return new MemberInfo(this, methodData, setOwner); } + /** + * Parse a MemberInfo from a string and perform validation + * + * @param string String to parse MemberInfo from + * @return parsed MemberInfo + */ + public static MemberInfo parseAndValidate(String string) throws InvalidMemberDescriptorException { + return MemberInfo.parse(string, null, null).validate(); + } + + /** + * Parse a MemberInfo from a string and perform validation + * + * @param string String to parse MemberInfo from + * @param context Context to use for reference mapping + * @return parsed MemberInfo + */ + public static MemberInfo parseAndValidate(String string, IReferenceMapperContext context) throws InvalidMemberDescriptorException { + return MemberInfo.parse(string, context.getReferenceMapper(), context.getClassRef()).validate(); + } + /** * Parse a MemberInfo from a string * @@ -371,6 +437,8 @@ public class MemberInfo { String desc = null; String owner = null; + name = name.replaceAll("\\s", ""); + if (refMapper != null) { name = refMapper.remap(mixinClass, name); } From 6c59b7b7a6e6b5f5a85e81e23ecd6953249b6f60 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 23 Nov 2015 22:57:59 +0000 Subject: [PATCH 035/169] Have AP report Java 8 support --- .../tools/obfuscation/MixinProcessor.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java index 880d1290..9d899129 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java @@ -27,6 +27,7 @@ package org.spongepowered.tools.obfuscation; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; @@ -70,4 +71,15 @@ public abstract class MixinProcessor extends AbstractProcessor { this.mixins.onPassCompleted(); } + @Override + public SourceVersion getSupportedSourceVersion() { + try { + return SourceVersion.valueOf("RELEASE_8"); + } catch (IllegalArgumentException ex) { + // Java 8 not supported + } + + return super.getSupportedSourceVersion(); + } + } From 650a753af795e7c2592c6ab450ae0aa722b7a7fd Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 24 Nov 2015 01:45:05 +0000 Subject: [PATCH 036/169] Descriptors can have currency symbols too --- .../spongepowered/asm/mixin/injection/struct/MemberInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 943827f8..d5c3f40e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -279,7 +279,7 @@ public class MemberInfo { } if (this.desc != null) { - if (!this.desc.matches("^(\\([\\w\\[/;]*\\))?\\[?[\\w/;]+$")) { + if (!this.desc.matches("^(\\([\\w\\p{Sc}\\[/;]*\\))?\\[?[\\w\\p{Sc}/;]+$")) { throw new InvalidMemberDescriptorException("Invalid descriptor: " + this.desc); } if (this.isField()) { From 6322cffe8b561d2eb8c7c3c02ee32390bedf6ecc Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 24 Nov 2015 12:30:19 +0000 Subject: [PATCH 037/169] Fix off-by-n error in Locals --- src/main/java/org/spongepowered/asm/util/Locals.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index 04dc4323..f9ad8b31 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -71,7 +71,6 @@ public class Locals { * @param pos Start position */ public static void loadLocals(Type[] locals, InsnList insns, int pos, int limit) { - limit += pos; for (; pos < locals.length && limit > 0; pos++) { if (locals[pos] != null) { insns.add(new VarInsnNode(locals[pos].getOpcode(Opcodes.ILOAD), pos)); From 519b9c6da12472c395907a37f6117b8cc55b64ac Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 24 Nov 2015 13:08:27 +0000 Subject: [PATCH 038/169] Fix stack calculation error in RedirectInjector when capturing args --- .../asm/mixin/injection/invoke/RedirectInjector.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index 0a0675d7..f17302db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -97,9 +97,12 @@ public class RedirectInjector extends InvokeInjector { InsnList insns = new InsnList(); int extraLocals = ASMHelper.getArgsSize(stackVars) + 1; + int extraStack = 1; // Normally only need 1 extra stack pos to store target ref int[] argMap = this.storeArgs(target, stackVars, insns, 0); if (injectTargetParams) { - extraLocals += ASMHelper.getArgsSize(target.arguments); + int argSize = ASMHelper.getArgsSize(target.arguments); + extraLocals += argSize; + extraStack += argSize; argMap = Ints.concat(argMap, target.argIndices); } this.invokeHandlerWithArgs(this.methodArgs, insns, argMap); @@ -107,6 +110,6 @@ public class RedirectInjector extends InvokeInjector { target.insns.insertBefore(node, insns); target.insns.remove(node); target.addToLocals(extraLocals); - target.addToStack(1); + target.addToStack(extraStack); } } From 6fa0432fccec3b0a28248384f21083f62eca7120 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 24 Nov 2015 14:06:32 +0000 Subject: [PATCH 039/169] Use implementing class in static binding when resolving default methods --- .../asm/mixin/transformer/ClassInfo.java | 34 +++++++++++++++++-- .../mixin/transformer/MixinTargetContext.java | 2 +- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 3ab1a80b..3ac64fa6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -245,6 +245,10 @@ public class ClassInfo extends TreeInfo { // Abstract because this has to be static in order to contain the enum public abstract ClassInfo getOwner(); + + public ClassInfo getImplementor() { + return this.getOwner(); + } public int getAccess() { return this.modifiers; @@ -352,6 +356,31 @@ public class ClassInfo extends TreeInfo { return super.equals(obj); } } + + /** + * A method resolved in an interface via a class, return the member + * wrapped so that the implementing class can be retrieved. + */ + public class InterfaceMethod extends Method { + + private final ClassInfo owner; + + public InterfaceMethod(Member member) { + super(member); + this.owner = member.getOwner(); + } + + @Override + public ClassInfo getOwner() { + return this.owner; + } + + @Override + public ClassInfo getImplementor() { + return ClassInfo.this; + } + + } /** * A field @@ -1177,6 +1206,7 @@ public class ClassInfo extends TreeInfo { * @param type Type of member to search for (field or method) * @return the discovered member or null if the member could not be resolved */ + @SuppressWarnings("unchecked") private M findInHierarchy(String name, String desc, boolean includeThisClass, Traversal traversal, int flags, Type type) { if (includeThisClass) { M member = this.findMember(name, desc, flags, type); @@ -1204,7 +1234,7 @@ public class ClassInfo extends TreeInfo { } } - if (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces()) { + if (type == Type.METHOD && (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces())) { for (String implemented : this.interfaces) { ClassInfo iface = ClassInfo.forName(implemented); if (iface == null) { @@ -1212,7 +1242,7 @@ public class ClassInfo extends TreeInfo { } M member = iface.findInHierarchy(name, desc, true, traversal.next(), flags & ~ClassInfo.INCLUDE_PRIVATE, type); if (member != null) { - return member; + return this.isInterface ? member : (M)new InterfaceMethod(member); } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 51bd7c61..b8b54eff 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -498,7 +498,7 @@ public class MixinTargetContext implements IReferenceMapperContext { throw new InvalidMixinException(this, "Invalid " + methodRef + " in " + this + " resolved " + superMethod.getOwner() + " but is mixin."); } - methodRef.setOwner(superMethod.getOwner().getName()); + methodRef.setOwner(superMethod.getImplementor().getName()); } else if (ClassInfo.forName(methodRef.getOwner()).isMixin()) { throw new MixinTransformerError("Error resolving " + methodRef + " in " + this); } From 34dab7d1d57d02fcd1bf59f0d2235ea035e1b4b2 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 25 Nov 2015 00:41:45 +0000 Subject: [PATCH 040/169] Validate against raw types when validating super because mirror sucks --- .../org/spongepowered/tools/MirrorUtils.java | 17 +++++++++++++++++ .../obfuscation/validation/TargetValidator.java | 9 +++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/MirrorUtils.java b/src/ap/java/org/spongepowered/tools/MirrorUtils.java index fff3cf40..937d2b01 100644 --- a/src/ap/java/org/spongepowered/tools/MirrorUtils.java +++ b/src/ap/java/org/spongepowered/tools/MirrorUtils.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -204,4 +205,20 @@ public abstract class MirrorUtils { } return reference.toString(); } + + public static boolean isAssignable(ProcessingEnvironment processingEnv, TypeMirror targetType, TypeMirror superClass) { + boolean assignable = processingEnv.getTypeUtils().isAssignable(targetType, superClass); + if (!assignable && targetType instanceof DeclaredType && superClass instanceof DeclaredType) { + TypeMirror rawTargetType = MirrorUtils.toRawType(processingEnv, (DeclaredType)targetType); + TypeMirror rawSuperType = MirrorUtils.toRawType(processingEnv, (DeclaredType)superClass); + return processingEnv.getTypeUtils().isAssignable(rawTargetType, rawSuperType); + } + + return assignable; + } + + private static TypeMirror toRawType(ProcessingEnvironment processingEnv, DeclaredType targetType) { + return processingEnv.getElementUtils().getTypeElement(((TypeElement)targetType.asElement()).getQualifiedName()).asType(); + } + } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java index 06bb658e..3fc429fd 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java @@ -34,6 +34,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; +import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IOptionProvider; import org.spongepowered.tools.obfuscation.MixinValidator; import org.spongepowered.tools.obfuscation.TypeHandle; @@ -79,7 +80,7 @@ public class TargetValidator extends MixinValidator { } private boolean validateSuperClass(TypeMirror targetType, TypeMirror superClass) { - if (this.isAssignable(targetType, superClass)) { + if (MirrorUtils.isAssignable(this.processingEnv, targetType, superClass)) { return true; } @@ -106,15 +107,11 @@ public class TargetValidator extends MixinValidator { private boolean checkMixinsFor(TypeMirror targetType, TypeMirror superClass) { for (TypeMirror mixinType : this.getMixinsTargeting(targetType)) { - if (this.isAssignable(mixinType, superClass)) { + if (MirrorUtils.isAssignable(this.processingEnv, mixinType, superClass)) { return true; } } return false; } - - protected final boolean isAssignable(TypeMirror targetType, TypeMirror superClass) { - return this.processingEnv.getTypeUtils().isAssignable(targetType, superClass); - } } From 5814ea195775fa24d6efc52491a61994bd0facab Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 25 Nov 2015 15:07:26 +0000 Subject: [PATCH 041/169] Store target info between compiles to support cross-project supermixins --- .../tools/obfuscation/AnnotatedMixin.java | 13 + .../tools/obfuscation/AnnotatedMixins.java | 29 +- .../tools/obfuscation/TargetMap.java | 249 ++++++++++++++++++ .../tools/obfuscation/TypeHandle.java | 12 + .../tools/obfuscation/TypeReference.java | 114 ++++++++ 5 files changed, 411 insertions(+), 6 deletions(-) create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 7e154ffb..5425fde1 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -225,6 +225,11 @@ class AnnotatedMixin { */ private final TypeElement mixin; + /** + * Mixin class + */ + private final TypeHandle handle; + /** * Specified targets */ @@ -265,6 +270,7 @@ class AnnotatedMixin { this.annotation = MirrorUtils.getAnnotation(type, Mixin.class); this.mixins = mixins; this.mixin = type; + this.handle = new TypeHandle(type); this.classRef = type.getQualifiedName().toString().replace('.', '/'); TypeHandle primaryTarget = this.initTargets(); @@ -358,6 +364,13 @@ class AnnotatedMixin { return this.mixin; } + /** + * Get the type handle for the mixin class + */ + public TypeHandle getHandle() { + return this.handle; + } + /** * Get the mixin's targets */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 7b880e03..e8ded263 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -80,6 +80,8 @@ import net.minecraftforge.srg2source.rangeapplier.SrgContainer; */ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { + private static final String MAPID_SYSTEM_PROPERTY = "mixin.target.mapid"; + static enum CompilerEnvironment { /** * Default environment @@ -144,6 +146,11 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { */ private final Map tokenCache = new HashMap(); + /** + * Serialisable mixin target map + */ + private final TargetMap targets; + /** * SRG container for mcp->srg mappings */ @@ -167,6 +174,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { private AnnotatedMixins(ProcessingEnvironment processingEnv) { this.env = this.detectEnvironment(processingEnv); this.processingEnv = processingEnv; + this.targets = this.initTargetMap(); this.printMessage(Kind.NOTE, "SpongePowered Mixin Annotation Processor v" + MixinBootstrap.VERSION); @@ -182,6 +190,12 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { this.initTokenCache(this.getOption("tokens")); } + protected TargetMap initTargetMap() { + TargetMap targets = TargetMap.create(System.getProperty(AnnotatedMixins.MAPID_SYSTEM_PROPERTY)); + System.setProperty(AnnotatedMixins.MAPID_SYSTEM_PROPERTY, targets.getSessionId()); + return targets; + } + private void initTokenCache(String tokens) { if (tokens != null) { Pattern tokenPattern = Pattern.compile("^([A-Z0-9\\-_\\.]+)=([0-9]+)$"); @@ -384,6 +398,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { if (!this.mixins.containsKey(name)) { AnnotatedMixin mixin = new AnnotatedMixin(this, mixinType); + this.targets.registerTargets(mixin); mixin.runValidators(ValidationPass.EARLY, this.validators); this.mixins.put(name, mixin); this.mixinsForPass.add(mixin); @@ -411,12 +426,10 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { public Collection getMixinsTargeting(TypeElement targetType) { List minions = new ArrayList(); - for (AnnotatedMixin mixin : this.mixins.values()) { - for (TypeHandle mixinTarget : mixin.getTargets()) { - if (targetType.equals(mixinTarget.getElement())) { - minions.add(mixin.getMixin().asType()); - break; - } + for (TypeReference mixin : this.targets.getMixinsTargeting(targetType)) { + TypeHandle handle = mixin.getHandle(this.processingEnv); + if (handle != null) { + minions.add(handle.getType()); } } @@ -530,6 +543,10 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { * Called from each AP when a pass is completed */ public void onPassCompleted() { + if (!"true".equalsIgnoreCase(this.getOption("disableTargetExport"))) { + this.targets.write(true); + } + for (AnnotatedMixin mixin : this.mixinsForPass) { mixin.runValidators(ValidationPass.LATE, this.validators); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java new file mode 100644 index 00000000..188d006f --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java @@ -0,0 +1,249 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.lang.model.element.TypeElement; + +/** + * Serialisable map of classes to their associated mixins, used so that we can + * pass target information for supermixins from one compiler session to another + */ +public class TargetMap extends HashMap> { + + private static final long serialVersionUID = 1L; + + /** + * Session ID, used to identify the temp file + */ + private final String sessionId; + + /** + * Create a new TargetMap with a session ID based on the current system time + */ + private TargetMap() { + this(String.valueOf(System.currentTimeMillis())); + } + + /** + * Create a TargetMap with the specified session ID + * + * @param sessionId + */ + private TargetMap(String sessionId) { + this.sessionId = sessionId; + } + + /** + * Get the session ID + */ + public String getSessionId() { + return this.sessionId; + } + + /** + * Register target classes for the specified mixin + * + * @param mixin mixin to add targets for + */ + public void registerTargets(AnnotatedMixin mixin) { + this.registerTargets(mixin.getTargets(), mixin.getHandle()); + } + + /** + * Register target classes for the supplied mixin + * + * @param targets List of targets + * @param mixin Mixin class + */ + public void registerTargets(List targets, TypeHandle mixin) { + for (TypeHandle target : targets) { + this.addMixin(target, mixin); + } + } + + /** + * Register the specified mixin against the specified target + * + * @param target Target class + * @param mixin Mixin class + */ + public void addMixin(TypeHandle target, TypeHandle mixin) { + this.addMixin(target.getReference(), mixin.getReference()); + } + + /** + * Register the specified mixin against the specified target + * + * @param target Target class + * @param mixin Mixin class + */ + public void addMixin(TypeReference target, TypeReference mixin) { + Set mixins = this.getMixinsFor(target); + mixins.add(mixin); + } + + /** + * Get mixin classes which target the specified class + * + * @param target Target class + * @return Collection of mixins registered as targetting the specified class + */ + public Collection getMixinsTargeting(TypeElement target) { + return this.getMixinsTargeting(new TypeHandle(target)); + } + + /** + * Get mixin classes which target the specified class + * + * @param target Target class + * @return Collection of mixins registered as targetting the specified class + */ + public Collection getMixinsTargeting(TypeHandle target) { + return this.getMixinsTargeting(target.getReference()); + } + + /** + * Get mixin classes which target the specified class + * + * @param target Target class + * @return Collection of mixins registered as targetting the specified class + */ + public Collection getMixinsTargeting(TypeReference target) { + return Collections.unmodifiableCollection(this.getMixinsFor(target)); + } + + /** + * Get mixin set for specified class + * + * @param target Target class + * @return Set of mixins registered as targetting the specified class + */ + private Set getMixinsFor(TypeReference target) { + Set mixins = this.get(target); + if (mixins == null) { + mixins = new HashSet(); + this.put(target, mixins); + } + return mixins; + } + + /** + * Write this target map to temporary session file + * + * @param temp Set "delete on exit" for the file + */ + public void write(boolean temp) { + ObjectOutputStream oos = null; + FileOutputStream fout = null; + try { + File sessionFile = TargetMap.getSessionFile(this.sessionId); + if (temp) { + sessionFile.deleteOnExit(); + } + fout = new FileOutputStream(sessionFile, true); + oos = new ObjectOutputStream(fout); + oos.writeObject(this); + } catch (Exception ex) { + ex.printStackTrace(); + } finally { + if (oos != null) { + try { + oos.close(); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + } + } + + /** + * Attemp to deserialise a TargetMap from the specified file + * + * @param sessionFile File to read + * @return deserialised map or null if deserialisation failed + */ + private static TargetMap read(File sessionFile) { + ObjectInputStream objectinputstream = null; + FileInputStream streamIn = null; + try { + streamIn = new FileInputStream(sessionFile); + objectinputstream = new ObjectInputStream(streamIn); + TargetMap map = (TargetMap)objectinputstream.readObject(); + return map; + } catch (Exception e) { + e.printStackTrace(); + } finally { + if(objectinputstream != null){ + try { + objectinputstream .close(); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + } + return null; + } + + /** + * Create a TargetMap for the specified session id. Generate new map if + * the session id is invalid or the file cannot be read. Session ID can be + * null + * + * @param sessionId session to deserialise, can be null to create new + * session + * @return new TargetMap + */ + public static TargetMap create(String sessionId) { + if (sessionId != null) { + File sessionFile = TargetMap.getSessionFile(sessionId); + if (sessionFile.exists()) { + TargetMap map = TargetMap.read(sessionFile); + if (map != null) { + return map; + } + } + } + + return new TargetMap(); + } + + private static File getSessionFile(String sessionId) { + File tempDir = new File(System.getProperty("java.io.tmpdir")); + return new File(tempDir, String.format("mixin-targetdb-%s.tmp", sessionId)); + } +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java index 8950ae9c..90fa5725 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java @@ -63,6 +63,11 @@ public class TypeHandle { * Actual type element, this is null for inaccessible classes */ private final TypeElement element; + + /** + * Reference to this handle, for serialisation + */ + private TypeReference reference; /** * Ctor for imaginary elements, require the enclosing package and the FQ @@ -154,6 +159,13 @@ public class TypeHandle { public boolean isImaginary() { return this.element == null; } + + public TypeReference getReference() { + if (this.reference == null) { + this.reference = new TypeReference(this); + } + return this.reference; + } public String findDescriptor(MemberInfo memberInfo) { String desc = memberInfo.desc; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java new file mode 100644 index 00000000..c7d792d6 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java @@ -0,0 +1,114 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.io.Serializable; + +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.TypeElement; + +/** + * Soft wrapper for a {@link TypeHandle} so that we can serialise it + */ +public class TypeReference implements Serializable, Comparable { + + private static final long serialVersionUID = 1L; + + /** + * Class name, used to recreate the handle on the other side + */ + private final String name; + + /** + * Transient handle, not serialised, regenerated when required + */ + private transient TypeHandle handle; + + /** + * Create a new soft wrapper for the specified type handle + * + * @param handle handle to wrap + */ + public TypeReference(TypeHandle handle) { + this.name = handle.getName(); + this.handle = handle; + } + + /** + * Get the class name (internal format) + */ + public String getName() { + return this.name; + } + + /** + * Get the FQ class name (dotted format) + */ + public String getClassName() { + return this.name.replace('/', '.'); + } + + /** + * Fetch or attempt to generate the type handle + * + * @param processingEnv environment to create handle if it needs to be + * regenerated + * @return type handle + */ + public TypeHandle getHandle(ProcessingEnvironment processingEnv) { + if (this.handle == null) { + TypeElement element = processingEnv.getElementUtils().getTypeElement(getClassName()); + try { + this.handle = new TypeHandle(element); + } catch (Exception ex) { + // Class probably doesn't exist in scope :/ + ex.printStackTrace(); + } + } + + return this.handle; + } + + @Override + public String toString() { + return String.format("TypeReference[%s]", this.name); + } + + @Override + public int compareTo(TypeReference other) { + return other == null ? -1 : this.name.compareTo(other.name); + } + + @Override + public boolean equals(Object other) { + return other instanceof TypeReference && this.compareTo((TypeReference)other) == 0; + } + + @Override + public int hashCode() { + return this.name.hashCode(); + } + +} From 9bad1f5c970b19cdb3e9e748c4d9745c8ec62dac Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 26 Nov 2015 17:08:04 +0000 Subject: [PATCH 042/169] Don't raise no-obf error for @Inject if remappable ats exist, fixes #80 --- .../tools/obfuscation/AnnotatedMixin.java | 46 +++++--- .../tools/obfuscation/AnnotatedMixins.java | 20 +++- .../tools/obfuscation/TargetMap.java | 4 +- .../tools/obfuscation/TypeReference.java | 2 +- .../tools/obfuscation/struct/Message.java | 110 ++++++++++++++++++ 5 files changed, 156 insertions(+), 26 deletions(-) create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 5425fde1..401427bb 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -56,6 +56,7 @@ import org.spongepowered.asm.util.ConstraintViolationException; import org.spongepowered.asm.util.InvalidConstraintException; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IMixinValidator.ValidationPass; +import org.spongepowered.tools.obfuscation.struct.Message; /** @@ -504,12 +505,17 @@ class AnnotatedMixin { /** * Register a {@link org.spongepowered.asm.mixin.injection.Inject} method + * + * @param method Callback method + * @param inject Inject annotation + * @param remap + * @return */ - public void registerInjector(ExecutableElement method, AnnotationMirror inject, boolean remap) { + public Message registerInjector(ExecutableElement method, AnnotationMirror inject, boolean remap) { String originalReference = MirrorUtils.getAnnotationValue(inject, "method"); MemberInfo targetMember = MemberInfo.parse(originalReference); if (targetMember.name == null) { - return; + return null; } try { @@ -518,68 +524,71 @@ class AnnotatedMixin { this.mixins.printMessage(Kind.ERROR, ex.getMessage(), method, inject); } + String type = "@" + inject.getAnnotationType().asElement().getSimpleName() + ""; if (targetMember.desc != null) { - this.validateReferencedTarget(method, inject, targetMember, "@Inject"); + this.validateReferencedTarget(method, inject, targetMember, type); } - if (!remap || !this.validateSingleTarget("@Inject", method)) { - return; + if (!remap || !this.validateSingleTarget(type, method)) { + return null; } String desc = this.targetType.findDescriptor(targetMember); if (desc == null) { if (this.targetType.isImaginary()) { - this.mixins.printMessage(Kind.WARNING, "@Inject target requires method signature because enclosing type information is unavailable", + this.mixins.printMessage(Kind.WARNING, type + " target requires method signature because enclosing type information is unavailable", method, inject); } else if (!Constants.INIT.equals(targetMember.name)) { - this.mixins.printMessage(Kind.WARNING, "Unable to determine signature for @Inject target method", method, inject); + this.mixins.printMessage(Kind.WARNING, "Unable to determine signature for " + type + " target method", method, inject); } - return; + return null; } MethodData obfMethod = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + targetMember.name, desc)); if (obfMethod == null) { Kind error = Constants.INIT.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; - this.mixins.printMessage(error, "No obfuscation mapping for @Inject target " + targetMember.name, method, inject); - return; + return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); } String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); MemberInfo remappedReference = new MemberInfo(obfName, this.targetRef, obfMethod.sig, false); this.mixins.getReferenceMapper().addMapping(this.classRef, originalReference, remappedReference.toString()); + return null; } /** * Register a {@link org.spongepowered.asm.mixin.injection.At} annotation * and process the references */ - public void registerInjectionPoint(Element element, AnnotationMirror inject, AnnotationMirror at) { + public int registerInjectionPoint(Element element, AnnotationMirror inject, AnnotationMirror at) { if (!AnnotatedMixins.getRemapValue(at)) { - return; + return 0; } String type = MirrorUtils.getAnnotationValue(at, "value"); String target = MirrorUtils.getAnnotationValue(at, "target"); - this.remapReference(type + ".", target, element, inject, at); + int remapped = this.remapReference(type + ".", target, element, inject, at) ? 1 : 0; // Pattern for replacing references in args, not used yet // if ("SOMETYPE".equals(type)) { // Map args = AnnotatedMixin.getAtArgs(at); // this.remapReference(type + ".args[target]", args.get("target")); // } + + return remapped; } - private void remapReference(String key, String target, Element element, AnnotationMirror inject, AnnotationMirror at) { + private boolean remapReference(String key, String target, Element element, AnnotationMirror inject, AnnotationMirror at) { if (target == null) { - return; + return false; } MemberInfo targetMember = MemberInfo.parse(target); if (!targetMember.isFullyQualified()) { String missing = "missing " + (targetMember.owner == null ? (targetMember.desc == null ? "owner and signature" : "owner") : "signature"); this.mixins.printMessage(Kind.ERROR, "@At(" + key + ") is not fully qualified, " + missing, element, inject); - return; + return false; } try { @@ -593,7 +602,7 @@ class AnnotatedMixin { String obfField = this.mixins.getObfField(targetMember.toSrg()); if (obfField == null) { this.mixins.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); - return; + return false; } remappedReference = MemberInfo.fromSrgField(obfField, targetMember.desc); } else { @@ -602,12 +611,13 @@ class AnnotatedMixin { if (targetMember.owner == null || !targetMember.owner.startsWith("java/lang/")) { this.mixins.printMessage(Kind.WARNING, "Cannot find method mapping for @At(" + key + ") '" + target + "'", element, inject); } - return; + return false; } remappedReference = targetMember.remapUsing(obfMethod, false); } this.mixins.getReferenceMapper().addMapping(this.classRef, target, remappedReference.toString()); + return true; } /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index e8ded263..febeab46 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -65,6 +65,7 @@ import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IMixinValidator.ValidationPass; +import org.spongepowered.tools.obfuscation.struct.Message; import org.spongepowered.tools.obfuscation.validation.ParentValidator; import org.spongepowered.tools.obfuscation.validation.TargetValidator; @@ -497,12 +498,14 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { public void registerInjector(TypeElement mixinType, ExecutableElement method, AnnotationMirror inject) { AnnotatedMixin mixinClass = this.getMixin(mixinType); if (mixinClass == null) { - this.printMessage(Kind.ERROR, "Found @Inject annotation on a non-mixin method", method); + String type = "@" + inject.getAnnotationType().asElement().getSimpleName() + ""; + this.printMessage(Kind.ERROR, "Found " + type + " annotation on a non-mixin method", method); return; } boolean remap = this.shouldRemap(mixinClass, inject); - mixinClass.registerInjector(method, inject, remap); + Message errorMessage = mixinClass.registerInjector(method, inject, remap); + int remappedAts = 0; if (remap) { Object ats = MirrorUtils.getAnnotationValue(inject, "at"); @@ -514,21 +517,28 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { at = ((AnnotationValue)at).getValue(); } if (at instanceof AnnotationMirror) { - mixinClass.registerInjectionPoint(method, inject, (AnnotationMirror)at); + remappedAts += mixinClass.registerInjectionPoint(method, inject, (AnnotationMirror)at); } else { this.printMessage(Kind.WARNING, "No annotation mirror on " + at.getClass().getName()); } } } else if (ats instanceof AnnotationMirror) { - mixinClass.registerInjectionPoint(method, inject, (AnnotationMirror)ats); + remappedAts += mixinClass.registerInjectionPoint(method, inject, (AnnotationMirror)ats); } else if (ats instanceof AnnotationValue) { // Fix for JDT Object mirror = ((AnnotationValue)ats).getValue(); if (mirror instanceof AnnotationMirror) { - mixinClass.registerInjectionPoint(method, inject, (AnnotationMirror)mirror); + remappedAts += mixinClass.registerInjectionPoint(method, inject, (AnnotationMirror)mirror); } } } + + // The annotation was *not* marked as remap=false and failed so we + // checked for remappable @At annotations, if that failed as well then + // we raise the original error. + if (remappedAts == 0 && errorMessage != null) { + errorMessage.sendTo(this); + } } /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java index 188d006f..0e5c472a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java @@ -53,7 +53,7 @@ public class TargetMap extends HashMap> { private final String sessionId; /** - * Create a new TargetMap with a session ID based on the current system time + * Create a new TargetMap with a session ID based on the current system time */ private TargetMap() { this(String.valueOf(System.currentTimeMillis())); @@ -208,7 +208,7 @@ public class TargetMap extends HashMap> { } catch (Exception e) { e.printStackTrace(); } finally { - if(objectinputstream != null){ + if (objectinputstream != null) { try { objectinputstream .close(); } catch (IOException ex) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java index c7d792d6..9e14f807 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java @@ -79,7 +79,7 @@ public class TypeReference implements Serializable, Comparable { */ public TypeHandle getHandle(ProcessingEnvironment processingEnv) { if (this.handle == null) { - TypeElement element = processingEnv.getElementUtils().getTypeElement(getClassName()); + TypeElement element = processingEnv.getElementUtils().getTypeElement(this.getClassName()); try { this.handle = new TypeHandle(element); } catch (Exception ex) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java b/src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java new file mode 100644 index 00000000..4c67ce92 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java @@ -0,0 +1,110 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation.struct; + +import javax.annotation.processing.Messager; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.tools.Diagnostic; + +public class Message { + + private Diagnostic.Kind kind; + private CharSequence msg; + private final Element element; + private final AnnotationMirror annotation; + private final AnnotationValue value; + + public Message(Diagnostic.Kind kind, CharSequence msg) { + this(kind, msg, null, null, null); + } + + public Message(Diagnostic.Kind kind, CharSequence msg, Element element) { + this(kind, msg, element, null, null); + } + + public Message(Diagnostic.Kind kind, CharSequence msg, Element element, AnnotationMirror annotation) { + this(kind, msg, element, annotation, null); + } + + public Message(Diagnostic.Kind kind, CharSequence msg, Element element, AnnotationMirror annotation, AnnotationValue value) { + this.kind = kind; + this.msg = msg; + this.element = element; + this.annotation = annotation; + this.value = value; + } + + public Message sendTo(Messager messager) { + if (this.value != null) { + messager.printMessage(this.kind, this.msg, this.element, this.annotation, this.value); + } else if (this.annotation != null) { + messager.printMessage(this.kind, this.msg, this.element, this.annotation); + } else if (this.element != null) { + messager.printMessage(this.kind, this.msg, this.element); + } else { + messager.printMessage(this.kind, this.msg); + } + return this; + } + + + public Diagnostic.Kind getKind() { + return this.kind; + } + + + public Message setKind(Diagnostic.Kind kind) { + this.kind = kind; + return this; + } + + + public CharSequence getMsg() { + return this.msg; + } + + + public Message setMsg(CharSequence msg) { + this.msg = msg; + return this; + } + + + public Element getElement() { + return this.element; + } + + + public AnnotationMirror getAnnotation() { + return this.annotation; + } + + + public AnnotationValue getValue() { + return this.value; + } +} From bc4219660112e703b5b211418568583518033c80 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 3 Dec 2015 02:34:46 +0000 Subject: [PATCH 043/169] Minor fixes --- .../tools/obfuscation/AnnotatedMixin.java | 6 ++++-- .../obfuscation/InjectionObfuscationProcessor.java | 8 ++------ .../tools/obfuscation/MixinProcessor.java | 13 +++++++++++++ .../obfuscation/TargetObfuscationProcessor.java | 7 +------ .../asm/launch/MixinLaunchAgentFML.java | 3 +-- .../asm/launch/MixinTweakContainer.java | 7 ++++++- .../spongepowered/asm/mixin/MixinEnvironment.java | 2 +- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 401427bb..3083d2d4 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -550,8 +550,10 @@ class AnnotatedMixin { return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); } - String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); - MemberInfo remappedReference = new MemberInfo(obfName, this.targetRef, obfMethod.sig, false); + int slashPos = obfMethod.name.lastIndexOf('/'); + String obfName = obfMethod.name.substring(slashPos + 1); + String obfOwner = obfMethod.name.substring(0, slashPos); + MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); this.mixins.getReferenceMapper().addMapping(this.classRef, originalReference, remappedReference.toString()); return null; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java index e07acb5a..2dbd81ac 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java @@ -29,9 +29,6 @@ import java.util.Set; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedOptions; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -39,6 +36,7 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; +import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.Redirect; @@ -48,14 +46,12 @@ import org.spongepowered.tools.MirrorUtils; * Annotation processor which finds {@link Inject} and {@link At} annotations in * mixin classes and generates SRG mappings */ -@SupportedSourceVersion(SourceVersion.RELEASE_6) @SupportedAnnotationTypes({ "org.spongepowered.asm.mixin.injection.Inject", "org.spongepowered.asm.mixin.injection.ModifyArg", "org.spongepowered.asm.mixin.injection.Redirect", "org.spongepowered.asm.mixin.injection.At" }) -@SupportedOptions({ "reobfSrgFile", "outSrgFile", "outRefMapFile" }) public class InjectionObfuscationProcessor extends MixinProcessor { /* (non-Javadoc) @@ -66,7 +62,7 @@ public class InjectionObfuscationProcessor extends MixinProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { if (roundEnv.processingOver()) { - return false; + return true; } this.processMixins(roundEnv); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java index 9d899129..0184fdc8 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java @@ -24,6 +24,8 @@ */ package org.spongepowered.tools.obfuscation; +import java.util.Set; + import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; @@ -35,7 +37,13 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.Mixin; +import com.google.common.collect.ImmutableSet; + public abstract class MixinProcessor extends AbstractProcessor { + + private static final Set supportedOptions = ImmutableSet.of( + "reobfSrgFile", "outSrgFile", "outRefMapFile", "disableTargetValidator" + ); /** * Mixin info manager @@ -82,4 +90,9 @@ public abstract class MixinProcessor extends AbstractProcessor { return super.getSupportedSourceVersion(); } + @Override + public Set getSupportedOptions() { + return MixinProcessor.supportedOptions; + } + } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java index fdbd7ff3..53201a87 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java @@ -28,9 +28,6 @@ import java.util.Set; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedOptions; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -47,9 +44,7 @@ import org.spongepowered.tools.MirrorUtils; * Annotation processor which finds {@link Shadow} and {@link Overwrite} * annotations in mixin classes and generates SRG mappings */ -@SupportedSourceVersion(SourceVersion.RELEASE_6) @SupportedAnnotationTypes({ "org.spongepowered.asm.mixin.Mixin", "org.spongepowered.asm.mixin.Shadow", "org.spongepowered.asm.mixin.Overwrite" }) -@SupportedOptions({ "reobfSrgFile", "outSrgFile", "outRefMapFile", "disableTargetValidator" }) public class TargetObfuscationProcessor extends MixinProcessor { /* (non-Javadoc) @@ -60,7 +55,7 @@ public class TargetObfuscationProcessor extends MixinProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { if (roundEnv.processingOver()) { - return false; + return true; } this.processMixins(roundEnv); diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java index 099b0778..c39d1460 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java @@ -91,9 +91,8 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { return this.injectCorePlugin(); } catch (Exception ex) { - ex.printStackTrace(); + return null; } - return null; } /** diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java index d140042a..2bf79fa4 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java @@ -29,6 +29,9 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -46,6 +49,8 @@ public class MixinTweakContainer { MixinTweakContainer.agentClasses.add("org.spongepowered.asm.launch.MixinLaunchAgentDefault"); } + private final Logger logger = LogManager.getLogger("mixin"); + private final URI uri; private final List agents = new ArrayList(); @@ -61,7 +66,7 @@ public class MixinTweakContainer { IMixinLaunchAgent agent = ctor.newInstance(uri); this.agents.add(agent); } catch (Exception ex) { - ex.printStackTrace(); + this.logger.catching(ex); } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index b1294206..6973e578 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -211,7 +211,7 @@ public class MixinEnvironment implements ITokenProvider { return name; } - name = this.getSideName("com.mumfrey.liteloader.core.LiteLoader", "getEnvironmentType"); + name = this.getSideName("com.mumfrey.liteloader.launch.LiteLoaderTweaker", "getEnvironmentType"); if (name != null) { return name; } From 03744c86a097daba18b16e9ee5d347f7eb1ad473 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 4 Dec 2015 01:45:43 +0000 Subject: [PATCH 044/169] AP support for gradle plugin, version bump to 0.4.8 --- gradle.properties | 2 +- .../tools/obfuscation/AnnotatedMixin.java | 87 +++--- .../tools/obfuscation/AnnotatedMixins.java | 269 ++++++----------- .../obfuscation/ITypeHandleProvider.java | 31 ++ .../tools/obfuscation/MixinProcessor.java | 8 +- .../tools/obfuscation/ObfuscationData.java | 52 ++++ .../tools/obfuscation/ObfuscationType.java | 81 +++++ .../tools/obfuscation/SupportedOptions.java | 55 ++++ .../TargetObfuscationEnvironment.java | 279 ++++++++++++++++++ .../validation/TargetValidator.java | 3 +- .../asm/launch/MixinBootstrap.java | 2 +- 11 files changed, 635 insertions(+), 234 deletions(-) create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/ITypeHandleProvider.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java diff --git a/gradle.properties b/gradle.properties index 699cd8cc..71e0f17d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.7 +buildVersion=0.4.8 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 3083d2d4..a90eb314 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -259,12 +259,12 @@ class AnnotatedMixin { /** * Stored (ordered) field mappings */ - private final Set fieldMappings = new LinkedHashSet(); + private final Map> fieldMappings = new HashMap>(); /** * Stored (ordered) method mappings */ - private final Set methodMappings = new LinkedHashSet(); + private final Map> methodMappings = new HashMap>(); public AnnotatedMixin(AnnotatedMixins mixins, TypeElement type) { @@ -284,6 +284,11 @@ class AnnotatedMixin { } this.remap = AnnotatedMixins.getRemapValue(this.annotation) && this.targets.size() > 0; + + for (ObfuscationType obfType : ObfuscationType.values()) { + this.fieldMappings.put(obfType, new LinkedHashSet()); + this.methodMappings.put(obfType, new LinkedHashSet()); + } } AnnotatedMixin runValidators(ValidationPass pass, Collection validators) { @@ -389,15 +394,15 @@ class AnnotatedMixin { /** * Get stored field mappings */ - public Set getFieldMappings() { - return this.fieldMappings; + public Set getFieldMappings(ObfuscationType type) { + return this.fieldMappings.get(type); } /** * Get stored method mappings */ - public Set getMethodMappings() { - return this.methodMappings; + public Set getMethodMappings(ObfuscationType type) { + return this.methodMappings.get(type); } /** @@ -437,9 +442,9 @@ class AnnotatedMixin { String mcpName = method.getSimpleName().toString(); String mcpSignature = MirrorUtils.generateSignature(method); - MethodData obfMethod = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + mcpName, mcpSignature)); + ObfuscationData obfMethodData = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + mcpName, mcpSignature)); - if (obfMethod == null) { + if (obfMethodData.isEmpty()) { Kind error = Kind.ERROR; try { @@ -455,9 +460,12 @@ class AnnotatedMixin { this.mixins.printMessage(error, "No obfuscation mapping for @Overwrite method", method); return; } - - String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); - this.addMethodMapping(mcpName, obfName, mcpSignature, obfMethod.sig); + + for (ObfuscationType type : obfMethodData) { + MethodData obfMethod = obfMethodData.get(type); + String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); + this.addMethodMapping(type, mcpName, obfName, mcpSignature, obfMethod.sig); + } } /** @@ -471,14 +479,17 @@ class AnnotatedMixin { return; } - String obfField = this.mixins.getObfField(this.targetRef + "/" + name); + ObfuscationData obfFieldData = this.mixins.getObfField(this.targetRef + "/" + name); - if (obfField == null) { + if (obfFieldData.isEmpty()) { this.mixins.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow field", field, shadow); return; } - this.addFieldMapping(name.setObfuscatedName(obfField)); + for (ObfuscationType type : obfFieldData) { + String fieldName = obfFieldData.get(type); + this.addFieldMapping(type, name.setObfuscatedName(fieldName)); + } } /** @@ -493,14 +504,17 @@ class AnnotatedMixin { } String mcpSignature = MirrorUtils.generateSignature(method); - MethodData obfMethod = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + name, mcpSignature)); + ObfuscationData obfMethodData = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + name, mcpSignature)); - if (obfMethod == null) { + if (obfMethodData.isEmpty()) { this.mixins.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow method", method, shadow); return; } - this.addMethodMapping(name.setObfuscatedName(obfMethod.name), mcpSignature, obfMethod.sig); + for (ObfuscationType type : obfMethodData) { + MethodData obfMethod = obfMethodData.get(type); + this.addMethodMapping(type, name.setObfuscatedName(obfMethod.name), mcpSignature, obfMethod.sig); + } } /** @@ -544,18 +558,13 @@ class AnnotatedMixin { return null; } - MethodData obfMethod = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + targetMember.name, desc)); - if (obfMethod == null) { + ObfuscationData obfMethod = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + targetMember.name, desc)); + if (obfMethod.isEmpty()) { Kind error = Constants.INIT.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); } - int slashPos = obfMethod.name.lastIndexOf('/'); - String obfName = obfMethod.name.substring(slashPos + 1); - String obfOwner = obfMethod.name.substring(0, slashPos); - MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); - - this.mixins.getReferenceMapper().addMapping(this.classRef, originalReference, remappedReference.toString()); + this.mixins.addMethodMapping(this.classRef, originalReference, obfMethod); return null; } @@ -599,50 +608,46 @@ class AnnotatedMixin { this.mixins.printMessage(Kind.ERROR, ex.getMessage(), element, inject); } - MemberInfo remappedReference = null; if (targetMember.isField()) { - String obfField = this.mixins.getObfField(targetMember.toSrg()); - if (obfField == null) { + ObfuscationData obfFieldData = this.mixins.getObfField(targetMember.toSrg()); + if (obfFieldData.isEmpty()) { this.mixins.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); return false; } - remappedReference = MemberInfo.fromSrgField(obfField, targetMember.desc); + this.mixins.addFieldMapping(this.classRef, target, targetMember, obfFieldData); } else { - MethodData obfMethod = this.mixins.getObfMethod(targetMember); - if (obfMethod == null) { + ObfuscationData obfMethodData = this.mixins.getObfMethod(targetMember); + if (obfMethodData.isEmpty()) { if (targetMember.owner == null || !targetMember.owner.startsWith("java/lang/")) { this.mixins.printMessage(Kind.WARNING, "Cannot find method mapping for @At(" + key + ") '" + target + "'", element, inject); } - return false; } - remappedReference = targetMember.remapUsing(obfMethod, false); + this.mixins.addMethodMapping(this.classRef, target, targetMember, obfMethodData); } - - this.mixins.getReferenceMapper().addMapping(this.classRef, target, remappedReference.toString()); return true; } /** * Add a field mapping to the local table */ - private void addFieldMapping(ShadowElementName name) { + private void addFieldMapping(ObfuscationType type, ShadowElementName name) { String mapping = String.format("FD: %s %s", this.classRef + "/" + name.name(), this.classRef + "/" + name.obfuscated()); - this.fieldMappings.add(mapping); + this.fieldMappings.get(type).add(mapping); } /** * Add a method mapping to the local table */ - private void addMethodMapping(ShadowElementName name, String mcpSignature, String obfSignature) { - this.addMethodMapping(name.name(), name.obfuscated(), mcpSignature, obfSignature); + private void addMethodMapping(ObfuscationType type, ShadowElementName name, String mcpSignature, String obfSignature) { + this.addMethodMapping(type, name.name(), name.obfuscated(), mcpSignature, obfSignature); } /** * Add a method mapping to the local table */ - private void addMethodMapping(String mcpName, String obfName, String mcpSignature, String obfSignature) { + private void addMethodMapping(ObfuscationType type, String mcpName, String obfName, String mcpSignature, String obfSignature) { String mapping = String.format("MD: %s %s %s %s", this.classRef + "/" + mcpName, mcpSignature, this.classRef + "/" + obfName, obfSignature); - this.methodMappings.add(mapping); + this.methodMappings.get(type).add(mapping); } /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index febeab46..156d24f9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -24,18 +24,13 @@ */ package org.spongepowered.tools.obfuscation; -import java.io.File; -import java.io.IOException; import java.io.InputStream; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -50,7 +45,6 @@ import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.lang.model.util.Elements; import javax.tools.Diagnostic; @@ -61,7 +55,6 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IMixinValidator.ValidationPass; @@ -72,14 +65,13 @@ import org.spongepowered.tools.obfuscation.validation.TargetValidator; import com.google.common.collect.ImmutableList; import net.minecraftforge.srg2source.rangeapplier.MethodData; -import net.minecraftforge.srg2source.rangeapplier.SrgContainer; /** * Mixin info manager, stores all of the mixin info during processing and also * manages access to the srgs */ -class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { +class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITypeHandleProvider { private static final String MAPID_SYSTEM_PROPERTY = "mixin.target.mapid"; @@ -118,24 +110,9 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { private final List mixinsForPass = new ArrayList(); /** - * Name of the resource to write generated srgs to + * Target obfuscation environments */ - private final String outSrgFileName; - - /** - * Name of the resource to write remapped refs to - */ - private final String outRefMapFileName; - - /** - * File containing the reobfd srgs - */ - private final String reobfSrgFileName; - - /** - * Reference mapper for reference mapping - */ - private final ReferenceMapper refMapper = new ReferenceMapper(); + private final List targetEnvironments = new ArrayList(); /** * Rule validators @@ -152,17 +129,6 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { */ private final TargetMap targets; - /** - * SRG container for mcp->srg mappings - */ - private SrgContainer srgs; - - /** - * True once we've tried to initialise the srgs, initially false so that we - * can do srg init lazily - */ - private boolean initDone; - /** * Properties file used to specify options when AP options cannot be * configured via the build script (eg. when using AP with MCP) @@ -178,10 +144,12 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { this.targets = this.initTargetMap(); this.printMessage(Kind.NOTE, "SpongePowered Mixin Annotation Processor v" + MixinBootstrap.VERSION); - - this.reobfSrgFileName = this.getOption("reobfSrgFile"); - this.outSrgFileName = this.getOption("outSrgFile"); - this.outRefMapFileName = this.getOption("outRefMapFile"); + + for (ObfuscationType obfType : ObfuscationType.values()) { + if (obfType.isSupported(this)) { + this.targetEnvironments.add(new TargetObfuscationEnvironment(obfType, this, this, this)); + } + } this.validators = ImmutableList.of( new ParentValidator(processingEnv, this, this), @@ -267,123 +235,103 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { return CompilerEnvironment.JAVAC; } - /** - * Lazy initialisation for srgs, so that we only initialise the srgs if - * they're actually required. - */ - private boolean initSrgs() { - if (!this.initDone) { - this.initDone = true; - - if (this.reobfSrgFileName == null) { - this.printMessage(Kind.ERROR, "The reobfSrgFile argument was not supplied, obfuscation processing will not occur"); - return false; - } - - try { - File reobfSrgFile = new File(this.reobfSrgFileName); - this.printMessage(Kind.NOTE, "Loading SRGs from " + reobfSrgFile.getAbsolutePath()); - this.srgs = new SrgContainer().readSrg(reobfSrgFile); - } catch (Exception ex) { - ex.printStackTrace(); - this.printMessage(Kind.ERROR, "The specified SRG file could not be read, processing cannot continue"); - this.srgs = null; - } - } - - return this.srgs != null; - } - /** * Write out generated srgs */ public void writeSrgs() { - if (this.outSrgFileName == null) { - return; + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + targetEnv.writeSrgs(this.processingEnv.getFiler(), this.mixins); } - - Set fieldMappings = new LinkedHashSet(); - Set methodMappings = new LinkedHashSet(); - - for (AnnotatedMixin mixin : this.mixins.values()) { - fieldMappings.addAll(mixin.getFieldMappings()); - methodMappings.addAll(mixin.getMethodMappings()); - } - - PrintWriter writer = null; - - try { - writer = this.openFileWriter(this.outSrgFileName, "output SRGs"); - for (String fieldMapping : fieldMappings) { - writer.println(fieldMapping); - } - for (String methodMapping : methodMappings) { - writer.println(methodMapping); - } - } catch (IOException ex) { - ex.printStackTrace(); - } finally { - if (writer != null) { - try { - writer.close(); - } catch (Exception ex) { - // oh well - } - } - } - } - - /** - * Open a writer for an output file - */ - private PrintWriter openFileWriter(String fileName, String description) throws IOException { - if (fileName.matches("^.*[\\\\/:].*$")) { - File outSrgFile = new File(fileName); - outSrgFile.getParentFile().mkdirs(); - this.printMessage(Kind.NOTE, "Writing " + description + " to " + outSrgFile.getAbsolutePath()); - return new PrintWriter(outSrgFile); - } - - Filer filer = this.processingEnv.getFiler(); - FileObject outSrg = filer.createResource(StandardLocation.CLASS_OUTPUT, "", fileName); - this.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); - return new PrintWriter(outSrg.openWriter()); } /** * Write out stored mappings */ public void writeRefs() { - if (this.outRefMapFileName == null) { - return; + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + targetEnv.writeRefs(this.processingEnv.getFiler()); } + } + + public ObfuscationData getObfMethod(MemberInfo method) { + ObfuscationData data = new ObfuscationData(); - PrintWriter writer = null; - - try { - writer = this.openFileWriter(this.outRefMapFileName, "refmap"); - this.refMapper.write(writer); - } catch (IOException ex) { - ex.printStackTrace(); - } finally { - if (writer != null) { - try { - writer.close(); - } catch (Exception ex) { - // oh well - } + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = targetEnv.getObfMethod(method); + if (obfMethod != null) { + data.add(targetEnv.getType(), obfMethod); } } + return data; } /** - * Get the reference mapper + * Get an obfuscation mapping for a method */ - public ReferenceMapper getReferenceMapper() { - return this.refMapper; + public ObfuscationData getObfMethod(MethodData method) { + ObfuscationData data = new ObfuscationData(); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = targetEnv.getObfMethod(method); + if (obfMethod != null) { + data.add(targetEnv.getType(), obfMethod); + } + } + + return data; + } + + /** + * Get an obfuscation mapping for a field + */ + public ObfuscationData getObfField(String field) { + ObfuscationData data = new ObfuscationData(); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String obfField = targetEnv.getObfField(field); + if (obfField != null) { + data.add(targetEnv.getType(), obfField); + } + } + + return data; + } + + void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + if (obfMethod != null) { + int slashPos = obfMethod.name.lastIndexOf('/'); + String obfName = obfMethod.name.substring(slashPos + 1); + String obfOwner = obfMethod.name.substring(0, slashPos); + MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); + targetEnv.getReferenceMapper().addMapping(className, reference, remappedReference.toString()); + } + } } + void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + if (obfMethod != null) { + MemberInfo remappedReference = context.remapUsing(obfMethod, false); + targetEnv.getReferenceMapper().addMapping(className, reference, remappedReference.toString()); + } + } + } + + void addFieldMapping(String className, String reference, MemberInfo context, ObfuscationData obfFieldData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String obfField = obfFieldData.get(targetEnv.getType()); + if (obfField != null) { + MemberInfo remappedReference = MemberInfo.fromSrgField(obfField, context.desc); + String remapped = remappedReference.toString(); + targetEnv.getReferenceMapper().addMapping(className, reference, remapped); + } + } + } + /** * Clear all registered mixins */ @@ -553,7 +501,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { * Called from each AP when a pass is completed */ public void onPassCompleted() { - if (!"true".equalsIgnoreCase(this.getOption("disableTargetExport"))) { + if (!"true".equalsIgnoreCase(this.getOption(SupportedOptions.DISABLE_TARGET_EXPORT))) { this.targets.write(true); } @@ -618,6 +566,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { * Get a TypeHandle representing another type in the current processing * environment */ + @Override public TypeHandle getTypeHandle(String name) { name = name.replace('/', '.'); @@ -642,52 +591,6 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider { return null; } - - /** - * Get an obfuscation mapping for a method - */ - public MethodData getObfMethod(MemberInfo method) { - MethodData obfd = this.getObfMethod(method.asMethodData()); - if (obfd != null || !method.isFullyQualified()) { - return obfd; - } - - // Get a type handle for the declared method owner - TypeHandle type = this.getTypeHandle(method.owner); - if (type.isImaginary()) { - return null; - } - - // See if we can get the superclass from the reference - TypeMirror superClass = type.getElement().getSuperclass(); - if (superClass.getKind() != TypeKind.DECLARED) { - return null; - } - - // Well we found it, let's inflect the class name and recurse the search - String superClassName = ((TypeElement)((DeclaredType)superClass).asElement()).getQualifiedName().toString(); - return this.getObfMethod(new MemberInfo(method.name, superClassName.replace('.', '/'), method.desc, method.matchAll)); - } - - /** - * Get an obfuscation mapping for a method - */ - public MethodData getObfMethod(MethodData method) { - if (this.initSrgs()) { - return this.srgs.methodMap.get(method); - } - return null; - } - - /** - * Get an obfuscation mapping for a field - */ - public String getObfField(String field) { - if (this.initSrgs()) { - return this.srgs.fieldMap.get(field); - } - return null; - } /** * Get the mixin manager instance for this environment diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ITypeHandleProvider.java b/src/ap/java/org/spongepowered/tools/obfuscation/ITypeHandleProvider.java new file mode 100644 index 00000000..f885afb9 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ITypeHandleProvider.java @@ -0,0 +1,31 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +public interface ITypeHandleProvider { + + public abstract TypeHandle getTypeHandle(String name); + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java index 0184fdc8..77bb75d0 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java @@ -37,14 +37,8 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.Mixin; -import com.google.common.collect.ImmutableSet; - public abstract class MixinProcessor extends AbstractProcessor { - private static final Set supportedOptions = ImmutableSet.of( - "reobfSrgFile", "outSrgFile", "outRefMapFile", "disableTargetValidator" - ); - /** * Mixin info manager */ @@ -92,7 +86,7 @@ public abstract class MixinProcessor extends AbstractProcessor { @Override public Set getSupportedOptions() { - return MixinProcessor.supportedOptions; + return SupportedOptions.all; } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java new file mode 100644 index 00000000..370569d4 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java @@ -0,0 +1,52 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +public class ObfuscationData implements Iterable { + + private final Map data = new HashMap(); + + public void add(ObfuscationType type, T method) { + this.data.put(type, method); + } + + public boolean isEmpty() { + return this.data.isEmpty(); + } + + public T get(ObfuscationType type) { + return this.data.get(type); + } + + @Override + public Iterator iterator() { + return this.data.keySet().iterator(); + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java new file mode 100644 index 00000000..583802d6 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java @@ -0,0 +1,81 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +enum ObfuscationType { + + SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.OUT_SRG_SRG_FILE, SupportedOptions.OUT_SRG_REFMAP_FILE), + NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.OUT_NOTCH_SRG_FILE, SupportedOptions.OUT_NOTCH_REFMAP_FILE); + + private final String displayName; + private final String srgFileArgName; + private final String outSrgFileArgName; + private final String refmapArgName; + + private ObfuscationType(String displayName, String srgFileArgName, String outSrgFileArgName, String refmapArgName) { + this.displayName = displayName; + this.srgFileArgName = srgFileArgName; + this.outSrgFileArgName = outSrgFileArgName; + this.refmapArgName = refmapArgName; + } + + @Override + public String toString() { + return this.displayName; + } + + public String getDisplayName() { + return this.displayName; + } + + public String getSrgFileOption() { + return this.srgFileArgName; + } + + public String getOutputSrgFileOption() { + return this.outSrgFileArgName; + } + + public String getRefMapFileOption() { + return this.refmapArgName; + } + + public boolean isSupported(IOptionProvider options) { + return this.getSrgFileName(options) != null; + } + + public String getSrgFileName(IOptionProvider options) { + return options.getOption(this.srgFileArgName); + } + + public String getOutputSrgFileName(IOptionProvider options) { + return options.getOption(this.outSrgFileArgName); + } + + public String getRefMapFileName(IOptionProvider options) { + return options.getOption(this.refmapArgName); + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java new file mode 100644 index 00000000..ef63f177 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -0,0 +1,55 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.util.Set; + +import com.google.common.collect.ImmutableSet; + +public final class SupportedOptions { + + public static final String REOBF_SRG_FILE = "reobfSrgFile"; + public static final String REOBF_NOTCH_FILE = "reobfNotchSrgFile"; + public static final String OUT_SRG_SRG_FILE = "outSrgFile"; + public static final String OUT_NOTCH_SRG_FILE = "outNotchSrgFile"; + public static final String OUT_SRG_REFMAP_FILE = "outRefMapFile"; + public static final String OUT_NOTCH_REFMAP_FILE = "outNotchRefMapFile"; + public static final String DISABLE_TARGET_VALIDATOR = "disableTargetValidator"; + public static final String DISABLE_TARGET_EXPORT = "disableTargetExport"; + + public static final Set all = ImmutableSet.of( + SupportedOptions.REOBF_SRG_FILE, + SupportedOptions.REOBF_NOTCH_FILE, + SupportedOptions.OUT_SRG_SRG_FILE, + SupportedOptions.OUT_NOTCH_SRG_FILE, + SupportedOptions.OUT_SRG_REFMAP_FILE, + SupportedOptions.OUT_NOTCH_REFMAP_FILE, + SupportedOptions.DISABLE_TARGET_VALIDATOR, + SupportedOptions.DISABLE_TARGET_EXPORT + ); + + private SupportedOptions() {} + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java new file mode 100644 index 00000000..f9b06fc4 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -0,0 +1,279 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; + +import javax.annotation.processing.Filer; +import javax.annotation.processing.Messager; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.tools.FileObject; +import javax.tools.StandardLocation; +import javax.tools.Diagnostic.Kind; + +import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; + +import net.minecraftforge.srg2source.rangeapplier.MethodData; +import net.minecraftforge.srg2source.rangeapplier.SrgContainer; + +class TargetObfuscationEnvironment { + + /** + * Type + */ + private final ObfuscationType type; + + /** + * Messager + */ + private final Messager messager; + + /** + * Type handle provider + */ + private final ITypeHandleProvider typeProvider; + + /** + * Options + */ +// private final IOptionProvider options; + + /** + * Name of the resource to write generated srgs to + */ + private final String outSrgFileName; + + /** + * Name of the resource to write remapped refs to + */ + private final String outRefMapFileName; + + /** + * File containing the reobfd srgs + */ + private final String reobfSrgFileName; + + /** + * Reference mapper for reference mapping + */ + private final ReferenceMapper refMapper = new ReferenceMapper(); + + /** + * SRG container for mcp->? mappings + */ + private SrgContainer srgs; + + /** + * True once we've tried to initialise the srgs, initially false so that we + * can do srg init lazily + */ + private boolean initDone; + + public TargetObfuscationEnvironment(ObfuscationType type, Messager messager, ITypeHandleProvider typeProvider, IOptionProvider options) { + this.type = type; + this.messager = messager; + this.typeProvider = typeProvider; +// this.options = options; + + this.reobfSrgFileName = type.getSrgFileName(options); + this.outSrgFileName = type.getOutputSrgFileName(options); + this.outRefMapFileName = type.getRefMapFileName(options); + } + + private boolean initSrgs() { + if (!this.initDone) { + this.initDone = true; + + if (this.reobfSrgFileName == null) { + this.messager.printMessage(Kind.ERROR, "The " + this.type.getSrgFileOption() + + " argument was not supplied, obfuscation processing will not occur"); + return false; + } + + try { + File reobfSrgFile = new File(this.reobfSrgFileName); + this.messager.printMessage(Kind.NOTE, "Loading " + this.type + " mappings from " + reobfSrgFile.getAbsolutePath()); + this.srgs = new SrgContainer().readSrg(reobfSrgFile); + } catch (Exception ex) { + ex.printStackTrace(); + this.messager.printMessage(Kind.ERROR, "The specified " + this.type + " SRG file could not be read, processing cannot continue"); + this.srgs = null; + } + } + + return this.srgs != null; + } + + /** + * Get an obfuscation mapping for a method + */ + public MethodData getObfMethod(MemberInfo method) { + MethodData obfd = this.getObfMethod(method.asMethodData()); + if (obfd != null || !method.isFullyQualified()) { + return obfd; + } + + // Get a type handle for the declared method owner + TypeHandle type = this.typeProvider.getTypeHandle(method.owner); + if (type.isImaginary()) { + return null; + } + + // See if we can get the superclass from the reference + TypeMirror superClass = type.getElement().getSuperclass(); + if (superClass.getKind() != TypeKind.DECLARED) { + return null; + } + + // Well we found it, let's inflect the class name and recurse the search + String superClassName = ((TypeElement)((DeclaredType)superClass).asElement()).getQualifiedName().toString(); + return this.getObfMethod(new MemberInfo(method.name, superClassName.replace('.', '/'), method.desc, method.matchAll)); + } + + /** + * Get an obfuscation mapping for a method + */ + public MethodData getObfMethod(MethodData method) { + if (this.initSrgs()) { + return this.srgs.methodMap.get(method); + } + return null; + } + + /** + * Get an obfuscation mapping for a field + */ + public String getObfField(String field) { + if (this.initSrgs()) { + return this.srgs.fieldMap.get(field); + } + return null; + } + + /** + * Write out generated srgs + */ + public void writeSrgs(Filer filer, Map mixins) { + if (this.outSrgFileName == null) { + return; + } + + Set fieldMappings = new LinkedHashSet(); + Set methodMappings = new LinkedHashSet(); + + for (AnnotatedMixin mixin : mixins.values()) { + fieldMappings.addAll(mixin.getFieldMappings(this.type)); + methodMappings.addAll(mixin.getMethodMappings(this.type)); + } + + PrintWriter writer = null; + + try { + writer = this.openFileWriter(filer, this.outSrgFileName, this.type + " output SRGs"); + for (String fieldMapping : fieldMappings) { + writer.println(fieldMapping); + } + for (String methodMapping : methodMappings) { + writer.println(methodMapping); + } + } catch (IOException ex) { + ex.printStackTrace(); + } finally { + if (writer != null) { + try { + writer.close(); + } catch (Exception ex) { + // oh well + } + } + } + } + + /** + * Write out stored mappings + */ + public void writeRefs(Filer filer) { + if (this.outRefMapFileName == null) { + return; + } + + PrintWriter writer = null; + + try { + writer = this.openFileWriter(filer, this.outRefMapFileName, this.type + "refmap"); + this.refMapper.write(writer); + } catch (IOException ex) { + ex.printStackTrace(); + } finally { + if (writer != null) { + try { + writer.close(); + } catch (Exception ex) { + // oh well + } + } + } + } + + /** + * Open a writer for an output file + */ + private PrintWriter openFileWriter(Filer filer, String fileName, String description) throws IOException { + if (fileName.matches("^.*[\\\\/:].*$")) { + File outSrgFile = new File(fileName); + outSrgFile.getParentFile().mkdirs(); + this.messager.printMessage(Kind.NOTE, "Writing " + description + " to " + outSrgFile.getAbsolutePath()); + return new PrintWriter(outSrgFile); + } + + FileObject outSrg = filer.createResource(StandardLocation.CLASS_OUTPUT, "", fileName); + this.messager.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); + return new PrintWriter(outSrg.openWriter()); + } + + /** + * Get the type + */ + public ObfuscationType getType() { + return this.type; + } + + /** + * Get the reference mapper + */ + public ReferenceMapper getReferenceMapper() { + return this.refMapper; + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java index 3fc429fd..08c8bf64 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java @@ -37,6 +37,7 @@ import javax.lang.model.type.TypeMirror; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IOptionProvider; import org.spongepowered.tools.obfuscation.MixinValidator; +import org.spongepowered.tools.obfuscation.SupportedOptions; import org.spongepowered.tools.obfuscation.TypeHandle; @@ -63,7 +64,7 @@ public class TargetValidator extends MixinValidator { */ @Override public boolean validate(TypeElement mixin, AnnotationMirror annotation, Collection targets) { - if ("true".equalsIgnoreCase(this.options.getOption("disableTargetValidator"))) { + if ("true".equalsIgnoreCase(this.options.getOption(SupportedOptions.DISABLE_TARGET_VALIDATOR))) { return true; } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index e516137d..3b619abb 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.7"; + public static final String VERSION = "0.4.8"; /** * Blackboard key where the subsystem version will be stored to indicate From b56a5350051896813cfd22831c414860038da6cd Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 4 Dec 2015 13:25:58 +0000 Subject: [PATCH 045/169] Store multiple obf types in a refmap --- .../tools/obfuscation/AnnotatedMixins.java | 72 +++++++++++++++--- .../tools/obfuscation/ObfuscationType.java | 29 +++----- .../tools/obfuscation/SupportedOptions.java | 10 +-- .../TargetObfuscationEnvironment.java | 74 ++++++------------- .../asm/mixin/MixinEnvironment.java | 18 +++++ .../asm/mixin/extensibility/IMixinConfig.java | 9 +++ .../mixin/injection/struct/MemberInfo.java | 2 +- .../injection/struct/ReferenceMapper.java | 59 +++++++++++---- .../asm/mixin/transformer/MixinConfig.java | 34 +++++++-- .../mixin/transformer/MixinTransformer.java | 2 +- 10 files changed, 202 insertions(+), 107 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 156d24f9..e569bdd7 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -24,7 +24,10 @@ */ package org.spongepowered.tools.obfuscation; +import java.io.File; +import java.io.IOException; import java.io.InputStream; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -55,6 +58,7 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IMixinValidator.ValidationPass; @@ -66,7 +70,6 @@ import com.google.common.collect.ImmutableList; import net.minecraftforge.srg2source.rangeapplier.MethodData; - /** * Mixin info manager, stores all of the mixin info during processing and also * manages access to the srgs @@ -109,11 +112,21 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp */ private final List mixinsForPass = new ArrayList(); + /** + * Name of the resource to write remapped refs to + */ + private final String outRefMapFileName; + /** * Target obfuscation environments */ private final List targetEnvironments = new ArrayList(); + /** + * Reference mapper for reference mapping + */ + private final ReferenceMapper refMapper = new ReferenceMapper(); + /** * Rule validators */ @@ -142,12 +155,13 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp this.env = this.detectEnvironment(processingEnv); this.processingEnv = processingEnv; this.targets = this.initTargetMap(); + this.outRefMapFileName = this.getOption(SupportedOptions.OUT_REFMAP_FILE); this.printMessage(Kind.NOTE, "SpongePowered Mixin Annotation Processor v" + MixinBootstrap.VERSION); for (ObfuscationType obfType : ObfuscationType.values()) { if (obfType.isSupported(this)) { - this.targetEnvironments.add(new TargetObfuscationEnvironment(obfType, this, this, this)); + this.targetEnvironments.add(new TargetObfuscationEnvironment(obfType, this, this, this, this.refMapper)); } } @@ -248,11 +262,44 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp * Write out stored mappings */ public void writeRefs() { - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - targetEnv.writeRefs(this.processingEnv.getFiler()); + if (this.outRefMapFileName == null) { + return; + } + + PrintWriter writer = null; + + try { + writer = this.openFileWriter(this.outRefMapFileName, "refmap"); + this.refMapper.write(writer); + } catch (IOException ex) { + ex.printStackTrace(); + } finally { + if (writer != null) { + try { + writer.close(); + } catch (Exception ex) { + // oh well + } + } } } - + + /** + * Open a writer for an output file + */ + private PrintWriter openFileWriter(String fileName, String description) throws IOException { + if (fileName.matches("^.*[\\\\/:].*$")) { + File outSrgFile = new File(fileName); + outSrgFile.getParentFile().mkdirs(); + this.printMessage(Kind.NOTE, "Writing " + description + " to " + outSrgFile.getAbsolutePath()); + return new PrintWriter(outSrgFile); + } + + FileObject outSrg = this.processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", fileName); + this.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); + return new PrintWriter(outSrg.openWriter()); + } + public ObfuscationData getObfMethod(MemberInfo method) { ObfuscationData data = new ObfuscationData(); @@ -306,7 +353,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp String obfName = obfMethod.name.substring(slashPos + 1); String obfOwner = obfMethod.name.substring(0, slashPos); MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); - targetEnv.getReferenceMapper().addMapping(className, reference, remappedReference.toString()); + targetEnv.addMapping(className, reference, remappedReference.toString()); } } } @@ -316,7 +363,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp MethodData obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { MemberInfo remappedReference = context.remapUsing(obfMethod, false); - targetEnv.getReferenceMapper().addMapping(className, reference, remappedReference.toString()); + targetEnv.addMapping(className, reference, remappedReference.toString()); } } } @@ -327,11 +374,18 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp if (obfField != null) { MemberInfo remappedReference = MemberInfo.fromSrgField(obfField, context.desc); String remapped = remappedReference.toString(); - targetEnv.getReferenceMapper().addMapping(className, reference, remapped); + targetEnv.addMapping(className, reference, remapped); } } } - + + /** + * Get the reference mapper + */ + public ReferenceMapper getReferenceMapper() { + return this.refMapper; + } + /** * Clear all registered mixins */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java index 583802d6..19b2d494 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java @@ -26,28 +26,26 @@ package org.spongepowered.tools.obfuscation; enum ObfuscationType { - SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.OUT_SRG_SRG_FILE, SupportedOptions.OUT_SRG_REFMAP_FILE), - NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.OUT_NOTCH_SRG_FILE, SupportedOptions.OUT_NOTCH_REFMAP_FILE); + SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.OUT_SRG_SRG_FILE), + NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.OUT_NOTCH_SRG_FILE); - private final String displayName; + private final String key; private final String srgFileArgName; private final String outSrgFileArgName; - private final String refmapArgName; - private ObfuscationType(String displayName, String srgFileArgName, String outSrgFileArgName, String refmapArgName) { - this.displayName = displayName; + private ObfuscationType(String displayName, String srgFileArgName, String outSrgFileArgName) { + this.key = displayName; this.srgFileArgName = srgFileArgName; this.outSrgFileArgName = outSrgFileArgName; - this.refmapArgName = refmapArgName; } @Override public String toString() { - return this.displayName; + return this.key; } - public String getDisplayName() { - return this.displayName; + public String getKey() { + return this.key; } public String getSrgFileOption() { @@ -58,8 +56,9 @@ enum ObfuscationType { return this.outSrgFileArgName; } - public String getRefMapFileOption() { - return this.refmapArgName; + public boolean isDefault(IOptionProvider options) { + String defaultEnv = options.getOption(SupportedOptions.DEFAULT_OBFUSCATION_ENV); + return (defaultEnv == null && this == ObfuscationType.SRG) || (defaultEnv != null && this.key.equals(defaultEnv.toLowerCase())); } public boolean isSupported(IOptionProvider options) { @@ -73,9 +72,5 @@ enum ObfuscationType { public String getOutputSrgFileName(IOptionProvider options) { return options.getOption(this.outSrgFileArgName); } - - public String getRefMapFileName(IOptionProvider options) { - return options.getOption(this.refmapArgName); - } - + } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index ef63f177..7ca77842 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -34,20 +34,20 @@ public final class SupportedOptions { public static final String REOBF_NOTCH_FILE = "reobfNotchSrgFile"; public static final String OUT_SRG_SRG_FILE = "outSrgFile"; public static final String OUT_NOTCH_SRG_FILE = "outNotchSrgFile"; - public static final String OUT_SRG_REFMAP_FILE = "outRefMapFile"; - public static final String OUT_NOTCH_REFMAP_FILE = "outNotchRefMapFile"; + public static final String OUT_REFMAP_FILE = "outRefMapFile"; public static final String DISABLE_TARGET_VALIDATOR = "disableTargetValidator"; public static final String DISABLE_TARGET_EXPORT = "disableTargetExport"; + public static final String DEFAULT_OBFUSCATION_ENV = "defaultObfuscationEnv"; public static final Set all = ImmutableSet.of( SupportedOptions.REOBF_SRG_FILE, SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.OUT_SRG_SRG_FILE, SupportedOptions.OUT_NOTCH_SRG_FILE, - SupportedOptions.OUT_SRG_REFMAP_FILE, - SupportedOptions.OUT_NOTCH_REFMAP_FILE, + SupportedOptions.OUT_REFMAP_FILE, SupportedOptions.DISABLE_TARGET_VALIDATOR, - SupportedOptions.DISABLE_TARGET_EXPORT + SupportedOptions.DISABLE_TARGET_EXPORT, + SupportedOptions.DEFAULT_OBFUSCATION_ENV ); private SupportedOptions() {} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index f9b06fc4..231bb344 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -67,18 +67,13 @@ class TargetObfuscationEnvironment { /** * Options */ -// private final IOptionProvider options; + private final IOptionProvider options; /** * Name of the resource to write generated srgs to */ private final String outSrgFileName; - /** - * Name of the resource to write remapped refs to - */ - private final String outRefMapFileName; - /** * File containing the reobfd srgs */ @@ -87,7 +82,7 @@ class TargetObfuscationEnvironment { /** * Reference mapper for reference mapping */ - private final ReferenceMapper refMapper = new ReferenceMapper(); + private final ReferenceMapper refMapper; /** * SRG container for mcp->? mappings @@ -100,15 +95,16 @@ class TargetObfuscationEnvironment { */ private boolean initDone; - public TargetObfuscationEnvironment(ObfuscationType type, Messager messager, ITypeHandleProvider typeProvider, IOptionProvider options) { + public TargetObfuscationEnvironment(ObfuscationType type, Messager messager, ITypeHandleProvider typeProvider, IOptionProvider options, + ReferenceMapper refMapper) { this.type = type; this.messager = messager; this.typeProvider = typeProvider; -// this.options = options; + this.options = options; + this.refMapper = refMapper; this.reobfSrgFileName = type.getSrgFileName(options); this.outSrgFileName = type.getOutputSrgFileName(options); - this.outRefMapFileName = type.getRefMapFileName(options); } private boolean initSrgs() { @@ -134,7 +130,21 @@ class TargetObfuscationEnvironment { return this.srgs != null; } - + + /** + * Get the type + */ + public ObfuscationType getType() { + return this.type; + } + + public void addMapping(String className, String reference, String newReference) { + this.refMapper.addMapping(this.type.getKey(), className, reference, newReference); + if (this.type.isDefault(this.options)) { + this.refMapper.addMapping(null, className, reference, newReference); + } + } + /** * Get an obfuscation mapping for a method */ @@ -219,33 +229,7 @@ class TargetObfuscationEnvironment { } } } - - /** - * Write out stored mappings - */ - public void writeRefs(Filer filer) { - if (this.outRefMapFileName == null) { - return; - } - - PrintWriter writer = null; - - try { - writer = this.openFileWriter(filer, this.outRefMapFileName, this.type + "refmap"); - this.refMapper.write(writer); - } catch (IOException ex) { - ex.printStackTrace(); - } finally { - if (writer != null) { - try { - writer.close(); - } catch (Exception ex) { - // oh well - } - } - } - } - + /** * Open a writer for an output file */ @@ -262,18 +246,4 @@ class TargetObfuscationEnvironment { return new PrintWriter(outSrg.openWriter()); } - /** - * Get the type - */ - public ObfuscationType getType() { - return this.type; - } - - /** - * Get the reference mapper - */ - public ReferenceMapper getReferenceMapper() { - return this.refMapper; - } - } diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 6973e578..71600fbc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -585,6 +585,11 @@ public class MixinEnvironment implements ITokenProvider { */ private IClassNameTransformer nameTransformer; + /** + * Obfuscation context (refmap key to use in this environment) + */ + private String obfuscationContext = null; + MixinEnvironment(Phase phase) { this.phase = phase; this.configsKey = MixinEnvironment.CONFIGS_KEY + "." + this.phase.name.toLowerCase(); @@ -847,6 +852,19 @@ public class MixinEnvironment implements ITokenProvider { return option.getStringValue(); } + /** + * Set the obfuscation context + * + * @param context + */ + public void setObfuscationContext(String context) { + this.obfuscationContext = context; + } + + public String getObfuscationContext() { + return this.obfuscationContext; + } + /** * Invoke a mixin environment audit process */ diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java index d14f49ad..0e39783c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinConfig.java @@ -26,6 +26,8 @@ package org.spongepowered.asm.mixin.extensibility; import java.util.Set; +import org.spongepowered.asm.mixin.MixinEnvironment; + /** * Interface for loaded mixin configurations */ @@ -35,6 +37,13 @@ public interface IMixinConfig { * Default priority for mixin configs and mixins */ public static final int DEFAULT_PRIORITY = 1000; + + /** + * Get the parent environment of this config + * + * @return the parent environment + */ + public abstract MixinEnvironment getEnvironment(); /** * Get the name of the file from which this configuration object was diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index d5c3f40e..206aa467 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -433,7 +433,7 @@ public class MemberInfo { * @param mixinClass Mixin class to use for remapping * @return parsed MemberInfo */ - public static MemberInfo parse(String name, ReferenceMapper refMapper, String mixinClass) { + private static MemberInfo parse(String name, ReferenceMapper refMapper, String mixinClass) { String desc = null; String owner = null; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java index f2c5122a..47c5e3ad 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java @@ -33,35 +33,58 @@ import java.util.Map; import net.minecraft.launchwrapper.Launch; +import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; public final class ReferenceMapper implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2L; public static final String DEFAULT_RESOURCE = "mixin.refmap.json"; - - private final Map> mappings; + + private final Map> mappings = Maps.newHashMap(); + + private final Map>> data = Maps.newHashMap(); + + private transient String context = null; public ReferenceMapper() { - this(new HashMap>()); } - - public ReferenceMapper(Map> mappings) { - this.mappings = mappings; + + public String getContext() { + return this.context; + } + + public void setContext(String context) { + this.context = context; } public String remap(String className, String reference) { + return this.remapWithContext(this.context, className, reference); + } + + public String remapWithContext(String context, String className, String reference) { + Map> mappings = this.mappings; + if (context != null) { + mappings = this.data.get(context); + if (mappings == null) { + mappings = this.mappings; + } + } + return this.remap(mappings, className, reference); + } + + private String remap(Map> mappings, String className, String reference) { if (className == null) { - for (Map mappings : this.mappings.values()) { - if (mappings.containsKey(reference)) { - return mappings.get(reference); + for (Map mapping : mappings.values()) { + if (mapping.containsKey(reference)) { + return mapping.get(reference); } } } - Map classMappings = this.mappings.get(className); + Map classMappings = mappings.get(className); if (classMappings == null) { return reference; } @@ -69,11 +92,19 @@ public final class ReferenceMapper implements Serializable { return remappedReference != null ? remappedReference : reference; } - public void addMapping(String className, String reference, String newReference) { - Map classMappings = this.mappings.get(className); + public void addMapping(String context, String className, String reference, String newReference) { + Map> mappings = this.mappings; + if (context != null) { + mappings = this.data.get(context); + if (mappings == null) { + mappings = Maps.newHashMap(); + this.data.put(context, mappings); + } + } + Map classMappings = mappings.get(className); if (classMappings == null) { classMappings = new HashMap(); - this.mappings.put(className, classMappings); + mappings.put(className, classMappings); } classMappings.put(reference, newReference); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 2138bf48..f4a833fa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -173,6 +173,11 @@ class MixinConfig implements Comparable, IMixinConfig { */ private final transient int order = MixinConfig.configOrder++; + /** + * Parent environment + */ + private transient MixinEnvironment env; + /** * Name of the file this config was initialised from */ @@ -198,7 +203,7 @@ class MixinConfig implements Comparable, IMixinConfig { * Keep track of initialisation state */ private transient boolean initialised = false; - + /** * Spawn via GSON, no public ctor for you */ @@ -207,16 +212,18 @@ class MixinConfig implements Comparable, IMixinConfig { /** * Called immediately after deserialisation * + * @param env Parent environment * @param name Mixin config name * @return true if the config was successfully initialised and should be * returned, or false if initialisation failed and the config should * be discarded */ - private boolean onLoad(String name) { + private boolean onLoad(MixinEnvironment env, String name) { + this.env = env; this.name = name; VersionNumber minVersion = VersionNumber.parse(this.version); - VersionNumber curVersion = VersionNumber.parse(MixinEnvironment.getCurrentEnvironment().getVersion()); + VersionNumber curVersion = VersionNumber.parse(env.getVersion()); if (minVersion.compareTo(curVersion) > 0) { this.logger.warn("Mixin config {} requires mixin subsystem version {} but {} was found. The mixin config will not be applied.", this.name, minVersion, curVersion); @@ -257,7 +264,7 @@ class MixinConfig implements Comparable, IMixinConfig { } this.refMapper = ReferenceMapper.read(this.refMapperConfig); - this.verboseLogging |= MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_VERBOSE); + this.verboseLogging |= env.getOption(Option.DEBUG_VERBOSE); return true; } @@ -283,7 +290,7 @@ class MixinConfig implements Comparable, IMixinConfig { this.initialiseMixins(this.mixinClasses, false, hotSwapper); - switch (MixinEnvironment.getCurrentEnvironment().getSide()) { + switch (this.env.getSide()) { case CLIENT: this.initialiseMixins(this.mixinClassesClient, false, hotSwapper); break; @@ -372,7 +379,16 @@ class MixinConfig implements Comparable, IMixinConfig { public boolean isRequired() { return this.required; } - + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.extensibility.IMixinConfig + * #getEnvironment() + */ + @Override + public MixinEnvironment getEnvironment() { + return this.env; + } + /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinConfig#getName() */ @@ -424,6 +440,7 @@ class MixinConfig implements Comparable, IMixinConfig { * Get the reference remapper for injectors */ public ReferenceMapper getReferenceMapper() { + this.refMapper.setContext(this.env.getObfuscationContext()); return this.refMapper; } @@ -551,12 +568,13 @@ class MixinConfig implements Comparable, IMixinConfig { * specified configFile, which must be accessible on the classpath * * @param configFile + * @param env parent environment * @return */ - static MixinConfig create(String configFile) { + static MixinConfig create(String configFile, MixinEnvironment env) { try { MixinConfig config = new Gson().fromJson(new InputStreamReader(Launch.classLoader.getResourceAsStream(configFile)), MixinConfig.class); - if (config.onLoad(configFile)) { + if (config.onLoad(env, configFile)) { return config; } return null; 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 14bdbf6b..874e45ac 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -492,7 +492,7 @@ public class MixinTransformer extends TreeTransformer { if (configs != null) { for (String configFile : configs) { try { - MixinConfig config = MixinConfig.create(configFile); + MixinConfig config = MixinConfig.create(configFile, environment); if (config != null) { this.logger.log(this.verboseLoggingLevel, "Adding mixin config {}", config); this.pendingConfigs.add(config); From 1f88dc0fe6f6cd2d94bb885c860bf8ab36fcb95e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 4 Dec 2015 13:26:10 +0000 Subject: [PATCH 046/169] Bump version to 0.4.9 --- gradle.properties | 2 +- src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 71e0f17d..27db9610 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.8 +buildVersion=0.4.9 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 3b619abb..be9b76d2 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.8"; + public static final String VERSION = "0.4.9"; /** * Blackboard key where the subsystem version will be stored to indicate From f70bdf927a372310c2fd70f325c8cbb5fb8fa61e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 15 Dec 2015 12:15:28 +0000 Subject: [PATCH 047/169] Exclude fernflower from exported pom files, partially resolves #82 --- build.gradle | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle index d950f965..edb8ed8f 100644 --- a/build.gradle +++ b/build.gradle @@ -331,7 +331,20 @@ uploadArchives { } } } + whenConfigured { + dependencies = dependencies.findAll { + !it.artifactId.contains('fernflower') + } + } } } } } + +install.repositories.mavenInstaller.pom { + whenConfigured { + dependencies = dependencies.findAll { + !it.artifactId.contains('fernflower') + } + } +} From ed6e35876147fe420312d246e537851a8212f4a4 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 15 Dec 2015 12:37:07 +0000 Subject: [PATCH 048/169] Add option to disable decompiler when exporting, fixes #82 --- .../asm/mixin/MixinEnvironment.java | 20 ++++++++++++++----- .../mixin/transformer/MixinTransformer.java | 7 ++++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 71600fbc..a695aa0e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -262,6 +262,16 @@ public class MixinEnvironment implements ITokenProvider { */ DEBUG_EXPORT_FILTER(Option.DEBUG_EXPORT, "filter"), + /** + * Allow fernflower to be disabled even if it is found on the classpath + */ + DEBUG_EXPORT_DECOMPILE(Option.DEBUG_EXPORT, "decompile") { + @Override + boolean getBooleanValue() { + return Booleans.parseBoolean(System.getProperty(this.property), super.getBooleanValue()); + } + }, + /** * Run the CheckClassAdapter on all classes after mixins are applied */ @@ -624,13 +634,13 @@ public class MixinEnvironment implements ITokenProvider { if (this.getOption(Option.DEBUG_VERBOSE)) { PrettyPrinter printer = new PrettyPrinter(32); printer.add("SpongePowered MIXIN (Verbose debugging enabled)").centre().hr(); - printer.add("%25s : %s", "Code source", codeSource); - printer.add("%25s : %s", "Internal Version", version); - printer.add("%25s : %s", "Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr(); + printer.add("%28s : %s", "Code source", codeSource); + printer.add("%28s : %s", "Internal Version", version); + printer.add("%28s : %s", "Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr(); for (Option option : Option.values()) { - printer.add("%25s : %s%s", option.property, option.parent == null ? "" : " - ", this.getOption(option)); + printer.add("%28s : %s%s", option.property, option.parent == null ? "" : " - ", this.getOption(option)); } - printer.hr().add("%25s : %s", "Detected Side", side); + printer.hr().add("%28s : %s", "Detected Side", side); printer.print(System.err); } } 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 874e45ac..7c93d195 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -300,7 +300,6 @@ public class MixinTransformer extends TreeTransformer { TreeInfo.setLock(this.lock); this.decompiler = this.initDecompiler(new File(MixinTransformer.DEBUG_OUTPUT, "java")); - this.hotSwapper = this.initHotSwapper(); try { @@ -311,7 +310,7 @@ public class MixinTransformer extends TreeTransformer { } private IDecompiler initDecompiler(File outputPath) { - if (!MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_EXPORT)) { + if (!MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_EXPORT_DECOMPILE)) { return null; } @@ -321,7 +320,9 @@ public class MixinTransformer extends TreeTransformer { Class clazz = (Class)Class.forName("org.spongepowered.asm.mixin.transformer.debug.RuntimeDecompiler"); Constructor ctor = clazz.getDeclaredConstructor(File.class); - return ctor.newInstance(outputPath); + IDecompiler decompiler = ctor.newInstance(outputPath); + this.logger.info("Fernflower decompiler was successfully initialised, exported classes will be decompiled"); + return decompiler; } catch (Throwable th) { this.logger.info("Fernflower could not be loaded, exported classes will not be decompiled. {}: {}", th.getClass().getSimpleName(), th.getMessage()); From be78c8b191566f0c0babb01190d953eb3d7894ce Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 15 Dec 2015 13:15:08 +0000 Subject: [PATCH 049/169] Indent header more appropriately for easier reading --- .../asm/mixin/MixinEnvironment.java | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index a695aa0e..20b7c325 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -260,7 +260,7 @@ public class MixinEnvironment implements ITokenProvider { *
?
Matches exactly one character
* */ - DEBUG_EXPORT_FILTER(Option.DEBUG_EXPORT, "filter"), + DEBUG_EXPORT_FILTER(Option.DEBUG_EXPORT, "filter", false), /** * Allow fernflower to be disabled even if it is found on the classpath @@ -325,14 +325,38 @@ public class MixinEnvironment implements ITokenProvider { * Java property name */ final String property; + + /** + * Whether this property is boolean or not + */ + final boolean flag; + + /** + * Number of parents + */ + final int depth; private Option(String property) { - this(null, property); + this(null, property, true); + } + + private Option(String property, boolean flag) { + this(null, property, flag); } private Option(Option parent, String property) { + this(parent, property, true); + } + + private Option(Option parent, String property, boolean flag) { this.parent = parent; this.property = (parent != null ? parent.property : Option.PREFIX) + "." + property; + this.flag = flag; + int depth = 0; + for (; parent != null; depth++) { + parent = parent.parent; + } + this.depth = depth; } Option getParent() { @@ -343,6 +367,11 @@ public class MixinEnvironment implements ITokenProvider { return this.property; } + @Override + public String toString() { + return this.flag ? String.valueOf(this.getBooleanValue()) : this.getStringValue(); + } + boolean getBooleanValue() { return Booleans.parseBoolean(System.getProperty(this.property), false) || (this.parent != null && this.parent.getBooleanValue()); @@ -638,7 +667,11 @@ public class MixinEnvironment implements ITokenProvider { printer.add("%28s : %s", "Internal Version", version); printer.add("%28s : %s", "Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr(); for (Option option : Option.values()) { - printer.add("%28s : %s%s", option.property, option.parent == null ? "" : " - ", this.getOption(option)); + StringBuilder indent = new StringBuilder(); + for (int i = 0; i < option.depth; i++) { + indent.append("- "); + } + printer.add("%28s : %s<%s>", option.property, indent, option); } printer.hr().add("%28s : %s", "Detected Side", side); printer.print(System.err); From 03422a0851eb7c2b1024c9943bd88945a92d015d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 16 Dec 2015 14:09:23 +0000 Subject: [PATCH 050/169] Add two tiny optimisations which make decompiled output easier to read --- .../injection/callback/CallbackInjector.java | 26 +++++++++++++++---- .../mixin/transformer/MixinTargetContext.java | 16 ++++++++++-- 2 files changed, 35 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 726629d6..0810d129 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 @@ -405,7 +405,9 @@ public class CallbackInjector extends Injector { } } - this.createCallbackInfo(callback); + if (this.cancellable) { + this.createCallbackInfo(callback, true); + } this.invokeCallback(callback, callbackMethod); this.injectCancellationCode(callback); @@ -489,15 +491,29 @@ public class CallbackInjector extends Injector { /** * @param callback callback handle + * @param store store the callback info in a local variable */ - private void createCallbackInfo(final Callback callback) { + private void createCallbackInfo(final Callback callback, boolean store) { this.dupReturnValue(callback); - callback.add(new TypeInsnNode(Opcodes.NEW, callback.target.callbackInfoClass), true, false); + callback.add(new TypeInsnNode(Opcodes.NEW, callback.target.callbackInfoClass), true, !store); callback.add(new InsnNode(Opcodes.DUP), true, true); this.invokeCallbackInfoCtor(callback); - callback.add(new VarInsnNode(Opcodes.ASTORE, callback.marshallVar)); + if (store) { + callback.add(new VarInsnNode(Opcodes.ASTORE, callback.marshallVar)); + } + } + + /** + * @param callback callback handle + */ + private void loadOrCreateCallbackInfo(final Callback callback) { + if (this.cancellable) { + callback.add(new VarInsnNode(Opcodes.ALOAD, callback.marshallVar), false, true); + } else { + this.createCallbackInfo(callback, false); + } } /** @@ -549,7 +565,7 @@ public class CallbackInjector extends Injector { } // Push the callback info onto the stack - callback.add(new VarInsnNode(Opcodes.ALOAD, callback.marshallVar), false, true); + this.loadOrCreateCallbackInfo(callback); // (Maybe) push the locals onto the stack if (callback.canCaptureLocals) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index b8b54eff..ebfaa67e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -242,6 +242,7 @@ public class MixinTargetContext implements IReferenceMapperContext { this.validateMethod(method); this.transformDescriptor(method); + AbstractInsnNode lastInsn = null; for (Iterator iter = method.instructions.iterator(); iter.hasNext();) { AbstractInsnNode insn = iter.next(); @@ -250,12 +251,14 @@ public class MixinTargetContext implements IReferenceMapperContext { } else if (insn instanceof FieldInsnNode) { this.transformFieldRef(method, iter, new MemberRef.Field((FieldInsnNode)insn)); } else if (insn instanceof TypeInsnNode) { - this.transformTypeNode(method, iter, (TypeInsnNode)insn); + this.transformTypeNode(method, iter, (TypeInsnNode)insn, lastInsn); } else if (insn instanceof LdcInsnNode) { this.transformConstantNode(method, iter, (LdcInsnNode)insn); } else if (insn instanceof InvokeDynamicInsnNode) { this.transformInvokeDynamicNode(method, iter, (InvokeDynamicInsnNode)insn); } + + lastInsn = insn; } } @@ -339,8 +342,17 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param method Method being processed * @param iter Insn interator * @param typeInsn Insn to transform + * @param lastNode Last insn in the method */ - private void transformTypeNode(MethodNode method, Iterator iter, TypeInsnNode typeInsn) { + private void transformTypeNode(MethodNode method, Iterator iter, TypeInsnNode typeInsn, AbstractInsnNode lastNode) { + if (typeInsn.getOpcode() == Opcodes.CHECKCAST + && typeInsn.desc.equals(this.targetClass.name) + && lastNode.getOpcode() == Opcodes.ALOAD + && ((VarInsnNode)lastNode).var == 0) { + iter.remove(); + return; + } + if (typeInsn.desc.equals(this.getClassRef())) { typeInsn.desc = this.targetClass.name; } From 068f64be0085a8e5758fbb33011540f7fcbf5f79 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 16 Dec 2015 14:09:42 +0000 Subject: [PATCH 051/169] Fix AP remapper to emit correct notch mappings in refmaps --- .../tools/obfuscation/AnnotatedMixins.java | 2 +- .../asm/mixin/injection/struct/MemberInfo.java | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index e569bdd7..2ec444b7 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -362,7 +362,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { MethodData obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { - MemberInfo remappedReference = context.remapUsing(obfMethod, false); + MemberInfo remappedReference = context.remapUsing(obfMethod, true); targetEnv.addMapping(className, reference, remappedReference.toString()); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 206aa467..753500cd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -186,8 +186,8 @@ public class MemberInfo { int slashPos = methodData.name.lastIndexOf('/'); this.owner = setOwner ? methodData.name.substring(0, slashPos) : remapped.owner; this.name = methodData.name.substring(slashPos + 1); - this.desc = remapped.desc; - this.matchAll = false; + this.desc = methodData.sig; + this.matchAll = remapped.matchAll; } /* (non-Javadoc) @@ -294,7 +294,12 @@ public class MemberInfo { } String retString = this.desc.substring(this.desc.indexOf(')') + 1); - if (!retString.equals(Type.getType(retString).getDescriptor())) { + try { + Type retType = Type.getType(retString); + if (!retString.equals(retType.getDescriptor())) { + throw new InvalidMemberDescriptorException("Invalid return type \"" + retString + "\" in descriptor: " + this.desc); + } + } catch (Exception ex) { throw new InvalidMemberDescriptorException("Invalid return type \"" + retString + "\" in descriptor: " + this.desc); } } From e2275d15e2e9c40a2dc7825614f7d1df4fc9ced3 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 16 Dec 2015 17:33:54 +0000 Subject: [PATCH 052/169] Resolve field obfuscations in superclass mappings --- .../tools/obfuscation/AnnotatedMixin.java | 28 ++++++++++++++++- .../tools/obfuscation/AnnotatedMixins.java | 16 ++++++++++ .../tools/obfuscation/ObfuscationData.java | 19 +++++++++--- .../TargetObfuscationEnvironment.java | 10 ++++++ .../tools/obfuscation/TypeHandle.java | 18 +++++++++++ .../mixin/injection/struct/MemberInfo.java | 31 +++++++++++++++++-- 6 files changed, 115 insertions(+), 7 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index a90eb314..02ff43c2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -609,7 +609,7 @@ class AnnotatedMixin { } if (targetMember.isField()) { - ObfuscationData obfFieldData = this.mixins.getObfField(targetMember.toSrg()); + ObfuscationData obfFieldData = this.getObfFieldRecursive(targetMember); if (obfFieldData.isEmpty()) { this.mixins.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); return false; @@ -627,6 +627,32 @@ class AnnotatedMixin { return true; } + private ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { + ObfuscationData targetNames = this.mixins.getObfClass(targetMember.owner); + ObfuscationData obfFieldData = this.mixins.getObfField(targetMember.toSrg()); + try { + while (obfFieldData.isEmpty()) { + TypeHandle targetType = this.mixins.getTypeHandle(targetMember.owner); + if (targetType == null) { + return obfFieldData; + } + TypeHandle superClass = targetType.getSuperclass(); + if (superClass == null) { + return obfFieldData; + } + targetMember = targetMember.move(superClass.getName()); + obfFieldData = this.mixins.getObfField(targetMember.toSrg()); + if (!obfFieldData.isEmpty()) { + for (ObfuscationType type : obfFieldData) { + obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); + } + } + } + } finally { + return obfFieldData; + } + } + /** * Add a field mapping to the local table */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 2ec444b7..4dbe5d36 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -344,6 +344,22 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return data; } + + /** + * Get an obfuscation mapping for a class + */ + public ObfuscationData getObfClass(String className) { + ObfuscationData data = new ObfuscationData(className); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String obfClass = targetEnv.getObfClass(className); + if (obfClass != null) { + data.add(targetEnv.getType(), obfClass); + } + } + + return data; + } void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java index 370569d4..9f062fe2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java @@ -31,9 +31,19 @@ import java.util.Map; public class ObfuscationData implements Iterable { private final Map data = new HashMap(); - - public void add(ObfuscationType type, T method) { - this.data.put(type, method); + + private final T defaultValue; + + public ObfuscationData() { + this(null); + } + + public ObfuscationData(T defaultValue) { + this.defaultValue = defaultValue; + } + + public void add(ObfuscationType type, T value) { + this.data.put(type, value); } public boolean isEmpty() { @@ -41,7 +51,8 @@ public class ObfuscationData implements Iterable { } public T get(ObfuscationType type) { - return this.data.get(type); + T value = this.data.get(type); + return value != null ? value : this.defaultValue; } @Override diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 231bb344..79aeea51 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -190,6 +190,16 @@ class TargetObfuscationEnvironment { } return null; } + + /** + * Get an obfuscation mapping for a class + */ + public String getObfClass(String className) { + if (this.initSrgs()) { + return this.srgs.classMap.get(className); + } + return null; + } /** * Write out generated srgs diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java index 90fa5725..74cfcb0f 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java @@ -35,6 +35,7 @@ import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; @@ -145,6 +146,23 @@ public class TypeHandle { public TypeMirror getType() { return this.element != null ? this.element.asType() : null; } + + /** + * Returns the enclosed element's superclass if available, or null if this + * class does not have a superclass + */ + public TypeHandle getSuperclass() { + if (this.element == null) { + return null; + } + + TypeMirror superClass = this.element.getSuperclass(); + if (superClass == null || superClass.getKind() == TypeKind.NONE) { + return null; + } + + return new TypeHandle((DeclaredType)superClass); + } /** * Get whether the element is probably public diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 753500cd..1b1cb758 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -190,6 +190,19 @@ public class MemberInfo { this.matchAll = remapped.matchAll; } + /** + * Initialise a remapped MemberInfo with a new name + * + * @param original Original MemberInfo + * @param owner new owner + */ + private MemberInfo(MemberInfo original, String owner) { + this.owner = owner; + this.name = original.name; + this.desc = original.desc; + this.matchAll = original.matchAll; + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -210,7 +223,7 @@ public class MemberInfo { */ public String toSrg() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqalified reference to SRG mapping"); + throw new RuntimeException("Cannot convert unqualified reference to SRG mapping"); } if (this.desc.startsWith("(")) { @@ -230,7 +243,7 @@ public class MemberInfo { public MethodData asMethodData() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqalified reference to MethodData"); + throw new RuntimeException("Cannot convert unqualified reference to MethodData"); } if (this.isField()) { @@ -377,6 +390,20 @@ public class MemberInfo { && (ordinal == 0 || this.matchAll); } + /** + * Create a new version of this member with a different owner + * + * @param methodData Method data to use + * @param setOwner True to set the owner as well as the name + * @return New MethodInfo with remapped values + */ + public MemberInfo move(String newOwner) { + if (newOwner.equals(this.owner)) { + return this; + } + return new MemberInfo(this, newOwner); + } + /** * Create a remapped version of this member using the supplied method data * From 0f12304abe4ec425c6934286ba26d895e449093b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 16 Dec 2015 17:52:03 +0000 Subject: [PATCH 053/169] Fix AP stripping generics with nested generic signatures --- .../tools/obfuscation/TypeHandle.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java index 74cfcb0f..5307713a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java @@ -222,7 +222,7 @@ public class TypeHandle { * @return handle to the discovered field if matched or null if no match */ public FieldHandle findField(String name, String type) { - String rawType = type.replaceAll("<[^>]+>", ""); + String rawType = TypeHandle.stripGenerics(type); for (Element element : this.getEnclosedElements()) { if (element.getKind() != ElementKind.FIELD) { @@ -260,7 +260,7 @@ public class TypeHandle { * @return handle to the discovered method if matched or null if no match */ public MethodHandle findMethod(String name, String signature) { - String rawSignature = signature.replaceAll("<[^>]+>", ""); + String rawSignature = TypeHandle.stripGenerics(signature); for (Element element : this.getEnclosedElements()) { switch (element.getKind()) { @@ -312,4 +312,20 @@ public class TypeHandle { return element.asType().toString(); } + static String stripGenerics(String type) { + StringBuilder sb = new StringBuilder(); + for (int pos = 0, depth = 0; pos < type.length(); pos++) { + char c = type.charAt(pos); + if (c == '<') { + depth++; + } + if (depth == 0) { + sb.append(c); + } else if (c == '>') { + depth--; + } + } + return sb.toString(); + } + } From c04eb1bdd7c3e9d7d75483851f16876cdfb0fedc Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 18 Dec 2015 22:56:03 +0000 Subject: [PATCH 054/169] Implement remapper, fixes notch->srg at runtime (eg FML), bump to 0.4.10 --- build.gradle | 20 ++- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../tools/obfuscation/AnnotatedMixin.java | 5 +- .../asm/bridge/RemapperAdapter.java | 118 ++++++++++++++++++ .../asm/bridge/RemapperAdapterFML.java | 77 ++++++++++++ .../asm/launch/IMixinLaunchAgent.java | 7 ++ .../asm/launch/MixinBootstrap.java | 2 +- .../asm/launch/MixinLaunchAgentAbstract.java | 8 ++ .../asm/launch/MixinLaunchAgentDefault.java | 4 + .../asm/launch/MixinLaunchAgentFML.java | 25 +++- .../asm/launch/MixinTweakContainer.java | 7 ++ .../asm/launch/MixinTweaker.java | 19 ++- .../asm/mixin/MixinEnvironment.java | 15 +++ .../asm/mixin/RemapperChain.java | 106 ++++++++++++++++ .../asm/mixin/extensibility/IRemapper.java | 84 +++++++++++++ .../injection/callback/CallbackInjector.java | 16 ++- .../mixin/injection/struct/MemberInfo.java | 4 +- .../asm/mixin/transformer/ClassInfo.java | 8 +- .../mixin/transformer/MixinApplicator.java | 2 +- .../mixin/transformer/MixinPreProcessor.java | 95 +++++++++----- 21 files changed, 571 insertions(+), 55 deletions(-) create mode 100644 src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java create mode 100644 src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/RemapperChain.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/extensibility/IRemapper.java diff --git a/build.gradle b/build.gradle index edb8ed8f..40018b25 100644 --- a/build.gradle +++ b/build.gradle @@ -95,6 +95,9 @@ sourceSets { agent { compileClasspath += main.output } + bridge { + compileClasspath += main.output + } } // Dependencies for renamed ASM @@ -130,6 +133,7 @@ task renamedASM { } } } +eclipseClasspath.dependsOn(renamedASM) // Project dependencies dependencies { @@ -163,6 +167,11 @@ dependencies { compile 'net.minecraft:launchwrapper:1.11' agentCompile 'net.minecraft:launchwrapper:1.11' + + // asm bridge + compile 'org.ow2.asm:asm-commons:5.0.3' + bridgeCompile 'org.ow2.asm:asm-commons:5.0.3' + bridgeCompile 'org.apache.logging.log4j:log4j-core:2.0-beta9' } // Filter, process, and include resources @@ -221,7 +230,10 @@ jar { // Include hotswap agent from sourceSets.agent.output - + + // Bridge + from sourceSets.bridge.output + // Renamed ASM from zipTree(tasks.renamedASM.outputs.files[0]) @@ -275,6 +287,8 @@ task sourceJar(type: Jar) { from sourceSets.fernflower.resources from sourceSets.agent.java from sourceSets.agent.resources + from sourceSets.bridge.java + from sourceSets.bridge.resources classifier = "sources" } @@ -333,7 +347,7 @@ uploadArchives { } whenConfigured { dependencies = dependencies.findAll { - !it.artifactId.contains('fernflower') + !it.artifactId.matches('^(fernflower|asm-commons|Srg2Source|jarjar|junit|mockito-core|hamcrest-library)$') } } } @@ -344,7 +358,7 @@ uploadArchives { install.repositories.mavenInstaller.pom { whenConfigured { dependencies = dependencies.findAll { - !it.artifactId.contains('fernflower') + !it.artifactId.matches('^(fernflower|asm-commons|Srg2Source|jarjar|junit|mockito-core|hamcrest-library)$') } } } diff --git a/gradle.properties b/gradle.properties index 27db9610..3ffa47fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.9 +buildVersion=0.4.10 buildType=SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3abfba7f..e7e56722 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 02ff43c2..11807aaa 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -648,9 +648,10 @@ class AnnotatedMixin { } } } - } finally { - return obfFieldData; + } catch (Exception ex) { + // ??? } + return obfFieldData; } /** diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java new file mode 100644 index 00000000..08234ccd --- /dev/null +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java @@ -0,0 +1,118 @@ +/* + * This file is part of Sponge, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered.org + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.bridge; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.objectweb.asm.commons.Remapper; +import org.spongepowered.asm.mixin.extensibility.IRemapper; + +public abstract class RemapperAdapter implements IRemapper { + + protected final Logger logger = LogManager.getLogger("mixin"); + protected final Remapper remapper; + + public RemapperAdapter(Remapper remapper) { + this.remapper = remapper; + } + + @Override + public String toString() { + return this.getClass().getSimpleName(); + } + + @Override + public String mapMethodName(String owner, String name, String desc) { + this.logger.debug("{} is remapping method {}{} for {}", this, name, desc, owner); + String newName = this.remapper.mapMethodName(owner, name, desc); + if (!newName.equals(name)) { + return newName; + } + String obfOwner = this.unmap(owner); + String obfDesc = this.unmapDesc(desc); + this.logger.debug("{} is remapping obfuscated method {}{} for {}", this, name, obfDesc, obfOwner); + return this.remapper.mapMethodName(obfOwner, name, obfDesc); + } + + @Override + public String mapFieldName(String owner, String name, String desc) { + this.logger.debug("{} is remapping field {}{} for {}", this, name, desc, owner); + String newName = this.remapper.mapFieldName(owner, name, desc); + if (!newName.equals(name)) { + return newName; + } + String obfOwner = this.unmap(owner); + String obfDesc = this.unmapDesc(desc); + this.logger.debug("{} is remapping obfuscated field {}{} for {}", this, name, obfDesc, obfOwner); + return this.remapper.mapFieldName(obfOwner, name, obfDesc); + } + + @Override + public String map(String typeName) { + this.logger.debug("{} is remapping class {}", this, typeName); + return this.remapper.map(typeName); + } + + @Override + public String unmap(String typeName) { + return typeName; + } + + @Override + public String mapDesc(String desc) { + return this.remapper.mapDesc(desc); + } + + @Override + public String unmapDesc(String desc) { + StringBuilder sb = new StringBuilder(); + StringBuilder token = null; + + for (int pos = 0; pos < desc.length(); pos++) { + char c = desc.charAt(pos); + if (token != null) { + if (c == ';') { + sb.append('L').append(this.unmap(token.toString())).append(';'); + token = null; + } else { + token.append(c); + } + continue; + } + if (c == 'L') { + token = new StringBuilder(); + } else { + sb.append(c); + } + } + + if (token != null) { + throw new IllegalArgumentException("Invalid descriptor '" + desc + "', missing ';'"); + } + + return sb.toString(); + } + +} diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java new file mode 100644 index 00000000..206ec1c5 --- /dev/null +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java @@ -0,0 +1,77 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.bridge; + +import org.objectweb.asm.commons.Remapper; +import org.spongepowered.asm.mixin.extensibility.IRemapper; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +public class RemapperAdapterFML extends RemapperAdapter { + + private final Method mdUnmap; + + private RemapperAdapterFML(Remapper remapper, Method mdUnmap) { + super(remapper); + this.logger.info("Initialised Mixin FML Remapper Adapter with {}", remapper); + this.mdUnmap = mdUnmap; + } + + @Override + public String unmap(String typeName) { + try { + return this.mdUnmap.invoke(this.remapper, typeName).toString(); + } catch (Exception ex) { + return typeName; + } + } + + public static IRemapper create() { + try { + Class clDeobfRemapper = RemapperAdapterFML.getFMLDeobfuscatingRemapper(); + Field singletonField = clDeobfRemapper.getDeclaredField("INSTANCE"); + Method mdUnmap = clDeobfRemapper.getDeclaredMethod("unmap", String.class); + Remapper remapper = (Remapper)singletonField.get(null); + return new RemapperAdapterFML(remapper, mdUnmap); + } catch (Exception ex) { + ex.printStackTrace(); + return null; + } + } + + /** + * Attempt to get the FML Deobfuscating Remapper, tries the post-1.8 + * namespace first and falls back to 1.7.10 if class lookup fails + */ + private static Class getFMLDeobfuscatingRemapper() throws ClassNotFoundException { + try { + return Class.forName("net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper"); + } catch (ClassNotFoundException ex) { + return Class.forName("cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper"); + } + } + +} diff --git a/src/main/java/org/spongepowered/asm/launch/IMixinLaunchAgent.java b/src/main/java/org/spongepowered/asm/launch/IMixinLaunchAgent.java index 4bf108b7..f9a08085 100644 --- a/src/main/java/org/spongepowered/asm/launch/IMixinLaunchAgent.java +++ b/src/main/java/org/spongepowered/asm/launch/IMixinLaunchAgent.java @@ -44,6 +44,13 @@ interface IMixinLaunchAgent { */ public abstract void prepare(); + /** + * Called from injectIntoClassLoader in the parent tweaker but + * only called on the primary tweak container. This is useful if the + * agent needs to perform some environment-specific setup just once. + */ + public abstract void initPrimaryContainer(); + /** * Called from injectIntoClassLoader in the parent tweaker * diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index be9b76d2..1a0dbeb7 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.9"; + public static final String VERSION = "0.4.10"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java index da7833a6..30747daa 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java @@ -24,6 +24,9 @@ */ package org.spongepowered.asm.launch; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.net.URI; @@ -33,6 +36,11 @@ import java.net.URI; */ public abstract class MixinLaunchAgentAbstract implements IMixinLaunchAgent { + /** + * Logger + */ + protected final Logger logger = LogManager.getLogger("mixin"); + /** * URI to the container */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java index 05afe077..c503c3e4 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java @@ -64,6 +64,10 @@ public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { } } } + + @Override + public void initPrimaryContainer() { + } @Override public void injectIntoClassLoader(LaunchClassLoader classLoader) { diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java index c39d1460..bdd86623 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java @@ -33,7 +33,8 @@ import java.util.List; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; - +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.extensibility.IRemapper; /** * Launch agent for use under FML. @@ -160,6 +161,28 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { @Override public void prepare() { } + + /* (non-Javadoc) + * @see org.spongepowered.asm.launch.IMixinLaunchAgent + * #initPrimaryContainer() + */ + @Override + public void initPrimaryContainer() { + if (this.clCoreModManager != null) { + this.injectRemapper(); + } + } + + private void injectRemapper() { + try { + Class clFmlRemapperAdapter = Class.forName("org.spongepowered.asm.bridge.RemapperAdapterFML", true, Launch.classLoader); + Method mdCreate = clFmlRemapperAdapter.getDeclaredMethod("create"); + IRemapper remapper = (IRemapper)mdCreate.invoke(null); + MixinEnvironment.getDefaultEnvironment().getRemappers().add(remapper); + } catch (Exception ex) { + this.logger.debug("Failed instancing remapper adapter for FML, things will probably go horribly for notch-obf'd mods!"); + } + } /* (non-Javadoc) * @see org.spongepowered.asm.launch.IMixinLaunchAgent diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java index 2bf79fa4..cf9eef3a 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java @@ -86,6 +86,13 @@ public class MixinTweakContainer { agent.prepare(); } } + + public void initPrimaryContainer() { + for (IMixinLaunchAgent agent : this.agents) { + this.logger.debug("Processing launch tasks for {}", agent); + agent.initPrimaryContainer(); + } + } /** * @param classLoader diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index 66677eaf..daba5586 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -63,6 +63,11 @@ public class MixinTweaker implements ITweaker { */ private final Map containers = new LinkedHashMap(); + /** + * Container for this tweaker + */ + private MixinTweakContainer primaryContainer; + /** * Tracks whether {@link #acceptOptions} was called yet, if true, causes new * launch agents to be prepared immediately @@ -80,16 +85,17 @@ public class MixinTweaker implements ITweaker { try { uri = this.getClass().getProtectionDomain().getCodeSource().getLocation().toURI(); if (uri != null) { - this.addContainer(uri); + this.primaryContainer = this.addContainer(uri); } } catch (URISyntaxException ex) { ex.printStackTrace(); } } - public final void addContainer(URI uri) { - if (this.containers.containsKey(uri)) { - return; + public final MixinTweakContainer addContainer(URI uri) { + MixinTweakContainer existingContainer = this.containers.get(uri); + if (existingContainer != null) { + return existingContainer; } MixinTweaker.logger.debug("Adding mixin launch agents for container {}", uri); @@ -99,6 +105,7 @@ public class MixinTweaker implements ITweaker { if (this.prepared) { container.prepare(); } + return container; } /* (non-Javadoc) @@ -136,6 +143,10 @@ public class MixinTweaker implements ITweaker { */ @Override public final void injectIntoClassLoader(LaunchClassLoader classLoader) { + if (this.primaryContainer != null) { + this.primaryContainer.initPrimaryContainer(); + } + this.scanClasspath(); MixinTweaker.logger.debug("injectIntoClassLoader running with {} agents", this.containers.size()); for (MixinTweakContainer container : this.containers.values()) { diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 20b7c325..de80faff 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -605,6 +605,11 @@ public class MixinEnvironment implements ITokenProvider { * Internal tokens defined by this environment */ private final Map internalTokens = new HashMap(); + + /** + * Remappers for this environment + */ + private final RemapperChain remappers = new RemapperChain(); /** * Detected side @@ -904,10 +909,20 @@ public class MixinEnvironment implements ITokenProvider { this.obfuscationContext = context; } + /** + * Get the current obfuscation context + */ public String getObfuscationContext() { return this.obfuscationContext; } + /** + * Get the remapper chain for this environment + */ + public RemapperChain getRemappers() { + return this.remappers; + } + /** * Invoke a mixin environment audit process */ diff --git a/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java b/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java new file mode 100644 index 00000000..117eed0b --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java @@ -0,0 +1,106 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +import java.util.ArrayList; +import java.util.List; + +import org.spongepowered.asm.mixin.extensibility.IRemapper; + +public class RemapperChain implements IRemapper { + + private final List remappers = new ArrayList(); + + public RemapperChain add(IRemapper remapper) { + this.remappers.add(remapper); + return this; + } + + @Override + public String mapMethodName(String owner, String name, String desc) { + for (IRemapper remapper : this.remappers) { + String newName = remapper.mapMethodName(owner, name, desc); + if (newName != null && !newName.equals(name)) { + name = newName; + } + } + return name; + } + + @Override + public String mapFieldName(String owner, String name, String desc) { + for (IRemapper remapper : this.remappers) { + String newName = remapper.mapFieldName(owner, name, desc); + if (newName != null && !newName.equals(name)) { + name = newName; + } + } + return name; + } + + @Override + public String map(String typeName) { + for (IRemapper remapper : this.remappers) { + String newName = remapper.map(typeName); + if (newName != null && !newName.equals(typeName)) { + typeName = newName; + } + } + return typeName; + } + + @Override + public String unmap(String typeName) { + for (IRemapper remapper : this.remappers) { + String newName = remapper.unmap(typeName); + if (newName != null && !newName.equals(typeName)) { + typeName = newName; + } + } + return typeName; + } + + @Override + public String mapDesc(String desc) { + for (IRemapper remapper : this.remappers) { + String newDesc = remapper.mapDesc(desc); + if (newDesc != null && !newDesc.equals(desc)) { + desc = newDesc; + } + } + return desc; + } + + @Override + public String unmapDesc(String desc) { + for (IRemapper remapper : this.remappers) { + String newDesc = remapper.unmapDesc(desc); + if (newDesc != null && !newDesc.equals(desc)) { + desc = newDesc; + } + } + return desc; + } +} diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IRemapper.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IRemapper.java new file mode 100644 index 00000000..69a412b0 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IRemapper.java @@ -0,0 +1,84 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.extensibility; + +/** + * Interface for remap chain participants + */ +public interface IRemapper { + + /** + * Map method name to the new name. Subclasses can override. + * + * @param owner owner of the method. + * @param name name of the method. + * @param desc descriptor of the method. + * @return new name of the method + */ + public abstract String mapMethodName(String owner, String name, String desc); + + /** + * Map field name to the new name. Subclasses can override. + * + * @param owner owner of the field. + * @param name name of the field + * @param desc descriptor of the field + * @return new name of the field. + */ + public abstract String mapFieldName(String owner, String name, String desc); + + /** + * Map type name to the new name. Subclasses can override. + * + * @param typeName Class name to convert + * @return new name for the class + */ + public abstract String map(String typeName); + + /** + * Convert a mapped type name back to the original obfuscated name + * + * @param typeName Class name to convert + * @return old name for the class + */ + public abstract String unmap(String typeName); + + /** + * Convert a descriptor to remapped form + * + * @param desc descriptor to convert + * @return new descriptor + */ + public abstract String mapDesc(String desc); + + /** + * Convert a descriptor back to the original obfuscated form + * + * @param desc descriptor to convert + * @return old descriptor + */ + public abstract String unmapDesc(String desc); + +} 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 0810d129..aa462e63 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 @@ -367,10 +367,10 @@ public class CallbackInjector extends Injector { // signature for the current locals. This allows silent failover // if changes to the local variable table are EXPECTED for some // reason. - MethodNode handler = ASMHelper.findMethod(this.classNode, this.methodNode.name, callback.getDescriptor()); - if (handler != null && ASMHelper.getVisibleAnnotation(handler, Surrogate.class) != null) { + MethodNode surrogateHandler = ASMHelper.findMethod(this.classNode, this.methodNode.name, callback.getDescriptor()); + if (surrogateHandler != null && ASMHelper.getVisibleAnnotation(surrogateHandler, Surrogate.class) != null) { // Found a matching method, use it - callbackMethod = handler; + callbackMethod = surrogateHandler; } else { // No matching method, generate a message to bitch about it String message = this.generateBadLVTMessage(callback); @@ -400,8 +400,14 @@ public class CallbackInjector extends Injector { throw new InvalidInjectionException(this.info, "Invalid descriptor on callback: CallbackInfoReturnable is required!"); } - throw new InvalidInjectionException(this.info, "Invalid descriptor on callback: expected " + callback.getDescriptor() - + " but found " + this.methodNode.desc); + MethodNode surrogateHandler = ASMHelper.findMethod(this.classNode, this.methodNode.name, callback.getDescriptor()); + if (surrogateHandler != null && ASMHelper.getVisibleAnnotation(surrogateHandler, Surrogate.class) != null) { + // Found a matching surrogate method, use it + callbackMethod = surrogateHandler; + } else { + throw new InvalidInjectionException(this.info, "Invalid descriptor on callback: expected " + callback.getDescriptor() + + " but found " + this.methodNode.desc); + } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 1b1cb758..5d4bf62c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -393,9 +393,7 @@ public class MemberInfo { /** * Create a new version of this member with a different owner * - * @param methodData Method data to use - * @param setOwner True to set the owner as well as the name - * @return New MethodInfo with remapped values + * @param newOwner New owner for this member */ public MemberInfo move(String newOwner) { if (newOwner.equals(this.owner)) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 3ac64fa6..ac3e1dcd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -1256,8 +1256,8 @@ public class ClassInfo extends TreeInfo { * of the existing class. Basically creates a cloned member with this * ClassInfo as its parent. * - * @param member - * @return + * @param member member to clone + * @return wrapper member */ @SuppressWarnings("unchecked") private M cloneMember(M member) { @@ -1402,8 +1402,8 @@ public class ClassInfo extends TreeInfo { * from the internal cache. Otherwise a new ClassInfo is created and * returned. * - * @param classNode - * @return + * @param classNode classNode to get info for + * @return ClassInfo instance for the supplied classNode */ static ClassInfo fromClassNode(ClassNode classNode) { ClassInfo info = ClassInfo.cache.get(classNode.name); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 1efe2b3f..65bb13fc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -518,7 +518,7 @@ public class MixinApplicator { * Finds a suitable ctor for reading the instance initialiser bytecode * * @param mixin mixin to search - * @return + * @return appropriate ctor or null if none found */ private MethodNode getConstructor(MixinTargetContext mixin) { MethodNode ctor = null; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 769da82d..8fe20f02 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -38,7 +38,9 @@ import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.RemapperChain; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; @@ -182,9 +184,13 @@ class MixinPreProcessor { if (!mustExist) { return false; } - - throw new InvalidMixinException(this.mixin, annotationType.getSimpleName() + " method " + mixinMethod.name - + " was not located in the target class"); + target = MixinPreProcessor.findRemappedMethod(context.getTargetClass(), mixinMethod); + if (target == null) { + throw new InvalidMixinException(this.mixin, annotationType.getSimpleName() + " method " + mixinMethod.name + + " was not located in the target class"); + } + mixinMethod.name = target.name; + method.renameTo(target.name); } if (Constants.INIT.equals(target.name)) { @@ -215,33 +221,39 @@ class MixinPreProcessor { context.transformDescriptor(mixinField); Field field = this.mixin.getClassInfo().findField(mixinField); - FieldNode target = this.findField(context.getTargetClass(), mixinField, shadow); + FieldNode target = MixinPreProcessor.findField(context.getTargetClass(), mixinField, shadow); if (target == null) { - // If this field is a shadow field but is NOT found in the target class, that's bad, mmkay - if (shadow != null) { + if (shadow == null) { + continue; + } + target = MixinPreProcessor.findRemappedField(context.getTargetClass(), mixinField); + if (target == null) { + // If this field is a shadow field but is NOT found in the target class, that's bad, mmkay throw new InvalidMixinException(this.mixin, "Shadow field " + mixinField.name + " was not located in the target class"); } - } else { - // Check that the shadow field has a matching descriptor - if (!target.desc.equals(mixinField.desc)) { - throw new InvalidMixinException(this.mixin, "The field " + mixinField.name + " in the target class has a conflicting signature"); + mixinField.name = target.name; + field.renameTo(target.name); + } + + // Check that the shadow field has a matching descriptor + if (!target.desc.equals(mixinField.desc)) { + throw new InvalidMixinException(this.mixin, "The field " + mixinField.name + " in the target class has a conflicting signature"); + } + + if (!target.name.equals(mixinField.name)) { + if ((target.access & Opcodes.ACC_PRIVATE) == 0 && (target.access & Opcodes.ACC_SYNTHETIC) == 0) { + throw new InvalidMixinException(this.mixin, "Non-private field cannot be aliased. Found " + target.name); } - if (!target.name.equals(mixinField.name)) { - if ((target.access & Opcodes.ACC_PRIVATE) == 0 && (target.access & Opcodes.ACC_SYNTHETIC) == 0) { - throw new InvalidMixinException(this.mixin, "Non-private field cannot be aliased. Found " + target.name); - } - - mixinField.name = target.name; - field.renameTo(target.name); - } - - // Shadow fields get stripped from the mixin class - iter.remove(); - - if (shadow != null) { - context.addShadowField(mixinField); - } + mixinField.name = target.name; + field.renameTo(target.name); + } + + // Shadow fields get stripped from the mixin class + iter.remove(); + + if (shadow != null) { + context.addShadowField(mixinField); } } } @@ -314,6 +326,19 @@ class MixinPreProcessor { return MixinPreProcessor.findMethod(classNode, aliases, method.desc); } + private static MethodNode findRemappedMethod(ClassNode classNode, MethodNode method) { + RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); + String remappedName = remapperChain.mapMethodName(classNode.name, method.name, method.desc); + if (remappedName.equals(method.name)) { + return null; + } + + Deque aliases = new LinkedList(); + aliases.add(remappedName); + + return MixinPreProcessor.findMethod(classNode, aliases, method.desc); + } + private static MethodNode findMethod(ClassNode classNode, Deque aliases, String desc) { String alias = aliases.poll(); if (alias == null) { @@ -329,7 +354,7 @@ class MixinPreProcessor { return MixinPreProcessor.findMethod(classNode, aliases, desc); } - private FieldNode findField(ClassNode classNode, FieldNode field, AnnotationNode shadow) { + private static FieldNode findField(ClassNode classNode, FieldNode field, AnnotationNode shadow) { Deque aliases = new LinkedList(); aliases.add(field.name); if (shadow != null) { @@ -339,9 +364,21 @@ class MixinPreProcessor { } } - return this.findField(classNode, aliases, field.desc); + return MixinPreProcessor.findField(classNode, aliases, field.desc); } + private static FieldNode findRemappedField(ClassNode classNode, FieldNode field) { + RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); + String remappedName = remapperChain.mapFieldName(classNode.name, field.name, field.desc); + if (remappedName.equals(field.name)) { + return null; + } + + Deque aliases = new LinkedList(); + aliases.add(remappedName); + return MixinPreProcessor.findField(classNode, aliases, field.desc); + } + /** * Finds a field in the target class * @@ -349,7 +386,7 @@ class MixinPreProcessor { * @param desc * @return Target field or null if not found */ - private FieldNode findField(ClassNode classNode, Deque aliases, String desc) { + private static FieldNode findField(ClassNode classNode, Deque aliases, String desc) { String alias = aliases.poll(); if (alias == null) { return null; @@ -361,6 +398,6 @@ class MixinPreProcessor { } } - return this.findField(classNode, aliases, desc); + return MixinPreProcessor.findField(classNode, aliases, desc); } } From b134940a19078d26eace3bce0b435123dfe3e8d1 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 19 Dec 2015 00:03:57 +0000 Subject: [PATCH 055/169] Fix stack calc error when inlining CallbackInfo ctor --- .../mixin/injection/callback/CallbackInjector.java | 13 ++++++++----- .../MixinTransformerModuleCheckClass.java | 7 ++++++- 2 files changed, 14 insertions(+), 6 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 aa462e63..1960c477 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 @@ -505,9 +505,11 @@ public class CallbackInjector extends Injector { callback.add(new TypeInsnNode(Opcodes.NEW, callback.target.callbackInfoClass), true, !store); callback.add(new InsnNode(Opcodes.DUP), true, true); - this.invokeCallbackInfoCtor(callback); + this.invokeCallbackInfoCtor(callback, store); if (store) { callback.add(new VarInsnNode(Opcodes.ASTORE, callback.marshallVar)); + } else if (callback.target.returnType != Type.VOID_TYPE) { + callback.invoke++; } } @@ -541,13 +543,14 @@ public class CallbackInjector extends Injector { /** * @param callback callback handle + * @param store true if storing in a local, false if this is happening at an invoke */ - protected void invokeCallbackInfoCtor(final Callback callback) { - callback.add(new LdcInsnNode(callback.target.method.name), true, false); - callback.add(new InsnNode(this.cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0), true, false); + protected void invokeCallbackInfoCtor(final Callback callback, boolean store) { + callback.add(new LdcInsnNode(callback.target.method.name), true, !store); + callback.add(new InsnNode(this.cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0), true, !store); if (callback.isAtReturn) { - callback.add(new VarInsnNode(callback.target.returnType.getOpcode(Opcodes.ILOAD), callback.marshallVar)); + callback.add(new VarInsnNode(callback.target.returnType.getOpcode(Opcodes.ILOAD), callback.marshallVar), true, !store); callback.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, callback.target.callbackInfoClass, Injector.CTOR, CallbackInfo.getConstructorDescriptor(callback.target.returnType), false)); } else { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java index 8aefa0b1..0a681032 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java @@ -53,7 +53,12 @@ public class MixinTransformerModuleCheckClass implements IMixinTransformerModule */ @Override public void postApply(String transformedName, ClassNode targetClass, SortedSet mixins) { - targetClass.accept(new CheckClassAdapter(new MixinClassWriter(ClassWriter.COMPUTE_FRAMES))); + try { + targetClass.accept(new CheckClassAdapter(new MixinClassWriter(ClassWriter.COMPUTE_FRAMES))); + } catch (RuntimeException ex) { + System.err.printf("%s\n", ex.getMessage()); + throw ex; + } } } From 769aac51e892129c3f5bd70045b269c4ad00633d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 19 Dec 2015 00:05:02 +0000 Subject: [PATCH 056/169] Use java.lang.Object ctor on CallbackInfoReturnable for array, fixes #83 --- .../asm/mixin/injection/callback/CallbackInfo.java | 2 +- .../asm/mixin/injection/callback/CallbackInfoReturnable.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java index fc3735a6..5c954ce7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java @@ -118,7 +118,7 @@ public class CallbackInfo implements Cancellable { return CallbackInfo.getConstructorDescriptor(); } - if (returnType.getSort() == Type.OBJECT) { + if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { return String.format("(%sZ%s)V", CallbackInfo.STRING, CallbackInfo.OBJECT); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java index b0e769e9..8d152a66 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java @@ -124,7 +124,7 @@ public class CallbackInfoReturnable extends CallbackInfo { // CHECKSTYLE:ON static String getReturnAccessor(Type returnType) { - if (returnType.getSort() == Type.OBJECT) { + if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { return "getReturnValue"; } @@ -132,7 +132,7 @@ public class CallbackInfoReturnable extends CallbackInfo { } static String getReturnDescriptor(Type returnType) { - if (returnType.getSort() == Type.OBJECT) { + if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { return String.format("()%s", CallbackInfo.OBJECT); } From d20698bd64b1e7d6ddca561ec7f995394a1100ee Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 19 Dec 2015 00:14:33 +0000 Subject: [PATCH 057/169] Fix licence and javadoc microderps --- .../java/org/spongepowered/asm/bridge/RemapperAdapter.java | 4 ++-- .../asm/mixin/injection/callback/CallbackInjector.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java index 08234ccd..ae12af4f 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java @@ -1,7 +1,7 @@ /* - * This file is part of Sponge, licensed under the MIT License (MIT). + * This file is part of Mixin, licensed under the MIT License (MIT). * - * Copyright (c) SpongePowered.org + * Copyright (c) SpongePowered * Copyright (c) contributors * * Permission is hereby granted, free of charge, to any person obtaining a copy 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 1960c477..974200d5 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 @@ -543,7 +543,8 @@ public class CallbackInjector extends Injector { /** * @param callback callback handle - * @param store true if storing in a local, false if this is happening at an invoke + * @param store true if storing in a local, false if this is happening at an + * invoke */ protected void invokeCallbackInfoCtor(final Callback callback, boolean store) { callback.add(new LdcInsnNode(callback.target.method.name), true, !store); From 087e3cfcfec895c95b2e3592d69037135f5a41b0 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 20 Dec 2015 22:57:35 +0000 Subject: [PATCH 058/169] Make ModifyArg and Redirect errors mention the handler name, fixes #84 --- .../asm/mixin/injection/invoke/InvokeInjector.java | 4 ++-- .../mixin/injection/invoke/ModifyArgInjector.java | 12 ++++++------ .../asm/mixin/injection/invoke/RedirectInjector.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index d6f2ea1d..7dc20ba6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -86,8 +86,8 @@ public abstract class InvokeInjector extends Injector { @Override protected void inject(Target target, AbstractInsnNode node) { if (!(node instanceof MethodInsnNode)) { - throw new InvalidInjectionException(this.info, this.annotationType + " annotation is targetting a non-method insn in " + target - + " in " + this.classNode.name); + throw new InvalidInjectionException(this.info, this.annotationType + " annotation on is targetting a non-method insn in " + target + + " in " + this.classNode.name + "/" + this.methodNode.name); } this.inject(target, (MethodInsnNode)node); 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 5a9de998..f76c33b3 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 @@ -76,7 +76,7 @@ public class ModifyArgInjector extends InvokeInjector { if (this.singleArgMode) { if (!this.methodArgs[0].equals(this.returnType)) { - throw new InvalidInjectionException(this.info, "@ModifyArg return type must match the parameter type." + throw new InvalidInjectionException(this.info, "@ModifyArg return type on " + this.methodNode.name + " must match the parameter type." + " ARG=" + this.methodArgs[0] + " RETURN=" + this.returnType); } } @@ -118,8 +118,8 @@ public class ModifyArgInjector extends InvokeInjector { */ private int injectMultiArgHandler(Target target, Type[] args, int argIndex, InsnList insns) { if (!Arrays.equals(args, this.methodArgs)) { - throw new InvalidInjectionException(this.info, "@ModifyArg method targets a method with an invalid signature " - + Injector.printArgs(args) + ", expected " + Injector.printArgs(this.methodArgs)); + throw new InvalidInjectionException(this.info, "@ModifyArg method " + this.methodNode.name + " targets a method with an invalid" + + " signature " + Injector.printArgs(args) + ", expected " + Injector.printArgs(this.methodArgs)); } int[] argMap = this.storeArgs(target, args, insns, 0); @@ -133,7 +133,7 @@ public class ModifyArgInjector extends InvokeInjector { if (this.index > -1) { if (this.index >= args.length || !args[this.index].equals(this.returnType)) { throw new InvalidInjectionException(this.info, "Specified index " + this.index + " for @ModifyArg is invalid for args " - + Injector.printArgs(args) + ", expected " + this.returnType); + + Injector.printArgs(args) + ", expected " + this.returnType + " on " + this.methodNode.name); } return this.index; } @@ -147,7 +147,7 @@ public class ModifyArgInjector extends InvokeInjector { if (argIndex != -1) { throw new InvalidInjectionException(this.info, "Found duplicate args with index [" + argIndex + ", " + arg + "] matching type " - + this.returnType + " for @ModifyArg target " + target + " in " + this.classNode.name + + this.returnType + " for @ModifyArg target " + target + " in " + this.classNode.name + "/" + this.methodNode.name + ". Please specify index of desired arg."); } @@ -156,7 +156,7 @@ public class ModifyArgInjector extends InvokeInjector { if (argIndex == -1) { throw new InvalidInjectionException(this.info, "Could not find arg matching type " + this.returnType + " for @ModifyArg target " - + target + " in " + this.classNode.name); + + target + " in " + this.classNode.name + "/" + this.methodNode.name); } return argIndex; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index f17302db..91ec7da1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -90,7 +90,7 @@ public class RedirectInjector extends InvokeInjector { if (alternateDesc.equals(this.methodNode.desc)) { injectTargetParams = true; } else { - throw new InvalidInjectionException(this.info, "@Redirect handler method has an invalid signature " + throw new InvalidInjectionException(this.info, "@Redirect handler method " + this.methodNode.name + " has an invalid signature " + ", expected " + desc + " found " + this.methodNode.desc); } } From 12d76f72e303d0828de5bce3fc7452a612814957 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 21 Dec 2015 00:33:34 +0000 Subject: [PATCH 059/169] Need srg2source in the pom because of the AP, derp! --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 40018b25..2edc26ce 100644 --- a/build.gradle +++ b/build.gradle @@ -347,7 +347,7 @@ uploadArchives { } whenConfigured { dependencies = dependencies.findAll { - !it.artifactId.matches('^(fernflower|asm-commons|Srg2Source|jarjar|junit|mockito-core|hamcrest-library)$') + !it.artifactId.matches('^(fernflower|asm-commons|jarjar|junit|mockito-core|hamcrest-library)$') } } } @@ -358,7 +358,7 @@ uploadArchives { install.repositories.mavenInstaller.pom { whenConfigured { dependencies = dependencies.findAll { - !it.artifactId.matches('^(fernflower|asm-commons|Srg2Source|jarjar|junit|mockito-core|hamcrest-library)$') + !it.artifactId.matches('^(fernflower|asm-commons|jarjar|junit|mockito-core|hamcrest-library)$') } } } From 752e5e8a3ea79b403731c27173edc1dc1a1fb5f4 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 21 Dec 2015 23:27:27 +0000 Subject: [PATCH 060/169] Slight improvement to signature validation, fixes @gabizou --- .../asm/mixin/injection/struct/MemberInfo.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 5d4bf62c..4f904c93 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -282,8 +282,17 @@ public class MemberInfo { */ public MemberInfo validate() throws InvalidMemberDescriptorException { // Extremely naive class name validation, just to spot really egregious errors - if (this.owner != null && !this.owner.matches("(?i)^[\\w\\p{Sc}/]+$")) { - throw new InvalidMemberDescriptorException("Invalid owner: " + this.owner); + if (this.owner != null) { + if (!this.owner.matches("(?i)^[\\w\\p{Sc}/]+$")) { + throw new InvalidMemberDescriptorException("Invalid owner: " + this.owner); + } + try { + if (!this.owner.equals(Type.getType(this.owner).getDescriptor())) { + throw new InvalidMemberDescriptorException("Invalid owner type specified: " + this.owner); + } + } catch (Exception ex) { + throw new InvalidMemberDescriptorException("Invalid owner type specified: " + this.owner); + } } // Also naive validation, we're looking for stupid errors here From fd495c58db8ac07b583ddab300f41e0cd8023535 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 12:44:42 +0000 Subject: [PATCH 061/169] Fix classpath for IDE --- build.gradle | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2edc26ce..cd088158 100644 --- a/build.gradle +++ b/build.gradle @@ -169,7 +169,6 @@ dependencies { agentCompile 'net.minecraft:launchwrapper:1.11' // asm bridge - compile 'org.ow2.asm:asm-commons:5.0.3' bridgeCompile 'org.ow2.asm:asm-commons:5.0.3' bridgeCompile 'org.apache.logging.log4j:log4j-core:2.0-beta9' } @@ -271,6 +270,14 @@ shadowJar { } build.dependsOn(shadowJar) +//task bridgeJar(type: Jar) { +// from sourceSets.bridge.output +// from file("D:\\Development\\SSD\\Sponge\\new\\Mixin\\build\\classes\\main\\org\\spongepowered\\asm\\mixin\\transformer\\MixinPreProcessor.class") +// rename "MixinPreProcessor.class", "org/spongepowered/asm/mixin/transformer/MixinPreProcessor.class" +// archiveName = "mixinbridge-0.4.10.jar" +// destinationDir = new File("D:\\Development\\SSD\\.minecraft\\libraries\\org\\spongepowered\\mixinbridge\\0.4.10") +//} + // Run this task instead of build to generate a timestamped shadow jar (for dev) task timestamp(type: Jar, dependsOn: build) { if (gradle.startParameter.taskNames.contains(name)) { @@ -347,7 +354,7 @@ uploadArchives { } whenConfigured { dependencies = dependencies.findAll { - !it.artifactId.matches('^(fernflower|asm-commons|jarjar|junit|mockito-core|hamcrest-library)$') + !it.artifactId.contains('fernflower') } } } @@ -358,7 +365,7 @@ uploadArchives { install.repositories.mavenInstaller.pom { whenConfigured { dependencies = dependencies.findAll { - !it.artifactId.matches('^(fernflower|asm-commons|jarjar|junit|mockito-core|hamcrest-library)$') + !it.artifactId.contains('fernflower') } } } From 6b43ea7de68f4526d566c65b2b5b0e11873f4ec5 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 12:45:36 +0000 Subject: [PATCH 062/169] Export transformed class even if verification fails to allow inspection --- .../mixin/transformer/MixinTransformer.java | 18 ++++++++++++---- .../MixinTransformerModuleCheckClass.java | 21 +++++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) 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 7c93d195..c1d9a6c7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -37,9 +37,6 @@ import java.util.TreeSet; import java.util.UUID; import java.util.regex.Pattern; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.Launch; - import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -55,11 +52,16 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler.ErrorAction; +import org.spongepowered.asm.mixin.transformer.MixinTransformerModuleCheckClass.ValidationFailedException; import org.spongepowered.asm.mixin.transformer.debug.IDecompiler; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; +import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.transformers.TreeTransformer; import org.spongepowered.asm.util.Constants; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.Launch; + /** * Transformer which manages the mixin configuration and application process */ @@ -615,7 +617,15 @@ public class MixinTransformer extends TreeTransformer { this.preApply(transformedName, targetClass, mixins); this.apply(transformedName, targetClass, mixins); - this.postApply(transformedName, targetClass, mixins); + try { + this.postApply(transformedName, targetClass, mixins); + } catch (ValidationFailedException ex) { + this.logger.info(ex.getMessage()); + // If verify is enabled and failed, write out the bytecode to allow us to inspect it + if (MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_EXPORT)) { + this.writeClass(transformedName, targetClass); + } + } return this.writeClass(transformedName, targetClass); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java index 0a681032..754a0ea9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java @@ -36,6 +36,24 @@ import org.spongepowered.asm.lib.util.CheckClassAdapter; * bytecode */ public class MixinTransformerModuleCheckClass implements IMixinTransformerModule { + + public static class ValidationFailedException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public ValidationFailedException(String message, Throwable cause) { + super(message, cause); + } + + public ValidationFailedException(String message) { + super(message); + } + + public ValidationFailedException(Throwable cause) { + super(cause); + } + + } /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinTransformerModule @@ -56,8 +74,7 @@ public class MixinTransformerModuleCheckClass implements IMixinTransformerModule try { targetClass.accept(new CheckClassAdapter(new MixinClassWriter(ClassWriter.COMPUTE_FRAMES))); } catch (RuntimeException ex) { - System.err.printf("%s\n", ex.getMessage()); - throw ex; + throw new ValidationFailedException(ex.getMessage(), ex); } } From 34402ab33ce261bde9d5e429e92bea575fce4577 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 12:46:09 +0000 Subject: [PATCH 063/169] 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) { From 99c07dcfc900f7a9054ca319050d4baef42e5f7c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 13:53:41 +0000 Subject: [PATCH 064/169] Add require and expect metrics to injectors, allows injector validation --- .../asm/mixin/MixinEnvironment.java | 19 +++++--- .../asm/mixin/injection/Inject.java | 35 ++++++++++++++ .../asm/mixin/injection/ModifyArg.java | 36 ++++++++++++++ .../asm/mixin/injection/Redirect.java | 36 ++++++++++++++ .../injection/callback/CallbackInjector.java | 2 +- .../asm/mixin/injection/code/Injector.java | 16 +++++-- .../mixin/injection/struct/InjectionInfo.java | 47 +++++++++++++++++++ 7 files changed, 180 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index de80faff..3b327796 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -36,12 +36,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.minecraft.launchwrapper.IClassNameTransformer; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -53,6 +47,7 @@ import org.apache.logging.log4j.core.helpers.Booleans; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.asm.util.JavaVersion; @@ -61,6 +56,12 @@ import org.spongepowered.asm.util.PrettyPrinter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; +import net.minecraft.launchwrapper.IClassNameTransformer; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; + /** * The mixin environment manages global state information for the mixin @@ -283,6 +284,12 @@ public class MixinEnvironment implements ITokenProvider { */ DEBUG_VERBOSE(Option.DEBUG_ALL, "verbose"), + /** + * Elevates failed injections to an error condition, see + * {@link Inject#expect} for details + */ + DEBUG_INJECTORS(Option.DEBUG_ALL, "countInjections"), + /** * Dumps the bytecode for the target class to disk when mixin * application fails diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java index d49b4c16..f9096e7e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java @@ -29,6 +29,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @@ -128,4 +129,38 @@ public @interface Inject { * obfuscation mappings for this annotation */ public boolean remap() default true; + + /** + * In general, injectors are intended to "fail soft" in that a failure to + * locate the injection point in the target method is not considered an + * error condition. Another transformer may have changed the method + * structure or any number of reasons may cause an injection to fail. This + * also makes it possible to define several injections to achieve the same + * task given expected mutation of the target class and the + * injectors which fail are simply ignored. + * + *

However, this behaviour is not always desirable. For example, if your + * application depends on a particular injection succeeding you may wish to + * detect the injection failure as an error condition. This argument is thus + * provided to allow you to stipulate a minimum number of successful + * injections for this callback handler. If the number of injections + * specified is not achieved then an {@link InjectionError} is thrown at + * application time. Use this option with care.

+ * + * @return Minimum required number of injected callbacks, default 0 + */ + public int require() default 0; + + /** + * Like {@link #require()} but only enabled if the + * {@link Option#DEBUG_INJECTORS mixin.debug.countInjections} option is set + * to true and defaults to 1. Use this option during debugging to + * perform simple checking of your injectors. Causes the injector to throw + * a {@link InvalidInjectionException} if the expected number of injections + * is not realised. + * + * @return Minimum number of expected callbacks, default 1 + */ + public int expect() default 1; + } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java index 0ce6f5da..a18e8e3f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java @@ -29,6 +29,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; + /** * Specifies that this mixin method should inject an argument modifier to itself * in the target method(s) identified by {@link #method}. @@ -86,4 +88,38 @@ public @interface ModifyArg { * obfuscation mappings for this annotation */ public boolean remap() default true; + + /** + * In general, injectors are intended to "fail soft" in that a failure to + * locate the injection point in the target method is not considered an + * error condition. Another transformer may have changed the method + * structure or any number of reasons may cause an injection to fail. This + * also makes it possible to define several injections to achieve the same + * task given expected mutation of the target class and the + * injectors which fail are simply ignored. + * + *

However, this behaviour is not always desirable. For example, if your + * application depends on a particular injection succeeding you may wish to + * detect the injection failure as an error condition. This argument is thus + * provided to allow you to stipulate a minimum number of successful + * injections for this callback handler. If the number of injections + * specified is not achieved then an {@link InjectionError} is thrown at + * application time. Use this option with care.

+ * + * @return Minimum required number of injected callbacks, default 0 + */ + public int require() default 0; + + /** + * Like {@link #require()} but only enabled if the + * {@link Option#DEBUG_INJECTORS mixin.debug.countInjections} option is set + * to true and defaults to 1. Use this option during debugging to + * perform simple checking of your injectors. Causes the injector to throw + * a {@link InvalidInjectionException} if the expected number of injections + * is not realised. + * + * @return Minimum number of expected callbacks, default 1 + */ + public int expect() default 1; + } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java index 19198901..1fc1ac95 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java @@ -29,6 +29,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; + /** *

Specifies that this mixin method should redirect the specified * {@link #method} call to the method decorated with this annotation.

@@ -108,4 +110,38 @@ public @interface Redirect { * obfuscation mappings for this annotation */ public boolean remap() default true; + + /** + * In general, injectors are intended to "fail soft" in that a failure to + * locate the injection point in the target method is not considered an + * error condition. Another transformer may have changed the method + * structure or any number of reasons may cause an injection to fail. This + * also makes it possible to define several injections to achieve the same + * task given expected mutation of the target class and the + * injectors which fail are simply ignored. + * + *

However, this behaviour is not always desirable. For example, if your + * application depends on a particular injection succeeding you may wish to + * detect the injection failure as an error condition. This argument is thus + * provided to allow you to stipulate a minimum number of successful + * injections for this callback handler. If the number of injections + * specified is not achieved then an {@link InjectionError} is thrown at + * application time. Use this option with care.

+ * + * @return Minimum required number of injected callbacks, default 0 + */ + public int require() default 0; + + /** + * Like {@link #require()} but only enabled if the + * {@link Option#DEBUG_INJECTORS mixin.debug.countInjections} option is set + * to true and defaults to 1. Use this option during debugging to + * perform simple checking of your injectors. Causes the injector to throw + * a {@link InvalidInjectionException} if the expected number of injections + * is not realised. + * + * @return Minimum number of expected callbacks, default 1 + */ + public int expect() default 1; + } 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 fde13221..a5c02860 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 @@ -580,7 +580,7 @@ public class CallbackInjector extends Injector { } // Call the callback! - this.invokeMethod(callback, callbackMethod); + this.invokeHandler(callback, callbackMethod); } /** 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 e6ff2041..3c6f754e 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 @@ -148,13 +148,21 @@ public abstract class Injector { * @param insns Instruction list to inject into */ protected void invokeHandler(InsnList insns) { - this.invokeMethod(insns, this.methodNode); + this.invokeHandler(insns, this.methodNode); } - protected void invokeMethod(InsnList insns, MethodNode methodNode) { - boolean isPrivate = (methodNode.access & Opcodes.ACC_PRIVATE) != 0; + /** + * Invoke a handler method + * + * @param insns Instruction list to inject into + * @param handler Actual method to invoke (may be different if using a + * surrogate) + */ + protected void invokeHandler(InsnList insns, MethodNode handler) { + boolean isPrivate = (handler.access & Opcodes.ACC_PRIVATE) != 0; int invokeOpcode = this.isStatic ? Opcodes.INVOKESTATIC : isPrivate ? Opcodes.INVOKESPECIAL : Opcodes.INVOKEVIRTUAL; - insns.add(new MethodInsnNode(invokeOpcode, this.classNode.name, methodNode.name, methodNode.desc, false)); + insns.add(new MethodInsnNode(invokeOpcode, this.classNode.name, handler.name, handler.desc, false)); + this.info.addCallbackInvocation(handler); } protected static String printArgs(Type[] args) { 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 a3880925..cb78700c 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 @@ -34,7 +34,10 @@ import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.InjectionError; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.ModifyArg; @@ -96,6 +99,21 @@ public abstract class InjectionInfo { */ private final List injectedMethods = new ArrayList(0); + /** + * Number of callbacks we expect to inject into targets + */ + private int expectedCallbackCount = 1; + + /** + * Number of callbacks we require injected + */ + private int requiredCallbackCount = 0; + + /** + * Actual number of injected callbacks + */ + private int injectedCallbackCount = 0; + /** * ctor * @@ -159,6 +177,16 @@ public abstract class InjectionInfo { } } + Integer expect = ASMHelper.getAnnotationValue(this.annotation, "expect"); + if (expect != null) { + this.expectedCallbackCount = expect.intValue(); + } + + Integer require = ASMHelper.getAnnotationValue(this.annotation, "require"); + if (require != null) { + this.requiredCallbackCount = require.intValue(); + } + this.injector = this.initInjector(this.annotation); } @@ -192,6 +220,16 @@ public abstract class InjectionInfo { for (MethodNode method : this.injectedMethods) { this.classNode.methods.add(method); } + + if ((MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_INJECTORS) && this.injectedCallbackCount < this.expectedCallbackCount)) { + throw new InvalidInjectionException(this, + String.format("Injection validation failed: Callback method %s%s in %s expected %d invocation(s) but %d succeeded", + this.method.name, this.method.desc, this.mixin, this.expectedCallbackCount, this.injectedCallbackCount)); + } else if (this.injectedCallbackCount < this.requiredCallbackCount) { + throw new InjectionError( + String.format("Critical injection failure: Callback method %s%s in %s failed injection check, (%d/%d) succeeded", + this.method.name, this.method.desc, this.mixin, this.injectedCallbackCount, this.requiredCallbackCount)); + } } /** @@ -254,6 +292,15 @@ public abstract class InjectionInfo { return method; } + /** + * Notify method, called by injector when adding a callback into a target + * + * @param handler callback handler being invoked + */ + public void addCallbackInvocation(MethodNode handler) { + this.injectedCallbackCount++; + } + /** * Finds methods in the target class which match searchFor * From d605e28da63744c7113d2c6caf096a5078714123 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 14:56:51 +0000 Subject: [PATCH 065/169] Fix NPE --- .../spongepowered/asm/mixin/transformer/MixinInfo.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 9ce92e85..94dd3afb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -229,6 +229,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * The environment phase in which this mixin was initialised */ private final transient Phase phase; + + /** + * Cached class info + */ + private final transient ClassInfo info; /** * Holds state that currently is not fully initialised or validated @@ -239,7 +244,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Holds the current validated state */ private transient ValidationState validationState; - + /** * Internal ctor, called by {@link MixinConfig} * @@ -261,6 +266,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { // Read the class bytes and transform byte[] mixinBytes = this.loadMixinClass(this.className, runTransformers); this.uninitialisedState = new ValidationState(mixinBytes); + this.info = this.uninitialisedState.classInfo; ClassNode classNode = this.uninitialisedState.getClassNode(0); this.priority = this.readPriority(classNode); @@ -478,7 +484,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } ClassInfo getClassInfo() { - return this.getCurrentState().classInfo; + return this.info; } /** From b0f2db09de126eb8abc7a239d3adf12a7511ea64 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 16:06:37 +0000 Subject: [PATCH 066/169] Fix traversal and mixin-is-own-parent detection, fixes @Deamon5550 --- .../asm/mixin/transformer/ClassInfo.java | 32 +++++++++++++++++-- .../asm/mixin/transformer/MixinInfo.java | 13 +++++++- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index ac3e1dcd..d44d9767 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -692,6 +692,13 @@ public class ClassInfo extends TreeInfo { public String getName() { return this.name; } + + /** + * Get the class name (java format) + */ + public String getClassName() { + return this.name.replace('/', '.'); + } /** * Get the superclass name (binary name) @@ -880,6 +887,8 @@ public class ClassInfo extends TreeInfo { public ClassInfo findSuperClass(String superClass) { return this.findSuperClass(superClass, Traversal.NONE); } + + public static boolean b; /** * Search for the specified superclass in this class's hierarchy. If found @@ -890,6 +899,14 @@ public class ClassInfo extends TreeInfo { * @return Matched superclass or null if not found */ public ClassInfo findSuperClass(String superClass, Traversal traversal) { + if (ClassInfo.OBJECT.name == superClass) { + return null; + } + + return this.findSuperClass(superClass, traversal, new HashSet()); + } + + private ClassInfo findSuperClass(String superClass, Traversal traversal, Set traversed) { ClassInfo superClassInfo = this.getSuperClass(); if (superClassInfo != null) { List targets = superClassInfo.getTargets(); @@ -898,16 +915,25 @@ public class ClassInfo extends TreeInfo { return superClassInfo; } - ClassInfo found = superTarget.findSuperClass(superClass, traversal.next()); + ClassInfo found = superTarget.findSuperClass(superClass, traversal.next(), traversed); if (found != null) { return found; } } } - + if (traversal.canTraverse()) { for (MixinInfo mixin : this.mixins) { - ClassInfo targetSuper = mixin.getClassInfo().findSuperClass(superClass, traversal); + String mixinClassName = mixin.getClassName(); + if (traversed.contains(mixinClassName)) { + continue; + } + traversed.add(mixinClassName); + ClassInfo mixinClass = mixin.getClassInfo(); + if (superClass.equals(mixinClass.getName())) { + return mixinClass; + } + ClassInfo targetSuper = mixinClass.findSuperClass(superClass, Traversal.ALL, traversed); if (targetSuper != null) { return targetSuper; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 94dd3afb..86bce5d9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -377,7 +377,18 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { continue; } - if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.IMMEDIATE)) { + if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.SUPER)) { + ClassInfo superClass = ClassInfo.forName(classNode.superName); + if (superClass.isMixin()) { + // If superclass is a mixin, check for hierarchy derp + for (ClassInfo superTarget : superClass.getTargets()) { + if (this.targetClasses.contains(superTarget)) { + throw new InvalidMixinException(this, "Illegal hierarchy detected. Derived mixin " + this + " targets the same class " + + superTarget.getClassName() + " as its superclass " + superClass.getClassName()); + } + } + } + throw new InvalidMixinException(this, "Super class '" + classNode.superName.replace('/', '.') + "' of " + this.name + " was not found in the hierarchy of target class '" + targetClass + "'"); } From 7f6b2c6fbbcfb3a3b41052709f34632a37475809 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 16:21:57 +0000 Subject: [PATCH 067/169] Remove debug flag --- .../java/org/spongepowered/asm/mixin/transformer/ClassInfo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index d44d9767..492f230d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -887,8 +887,6 @@ public class ClassInfo extends TreeInfo { public ClassInfo findSuperClass(String superClass) { return this.findSuperClass(superClass, Traversal.NONE); } - - public static boolean b; /** * Search for the specified superclass in this class's hierarchy. If found From 14f3f403dd3e7e3b29d117324e3ba499ce4e7ad7 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 23 Dec 2015 01:05:10 +0000 Subject: [PATCH 068/169] Ignore class transformers decorated with Resource, updates #86 --- .../java/org/spongepowered/asm/mixin/MixinEnvironment.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 3b327796..a8d153a3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -36,6 +36,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.annotation.Resource; + import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -1003,7 +1005,8 @@ public class MixinEnvironment implements ITokenProvider { break; } } - if (include && !transformerName.contains(MixinTransformer.class.getName())) { + boolean ignoreTransformer = transformer.getClass().getAnnotation(Resource.class) != null; + if (include && !ignoreTransformer && !transformerName.contains(MixinTransformer.class.getName())) { MixinEnvironment.logger.debug(" Adding: {}", transformerName); this.transformers.add(transformer); } else { From 50b9deff2a0f2ed0026b6b803739ec2c04226677 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 31 Dec 2015 11:34:18 +0000 Subject: [PATCH 069/169] Don't crash on missing interfaces when resolving static bindings (temp) --- .../org/spongepowered/asm/mixin/transformer/ClassInfo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 492f230d..c5676683 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -1262,7 +1262,9 @@ public class ClassInfo extends TreeInfo { for (String implemented : this.interfaces) { ClassInfo iface = ClassInfo.forName(implemented); if (iface == null) { - throw new RuntimeException(new ClassNotFoundException(implemented)); + ClassInfo.logger.debug("Failed to resolve declared interface {} on {}", implemented, this.name); + continue; +// throw new RuntimeException(new ClassNotFoundException(implemented)); } M member = iface.findInHierarchy(name, desc, true, traversal.next(), flags & ~ClassInfo.INCLUDE_PRIVATE, type); if (member != null) { From a16bcf3dd96fcf7f706598db5d9489e1dd4f0412 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 3 Jan 2016 01:09:27 +0000 Subject: [PATCH 070/169] Fix Interface Checker logic for java 8 --- .../transformer/MixinTransformerModuleInterfaceChecker.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java index 4643f620..58cc951a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java @@ -125,7 +125,8 @@ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformer for (Method method : interfaceMethods) { Method found = targetClassInfo.findMethodInHierarchy(method.getName(), method.getDesc(), true, Traversal.ALL); - if (found != null) { + // If method IS found and IS implemented, then do nothing (don't print an error) + if (found != null && !found.isAbstract()) { continue; } From 853f7bde441b7e90b27e59176dd8f9970ac8489b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 4 Jan 2016 12:02:32 +0000 Subject: [PATCH 071/169] Remove debugging jar cruft --- build.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build.gradle b/build.gradle index cd088158..c5643e11 100644 --- a/build.gradle +++ b/build.gradle @@ -270,14 +270,6 @@ shadowJar { } build.dependsOn(shadowJar) -//task bridgeJar(type: Jar) { -// from sourceSets.bridge.output -// from file("D:\\Development\\SSD\\Sponge\\new\\Mixin\\build\\classes\\main\\org\\spongepowered\\asm\\mixin\\transformer\\MixinPreProcessor.class") -// rename "MixinPreProcessor.class", "org/spongepowered/asm/mixin/transformer/MixinPreProcessor.class" -// archiveName = "mixinbridge-0.4.10.jar" -// destinationDir = new File("D:\\Development\\SSD\\.minecraft\\libraries\\org\\spongepowered\\mixinbridge\\0.4.10") -//} - // Run this task instead of build to generate a timestamped shadow jar (for dev) task timestamp(type: Jar, dependsOn: build) { if (gradle.startParameter.taskNames.contains(name)) { From 30e2530d340d7761189fa0cae343c4a18d22e6d8 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 7 Jan 2016 14:16:57 +0000 Subject: [PATCH 072/169] Add support for validating overwrite annotation javadoc decoration --- .../tools/obfuscation/AnnotatedMixin.java | 19 ++++++++++++++++++ .../tools/obfuscation/AnnotatedMixins.java | 11 ++++++++++ .../tools/obfuscation/SupportedOptions.java | 20 +++++++++++-------- .../TargetObfuscationEnvironment.java | 2 +- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 11807aaa..3473619c 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -466,6 +466,25 @@ class AnnotatedMixin { String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); this.addMethodMapping(type, mcpName, obfName, mcpSignature, obfMethod.sig); } + + if ("true".equalsIgnoreCase(this.mixins.getOption(SupportedOptions.DISABLE_OVERWRITE_CHECKER))) { + Kind overwriteErrorKind = "error".equalsIgnoreCase(this.mixins.getOption(SupportedOptions.OVERWRITE_ERROR_LEVEL)) + ? Kind.ERROR : Kind.WARNING; + + String javadoc = this.mixins.getJavadoc(method); + if (javadoc == null) { + this.mixins.printMessage(overwriteErrorKind, "@Overwrite is missing javadoc comment", method); + return; + } + + if (!javadoc.toLowerCase().contains("@author")) { + this.mixins.printMessage(overwriteErrorKind, "@Overwrite is missing an @author tag", method); + } + + if (!javadoc.toLowerCase().contains("@reason")) { + this.mixins.printMessage(overwriteErrorKind, "@Overwrite is missing an @reason tag", method); + } + } } /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 4dbe5d36..0f59555f 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -662,6 +662,17 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return null; } + /** + * Get javadoc on element + * + * @param element Element to fetch javadoc for + * @return javadoc + */ + public String getJavadoc(Element element) { + Elements elements = this.processingEnv.getElementUtils(); + return elements.getDocComment(element); + } + /** * Get the mixin manager instance for this environment */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index 7ca77842..aef3103f 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -30,14 +30,16 @@ import com.google.common.collect.ImmutableSet; public final class SupportedOptions { - public static final String REOBF_SRG_FILE = "reobfSrgFile"; - public static final String REOBF_NOTCH_FILE = "reobfNotchSrgFile"; - public static final String OUT_SRG_SRG_FILE = "outSrgFile"; - public static final String OUT_NOTCH_SRG_FILE = "outNotchSrgFile"; - public static final String OUT_REFMAP_FILE = "outRefMapFile"; - public static final String DISABLE_TARGET_VALIDATOR = "disableTargetValidator"; - public static final String DISABLE_TARGET_EXPORT = "disableTargetExport"; - public static final String DEFAULT_OBFUSCATION_ENV = "defaultObfuscationEnv"; + public static final String REOBF_SRG_FILE = "reobfSrgFile"; + public static final String REOBF_NOTCH_FILE = "reobfNotchSrgFile"; + public static final String OUT_SRG_SRG_FILE = "outSrgFile"; + public static final String OUT_NOTCH_SRG_FILE = "outNotchSrgFile"; + public static final String OUT_REFMAP_FILE = "outRefMapFile"; + public static final String DISABLE_TARGET_VALIDATOR = "disableTargetValidator"; + public static final String DISABLE_TARGET_EXPORT = "disableTargetExport"; + public static final String DISABLE_OVERWRITE_CHECKER = "disableOverwriteChecker"; + public static final String OVERWRITE_ERROR_LEVEL = "overwriteErrorLevel"; + public static final String DEFAULT_OBFUSCATION_ENV = "defaultObfuscationEnv"; public static final Set all = ImmutableSet.of( SupportedOptions.REOBF_SRG_FILE, @@ -47,6 +49,8 @@ public final class SupportedOptions { SupportedOptions.OUT_REFMAP_FILE, SupportedOptions.DISABLE_TARGET_VALIDATOR, SupportedOptions.DISABLE_TARGET_EXPORT, + SupportedOptions.DISABLE_OVERWRITE_CHECKER, + SupportedOptions.OVERWRITE_ERROR_LEVEL, SupportedOptions.DEFAULT_OBFUSCATION_ENV ); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 79aeea51..ebb40b20 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -156,7 +156,7 @@ class TargetObfuscationEnvironment { // Get a type handle for the declared method owner TypeHandle type = this.typeProvider.getTypeHandle(method.owner); - if (type.isImaginary()) { + if (type == null || type.isImaginary()) { return null; } From fb2360cce77c47491ee325b1f93957472cee2042 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 7 Jan 2016 16:29:58 +0000 Subject: [PATCH 073/169] Add refmapper debugging/runtime flags --- .../asm/mixin/MixinEnvironment.java | 33 ++++++++++++++++++- .../injection/struct/ReferenceMapper.java | 16 +++++++-- .../asm/mixin/transformer/MixinConfig.java | 5 ++- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index a8d153a3..7cf9976b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -317,7 +317,27 @@ public class MixinEnvironment implements ITokenProvider { /** * Enables the hot-swap agent */ - HOT_SWAP("hotSwap"); + HOT_SWAP("hotSwap"), + + /** + * Parent for environment settings + */ + ENVIRONMENT("env") { + @Override + boolean getBooleanValue() { + return false; + } + }, + + /** + * Force refmap obf type when required + */ + OBFUSCATION_TYPE(Option.ENVIRONMENT, "obf"), + + /** + * Disable refmap when required + */ + DISABLE_REFMAP(Option.ENVIRONMENT, "disableRefMap"); /** * Prefix for mixin options @@ -925,6 +945,17 @@ public class MixinEnvironment implements ITokenProvider { return this.obfuscationContext; } + /** + * Get the current obfuscation context + */ + public String getRefmapObfuscationContext() { + String overrideObfuscationType = Option.OBFUSCATION_TYPE.getStringValue(); + if (overrideObfuscationType != null) { + return overrideObfuscationType; + } + return this.obfuscationContext; + } + /** * Get the remapper chain for this environment */ diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java index 47c5e3ad..7be5e8f1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java @@ -38,18 +38,27 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; public final class ReferenceMapper implements Serializable { - + private static final long serialVersionUID = 2L; public static final String DEFAULT_RESOURCE = "mixin.refmap.json"; + public static final ReferenceMapper DEFAULT_MAPPER = new ReferenceMapper(true); + private final Map> mappings = Maps.newHashMap(); private final Map>> data = Maps.newHashMap(); + private final transient boolean readOnly; + private transient String context = null; public ReferenceMapper() { + this(false); + } + + private ReferenceMapper(boolean readOnly) { + this.readOnly = readOnly; } public String getContext() { @@ -93,6 +102,9 @@ public final class ReferenceMapper implements Serializable { } public void addMapping(String context, String className, String reference, String newReference) { + if (this.readOnly) { + return; + } Map> mappings = this.mappings; if (context != null) { mappings = this.data.get(context); @@ -119,7 +131,7 @@ public final class ReferenceMapper implements Serializable { reader = new InputStreamReader(Launch.classLoader.getResourceAsStream(resource)); return ReferenceMapper.read(reader); } catch (Exception ex) { - return new ReferenceMapper(); + return ReferenceMapper.DEFAULT_MAPPER; } finally { if (reader != null) { try { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index f4a833fa..9e232469 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -440,7 +440,10 @@ class MixinConfig implements Comparable, IMixinConfig { * Get the reference remapper for injectors */ public ReferenceMapper getReferenceMapper() { - this.refMapper.setContext(this.env.getObfuscationContext()); + if (this.env.getOption(Option.DISABLE_REFMAP)) { + return ReferenceMapper.DEFAULT_MAPPER; + } + this.refMapper.setContext(this.env.getRefmapObfuscationContext()); return this.refMapper; } From 8c6be0e99c00d857f6c36fdb0f3bc29249a21d88 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 7 Jan 2016 16:57:49 +0000 Subject: [PATCH 074/169] Organise imports and add formatter settings to project --- extra/formatter.xml | 295 ++++++++++++++++++ extra/mixin.importorder | 7 + .../spongepowered/tools/agent/MixinAgent.java | 15 +- .../tools/agent/MixinAgentClassLoader.java | 6 +- .../tools/obfuscation/AnnotatedMixin.java | 4 +- .../TargetObfuscationEnvironment.java | 2 +- .../asm/bridge/RemapperAdapterFML.java | 6 +- .../asm/launch/MixinBootstrap.java | 4 +- .../asm/launch/MixinLaunchAgentAbstract.java | 6 +- .../asm/launch/MixinLaunchAgentFML.java | 5 +- .../asm/launch/MixinTweaker.java | 8 +- .../injection/struct/InjectionPointData.java | 1 + .../mixin/injection/struct/MemberInfo.java | 4 +- .../injection/struct/ReferenceMapper.java | 4 +- .../asm/mixin/transformer/InterfaceInfo.java | 1 + .../mixin/transformer/MixinApplicator.java | 3 +- .../asm/mixin/transformer/MixinConfig.java | 6 +- .../asm/mixin/transformer/MixinInfo.java | 6 +- .../mixin/transformer/MixinTargetContext.java | 2 +- .../asm/mixin/transformer/TreeInfo.java | 6 +- .../asm/transformers/TreeTransformer.java | 4 +- 21 files changed, 351 insertions(+), 44 deletions(-) create mode 100644 extra/formatter.xml create mode 100644 extra/mixin.importorder diff --git a/extra/formatter.xml b/extra/formatter.xml new file mode 100644 index 00000000..ff240005 --- /dev/null +++ b/extra/formatter.xml @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extra/mixin.importorder b/extra/mixin.importorder new file mode 100644 index 00000000..44b374b5 --- /dev/null +++ b/extra/mixin.importorder @@ -0,0 +1,7 @@ +#Organize Import Order +#Thu Jan 07 16:47:26 GMT 2016 +4=com +3=org +2=javax +1=java +0=\# diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 156a2252..fa63b736 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -24,13 +24,6 @@ */ package org.spongepowered.tools.agent; -import net.minecraft.launchwrapper.Launch; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.spongepowered.asm.mixin.transformer.MixinReloadException; -import org.spongepowered.asm.mixin.transformer.MixinTransformer; -import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; - import java.lang.instrument.ClassDefinition; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.IllegalClassFormatException; @@ -39,6 +32,14 @@ import java.security.ProtectionDomain; import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.mixin.transformer.MixinReloadException; +import org.spongepowered.asm.mixin.transformer.MixinTransformer; +import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; + +import net.minecraft.launchwrapper.Launch; + /** * An agent that re-transforms a mixin's target classes if the mixin has been * redefined. Basically this agent enables hot-swapping of mixins. diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java index eb9ea2fc..af84e57a 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java @@ -24,6 +24,9 @@ */ package org.spongepowered.tools.agent; +import java.util.HashMap; +import java.util.Map; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.ClassWriter; @@ -32,9 +35,6 @@ import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.mixin.MixinEnvironment; -import java.util.HashMap; -import java.util.Map; - /** * Class loader that is used to load fake mixin classes so that they can be * re-defined. diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 3473619c..f9ba3276 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -44,8 +44,6 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; @@ -58,6 +56,8 @@ import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IMixinValidator.ValidationPass; import org.spongepowered.tools.obfuscation.struct.Message; +import net.minecraftforge.srg2source.rangeapplier.MethodData; + /** * Information about a mixin stored during processing diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index ebb40b20..22dc6660 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -37,9 +37,9 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; +import javax.tools.Diagnostic.Kind; import javax.tools.FileObject; import javax.tools.StandardLocation; -import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java index 206ec1c5..165966cd 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java @@ -24,12 +24,12 @@ */ package org.spongepowered.asm.bridge; -import org.objectweb.asm.commons.Remapper; -import org.spongepowered.asm.mixin.extensibility.IRemapper; - import java.lang.reflect.Field; import java.lang.reflect.Method; +import org.objectweb.asm.commons.Remapper; +import org.spongepowered.asm.mixin.extensibility.IRemapper; + public class RemapperAdapterFML extends RemapperAdapter { private final Method mdUnmap; diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 1a0dbeb7..fb5fa891 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -26,13 +26,13 @@ package org.spongepowered.asm.launch; import java.util.List; -import net.minecraft.launchwrapper.Launch; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import net.minecraft.launchwrapper.Launch; + /** * Bootstaps the mixin subsystem. This class acts as a bridge between the mixin * subsystem and the tweaker or coremod which is boostrapping it. Without this diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java index 30747daa..94b969ec 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java @@ -24,12 +24,12 @@ */ package org.spongepowered.asm.launch; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.io.File; import java.net.URI; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + /** * Launch agent base class diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java index bdd86623..e2b32bdb 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java @@ -30,11 +30,12 @@ import java.lang.reflect.Method; import java.net.URI; import java.util.List; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.extensibility.IRemapper; + import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; -import org.spongepowered.asm.mixin.MixinEnvironment; -import org.spongepowered.asm.mixin.extensibility.IRemapper; /** * Launch agent for use under FML. diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index daba5586..56d29481 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -32,16 +32,16 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; + /** * TweakClass for running mixins in production. Being a tweaker ensures that we diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java index ffd148ae..0709b6a1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 4f904c93..b5ce7c9c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -24,8 +24,6 @@ */ package org.spongepowered.asm.mixin.injection.struct; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; @@ -33,6 +31,8 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; import org.spongepowered.asm.util.SignaturePrinter; +import net.minecraftforge.srg2source.rangeapplier.MethodData; + /** *

Information bundle about a member (method or field) parsed from a String diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java index 7be5e8f1..d06e2bc2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java @@ -31,12 +31,12 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import net.minecraft.launchwrapper.Launch; - import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import net.minecraft.launchwrapper.Launch; + public final class ReferenceMapper implements Serializable { private static final long serialVersionUID = 2L; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java index d51321db..a6ea42e1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java @@ -30,6 +30,7 @@ import java.util.Set; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.util.ASMHelper; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 65bb13fc..98dbe626 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -48,8 +48,9 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.MixinEnvironment; -import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 9e232469..9f0dcda8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -34,13 +34,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.minecraft.launchwrapper.Launch; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.launch.MixinInitialisationError; +import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; @@ -52,6 +50,8 @@ import org.spongepowered.asm.util.VersionNumber; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; +import net.minecraft.launchwrapper.Launch; + /** * Mixin configuration bundle */ diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 86bce5d9..49933c6a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -32,9 +32,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -61,6 +58,9 @@ import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.Lists; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; + /** * Runtime information bundle about a mixin */ diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index ebfaa67e..eff6a03e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -36,8 +36,8 @@ import org.spongepowered.asm.lib.Handle; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.*; -import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.SoftOverride; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java index 9c9dfeb4..fbbd17ca 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java @@ -28,9 +28,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URLClassLoader; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.Launch; - import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -39,6 +36,9 @@ import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.transformer.MixinTransformer.ReEntranceState; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.Launch; + /** * Base class for "info" objects which use ASM tree API to do stuff, with things */ diff --git a/src/main/java/org/spongepowered/asm/transformers/TreeTransformer.java b/src/main/java/org/spongepowered/asm/transformers/TreeTransformer.java index cefca54d..ed2174db 100644 --- a/src/main/java/org/spongepowered/asm/transformers/TreeTransformer.java +++ b/src/main/java/org/spongepowered/asm/transformers/TreeTransformer.java @@ -24,13 +24,13 @@ */ package org.spongepowered.asm.transformers; -import net.minecraft.launchwrapper.IClassTransformer; - import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.transformer.MixinClassWriter; +import net.minecraft.launchwrapper.IClassTransformer; + /** * Base class for transformers which work with ASM tree model */ From 967d9e28e7c99a4551c7753d6264b618ca628593 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 7 Jan 2016 17:38:32 +0000 Subject: [PATCH 075/169] Fix inverted semaphore on overwrite checker block --- .../org/spongepowered/tools/obfuscation/AnnotatedMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index f9ba3276..cf01dfbf 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -467,7 +467,7 @@ class AnnotatedMixin { this.addMethodMapping(type, mcpName, obfName, mcpSignature, obfMethod.sig); } - if ("true".equalsIgnoreCase(this.mixins.getOption(SupportedOptions.DISABLE_OVERWRITE_CHECKER))) { + if (!"true".equalsIgnoreCase(this.mixins.getOption(SupportedOptions.DISABLE_OVERWRITE_CHECKER))) { Kind overwriteErrorKind = "error".equalsIgnoreCase(this.mixins.getOption(SupportedOptions.OVERWRITE_ERROR_LEVEL)) ? Kind.ERROR : Kind.WARNING; From 61ec3187b87c5172b155e3c2261ca009fe784f8c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 10 Jan 2016 19:37:23 +0000 Subject: [PATCH 076/169] Run transformers even if bytecode not loaded, fixes synthetic classes --- .../spongepowered/asm/mixin/transformer/TreeInfo.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java index fbbd17ca..13761a01 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java @@ -86,16 +86,16 @@ abstract class TreeInfo { protected static byte[] loadClass(String className, boolean runTransformers) throws ClassNotFoundException, IOException { String transformedName = className.replace('/', '.'); String name = MixinEnvironment.getCurrentEnvironment().unmap(transformedName); - byte[] classBytes = null; - - if ((classBytes = TreeInfo.getClassBytes(name, transformedName)) == null) { - throw new ClassNotFoundException(String.format("The specified class '%s' was not found", transformedName)); - } + byte[] classBytes = TreeInfo.getClassBytes(name, transformedName); if (runTransformers) { classBytes = TreeInfo.applyTransformers(name, transformedName, classBytes); } + if (classBytes == null) { + throw new ClassNotFoundException(String.format("The specified class '%s' was not found", transformedName)); + } + return classBytes; } From 36576e239bb12e3638b0d5a9d2a11a668be4f36e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 13 Jan 2016 01:09:12 +0000 Subject: [PATCH 077/169] Add support for injector grouping and config-wide Inject::require value --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/injection/Group.java | 58 +++++ .../InjectionValidationException.java | 42 ++++ .../mixin/injection/InjectorGroupInfo.java | 224 ++++++++++++++++++ .../mixin/injection/struct/InjectionInfo.java | 34 ++- .../asm/mixin/transformer/MixinConfig.java | 39 +++ .../mixin/transformer/MixinTargetContext.java | 49 +++- 8 files changed, 441 insertions(+), 9 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/Group.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java diff --git a/gradle.properties b/gradle.properties index 3ffa47fd..756d88e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.10 +buildVersion=0.4.11 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index fb5fa891..08eb8c0a 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.10"; + public static final String VERSION = "0.4.11"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Group.java b/src/main/java/org/spongepowered/asm/mixin/injection/Group.java new file mode 100644 index 00000000..507cd8fc --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Group.java @@ -0,0 +1,58 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * This annotation can be used on any injector callback to define a value for + * total required injections across multiple callbacks. Much like + * {@link Inject#require()} it can be used to treat an injection failure as a + * critical error, however the require value specified applies to all + * injectors in the group. This can be used, for example, for 'surrogate' + * injectors where multiple injectors exist but only one is expected to succeed. + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.CLASS) +public @interface Group { + + /** + * The name of the injector group, any string + * + * @return group name + */ + public String name() default ""; + + /** + * Require value for this injector group + * + * @return require value + */ + public int require() default -1; + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java new file mode 100644 index 00000000..19a61b3e --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java @@ -0,0 +1,42 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +public class InjectionValidationException extends Exception { + + private static final long serialVersionUID = 1L; + + private final InjectorGroupInfo group; + + public InjectionValidationException(InjectorGroupInfo group, String message) { + super(message); + this.group = group; + } + + public InjectorGroupInfo getGroup() { + return this.group; + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java new file mode 100644 index 00000000..902017c1 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java @@ -0,0 +1,224 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import org.apache.logging.log4j.LogManager; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.util.ASMHelper; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + +/** + * Information store for injector groups + */ +public class InjectorGroupInfo { + + /** + * Storage for injector groups + */ + public static final class Map extends HashMap { + + private static final long serialVersionUID = 1L; + + private static final InjectorGroupInfo NO_GROUP = new InjectorGroupInfo("NONE"); + + @Override + public InjectorGroupInfo get(Object key) { + return this.forName(key.toString()); + } + + /** + * Get group for the specified name, creates the group in this map if + * it does not already exist + * + * @param name Name of group to fetch + * @return Existing group or new group if none was previously declared + */ + public InjectorGroupInfo forName(String name) { + InjectorGroupInfo value = super.get(name); + if (value == null) { + value = new InjectorGroupInfo(name); + this.put(name, value); + } + return value; + } + + /** + * Parse a group from the specified method, use the default group name + * if no group name is specified on the annotation + * + * @param method (Possibly) annotated method + * @param defaultGroup Default group name to use + * @return Group or NO_GROUP if no group + */ + public InjectorGroupInfo parseGroup(MethodNode method, String defaultGroup) { + return this.parseGroup(ASMHelper.getInvisibleAnnotation(method, Group.class), defaultGroup); + } + + /** + * Parse a group from the specified annotation, use the default group + * name if no group name is specified on the annotation + * + * @param method Annotation or null + * @param defaultGroup Default group name to use + * @return Group or NO_GROUP if no group + */ + public InjectorGroupInfo parseGroup(AnnotationNode annotation, String defaultGroup) { + if (annotation == null) { + return InjectorGroupInfo.Map.NO_GROUP; + } + + String name = ASMHelper.getAnnotationValue(annotation, "name"); + if (name == null || name.isEmpty()) { + name = defaultGroup; + } + InjectorGroupInfo groupInfo = this.forName(name); + + Integer require = ASMHelper.getAnnotationValue(annotation, "require"); + if (require != null) { + if (require.intValue() != -1) { + groupInfo.setRequired(require.intValue()); + } + } + + return groupInfo; + } + + /** + * Validate all groups in this collection + * + * @throws InjectionValidationException if validation fails + */ + public void validateAll() throws InjectionValidationException { + for (InjectorGroupInfo group : this.values()) { + group.validate(); + } + } + + } + + /** + * Group name + */ + private final String name; + + /** + * Members of this group + */ + private final List members = new ArrayList(); + + /** + * Number of callbacks we require injected across this group + */ + private int requiredCallbackCount = -1; + + public InjectorGroupInfo(String name) { + this.name = name; + } + + @Override + public String toString() { + return String.format("@Group(name=%s, require=%d)", this.getName(), this.getRequired()); + } + + public String getName() { + return this.name; + } + + public int getRequired() { + return Math.max(this.requiredCallbackCount, 1); + } + + /** + * Get all members of this group as a read-only collection + * + * @return read-only view of group members + */ + public Collection getMembers() { + return Collections.unmodifiableCollection(this.members); + } + + /** + * Set the required value for this group. Since this is normally done on the + * first {@link Group} annotation it is considered a warning-level event if + * a later annotation sets a different value. The highest value specified on + * all annotations is always used + * + * @param required new value for required + */ + public void setRequired(int required) { + if (required < 1) { + throw new IllegalArgumentException("Cannot set zero or negative value for injector group required count. Attempted to set required=" + + required + " on " + this + ""); + } + if (this.requiredCallbackCount > 0 && this.requiredCallbackCount != required) { + LogManager.getLogger("mixin").warn("Conflicting require value '{}' on @Group({}), previously specified {}", required, this.name, + this.requiredCallbackCount); + } + this.requiredCallbackCount = Math.max(this.requiredCallbackCount, required); + } + + /** + * Add a new member to this group + * + * @param member injector to add + * @return fluent interface + */ + public InjectorGroupInfo add(InjectionInfo member) { + this.members.add(member); + return this; + } + + /** + * Validate all members in this group + * + * @return fluent interface + * @throws InjectionValidationException if validation fails + */ + public InjectorGroupInfo validate() throws InjectionValidationException { + if (this.members.size() == 0) { + // I have no idea how we got here, but it's not an error :/ + return this; + } + + int total = 0; + for (InjectionInfo member : this.members) { + total += member.getInjectedCallbackCount(); + } + + int required = this.getRequired(); + if (total < required) { + throw new InjectionValidationException(this, String.format("expected %d invocation(s) but only %d succeeded", required, total)); + } + + return this; + } +} 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 cb78700c..3297e6a0 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 @@ -39,6 +39,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.InjectionError; import org.spongepowered.asm.mixin.injection.InjectionPoint; +import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.Redirect; @@ -48,7 +49,6 @@ import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.util.ASMHelper; - /** * Contructs information about an injection from an {@link Inject} annotation * and allows the injection to be processed. @@ -57,6 +57,8 @@ public abstract class InjectionInfo { protected final AnnotationNode annotation; + protected final String annotationType; + /** * Class */ @@ -71,8 +73,7 @@ public abstract class InjectionInfo { * Mixin data */ protected final MixinTargetContext mixin; - - + /** * Annotated method is static */ @@ -94,6 +95,11 @@ public abstract class InjectionInfo { */ protected Injector injector; + /** + * Injection group + */ + protected InjectorGroupInfo group; + /** * Methods injected by injectors */ @@ -122,11 +128,13 @@ public abstract class InjectionInfo { * @param annotation Annotation to parse */ protected InjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { - this.annotation = annotation; - this.method = method; this.mixin = mixin; + this.method = method; + this.annotation = annotation; + this.annotationType = annotation.desc.substring(annotation.desc.lastIndexOf('/') + 1).replace(";", ""); this.classNode = mixin.getTargetClass(); this.isStatic = ASMHelper.methodIsStatic(method); + this.requiredCallbackCount = mixin.getDefaultRequiredInjections(); this.readAnnotation(); } @@ -177,6 +185,8 @@ public abstract class InjectionInfo { } } + this.group = this.mixin.getInjectorGroups().parseGroup(this.method, this.mixin.getDefaultInjectorGroup()).add(this); + Integer expect = ASMHelper.getAnnotationValue(this.annotation, "expect"); if (expect != null) { this.expectedCallbackCount = expect.intValue(); @@ -232,6 +242,11 @@ public abstract class InjectionInfo { } } + @Override + public String toString() { + return String.format("%s->@%s::%s%s", this.mixin.toString(), this.annotationType, this.method.name, this.method.desc); + } + /** * Get the mixin target context for this injection * @@ -276,6 +291,15 @@ public abstract class InjectionInfo { public Collection getTargets() { return this.targets; } + + /** + * Get the injected callback count + * + * @return the injected callback count + */ + public int getInjectedCallbackCount() { + return this.injectedCallbackCount; + } /** * Inject a method into the target class diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 9f0dcda8..ce55883f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -57,6 +57,19 @@ import net.minecraft.launchwrapper.Launch; */ class MixinConfig implements Comparable, IMixinConfig { + /** + * Wrapper for injection options + */ + static class InjectorOptions { + + @SerializedName("defaultRequire") + int defaultRequireValue = 0; + + @SerializedName("defaultGroup") + String defaultGroup = "default"; + + } + /** * Global order of mixin configs, used to determine ordering between configs * with equivalent priority @@ -189,6 +202,12 @@ class MixinConfig implements Comparable, IMixinConfig { @SerializedName("plugin") private String pluginClassName; + /** + * Injector options + */ + @SerializedName("injectors") + private InjectorOptions injectorOptions = new InjectorOptions(); + /** * Config plugin, if supplied */ @@ -420,6 +439,26 @@ class MixinConfig implements Comparable, IMixinConfig { public int getDefaultMixinPriority() { return this.mixinPriority; } + + /** + * Get the defined value for the {@link Inject#require} parameter on + * injectors defined in mixins in this configuration. + * + * @return default require value + */ + public int getDefaultRequiredInjections() { + return this.injectorOptions.defaultRequireValue; + } + + /** + * Get the defined injector group for injectors + * + * @return default group name + */ + public String getDefaultInjectorGroup() { + String defaultGroup = this.injectorOptions.defaultGroup; + return defaultGroup != null && !defaultGroup.isEmpty() ? defaultGroup : "default"; + } /** * Get the list of mixin classes we will be applying diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index eff6a03e..950e6c56 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -39,13 +39,16 @@ import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.SoftOverride; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.InjectionError; +import org.spongepowered.asm.mixin.injection.InjectionValidationException; +import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.mixin.transformer.ClassInfo.Traversal; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; - /** * This object keeps track of data for applying a mixin to a specific target * class during a mixin application. This is a single-use object which @@ -91,7 +94,12 @@ public class MixinTargetContext implements IReferenceMapperContext { * transformations we apply */ private final Map targetMethods = new HashMap(); - + + /** + * Injector groups + */ + protected final InjectorGroupInfo.Map injectorGroups = new InjectorGroupInfo.Map(); + /** * True if this mixin inherits from a mixin at any point in its hierarchy */ @@ -208,6 +216,34 @@ public class MixinTargetContext implements IReferenceMapperContext { public int getMinRequiredClassVersion() { return this.minRequiredClassVersion; } + + /** + * Get the defined value for the {@link Inject#require} parameter on + * injectors defined in mixins in this configuration. + * + * @return default require value + */ + public int getDefaultRequiredInjections() { + return this.mixin.getParent().getDefaultRequiredInjections(); + } + + /** + * Get the defined injector group for injectors + * + * @return default group name + */ + public String getDefaultInjectorGroup() { + return this.mixin.getParent().getDefaultInjectorGroup(); + } + + /** + * Get the injector groups for this target + * + * @return + */ + public InjectorGroupInfo.Map getInjectorGroups() { + return this.injectorGroups; + } /** * Find the corresponding class type for the supplied mixin class in this @@ -769,6 +805,15 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param targetClass Target class */ public void postApply(String transformedName, ClassNode targetClass) { + try { + this.injectorGroups.validateAll(); + } catch (InjectionValidationException ex) { + InjectorGroupInfo group = ex.getGroup(); + throw new InjectionError( + String.format("Critical injection failure: Callback group %s in %s failed injection check: %s", + group, this.mixin, ex.getMessage())); + } + this.mixin.postApply(transformedName, targetClass); } From 3b2783c214cc5485dd81a793f84c5ac990a795de Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 13 Jan 2016 01:18:56 +0000 Subject: [PATCH 078/169] Housekeeping --- .../org/spongepowered/tools/MirrorUtils.java | 1 - .../tools/obfuscation/AnnotatedMixin.java | 3 +-- .../tools/obfuscation/AnnotatedMixins.java | 2 +- .../tools/obfuscation/FieldHandle.java | 1 - .../tools/obfuscation/IMixinValidator.java | 1 - .../tools/obfuscation/MethodHandle.java | 1 - .../tools/obfuscation/MixinValidator.java | 1 - .../tools/obfuscation/TypeHandle.java | 1 - .../obfuscation/validation/ParentValidator.java | 1 - .../obfuscation/validation/TargetValidator.java | 1 - .../asm/launch/MixinLaunchAgentAbstract.java | 1 - .../asm/launch/MixinLaunchAgentDefault.java | 1 - .../asm/launch/MixinTweakContainer.java | 1 - .../spongepowered/asm/launch/MixinTweaker.java | 1 - .../org/spongepowered/asm/mixin/Intrinsic.java | 1 - .../spongepowered/asm/mixin/MixinApplyError.java | 1 - .../asm/mixin/MixinEnvironment.java | 1 - .../spongepowered/asm/mixin/SoftOverride.java | 1 - .../extensibility/IEnvironmentTokenProvider.java | 1 - .../mixin/extensibility/IMixinErrorHandler.java | 1 - .../asm/mixin/injection/Coerce.java | 1 - .../asm/mixin/injection/InjectionError.java | 1 - .../asm/mixin/injection/InjectorGroupInfo.java | 14 +++++++------- .../asm/mixin/injection/Surrogate.java | 1 - .../injection/callback/CallbackInjector.java | 13 ++++++++++++- .../mixin/injection/callback/Cancellable.java | 1 - .../mixin/injection/callback/LocalCapture.java | 1 - .../asm/mixin/injection/code/Injector.java | 1 - .../asm/mixin/injection/points/AfterInvoke.java | 1 - .../injection/struct/InjectionPointData.java | 1 - .../asm/mixin/injection/struct/MemberInfo.java | 1 - .../asm/mixin/injection/struct/Target.java | 1 - .../asm/mixin/transformer/ClassInfo.java | 1 - .../transformer/IMixinTransformerModule.java | 1 - .../asm/mixin/transformer/MixinApplicator.java | 1 - .../asm/mixin/transformer/MixinConfig.java | 5 +++-- .../asm/mixin/transformer/MixinInfo.java | 2 +- .../asm/mixin/transformer/MixinPreProcessor.java | 1 - .../mixin/transformer/MixinTargetContext.java | 13 +++++++++++-- .../mixin/transformer/MixinTransformerError.java | 1 - .../MixinTransformerModuleCheckClass.java | 1 - .../MixinTransformerModuleInterfaceChecker.java | 1 - .../asm/mixin/transformer/MixinVerifier.java | 1 - .../asm/mixin/transformer/meta/MixinRenamed.java | 1 - .../org/spongepowered/asm/util/ASMHelper.java | 16 +++++++++++++++- .../org/spongepowered/asm/util/Constants.java | 1 - .../spongepowered/asm/util/ConstraintParser.java | 1 - .../asm/util/ConstraintViolationException.java | 1 - .../spongepowered/asm/util/ITokenProvider.java | 1 - .../asm/util/InvalidConstraintException.java | 1 - .../java/org/spongepowered/asm/util/Locals.java | 1 - .../spongepowered/asm/util/PrettyPrinter.java | 1 - .../spongepowered/asm/util/SignaturePrinter.java | 1 - .../spongepowered/asm/util/VersionNumber.java | 1 - 54 files changed, 51 insertions(+), 63 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/MirrorUtils.java b/src/ap/java/org/spongepowered/tools/MirrorUtils.java index 937d2b01..82fde87b 100644 --- a/src/ap/java/org/spongepowered/tools/MirrorUtils.java +++ b/src/ap/java/org/spongepowered/tools/MirrorUtils.java @@ -42,7 +42,6 @@ import javax.lang.model.type.ArrayType; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; - /** * Convenience functions for mirror */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index cf01dfbf..e9bcbdc9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -58,7 +58,6 @@ import org.spongepowered.tools.obfuscation.struct.Message; import net.minecraftforge.srg2source.rangeapplier.MethodData; - /** * Information about a mixin stored during processing */ @@ -542,7 +541,7 @@ class AnnotatedMixin { * @param method Callback method * @param inject Inject annotation * @param remap - * @return + * @return pending error message or null if no error condition */ public Message registerInjector(ExecutableElement method, AnnotationMirror inject, boolean remap) { String originalReference = MirrorUtils.getAnnotationValue(inject, "method"); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 0f59555f..907560d2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -475,7 +475,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp * Register a {@link org.spongepowered.asm.mixin.Shadow} field * * @param mixinType Mixin class - * @param method Shadow field + * @param field Shadow field * @param shadow {@link org.spongepowered.asm.mixin.Shadow} annotation */ public void registerShadow(TypeElement mixinType, VariableElement field, AnnotationMirror shadow) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/FieldHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/FieldHandle.java index 3de475ca..bb08b9dd 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/FieldHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/FieldHandle.java @@ -26,7 +26,6 @@ package org.spongepowered.tools.obfuscation; import javax.lang.model.element.VariableElement; - /** * Retrieved from a {@link TypeHandle} when searching for fields */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/IMixinValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/IMixinValidator.java index 6ce4f6c0..8dc83ae5 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/IMixinValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/IMixinValidator.java @@ -29,7 +29,6 @@ import java.util.Collection; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.TypeElement; - /** * A mixin validator module, basically just a way of making the various sanity * checks modular diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MethodHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/MethodHandle.java index 9dacb904..8b6c6312 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MethodHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MethodHandle.java @@ -26,7 +26,6 @@ package org.spongepowered.tools.obfuscation; import javax.lang.model.element.ExecutableElement; - /** * Retrieved from a {@link TypeHandle} when searching for methods */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java index 8b9a2efc..82a25edf 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java @@ -34,7 +34,6 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; - /** * Base class for mixin validators */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java index 5307713a..72f23a07 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java @@ -41,7 +41,6 @@ import javax.lang.model.type.TypeMirror; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.tools.MirrorUtils; - /** * A wrapper for TypeElement which gives us a soft-failover mechanism when * dealing with classes that are inaccessible via mirror (such as anonymous diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java index 9b251693..af718b11 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java @@ -37,7 +37,6 @@ import org.spongepowered.tools.obfuscation.IOptionProvider; import org.spongepowered.tools.obfuscation.MixinValidator; import org.spongepowered.tools.obfuscation.TypeHandle; - /** * Validator which checks that the mixin parent is sane */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java index 08c8bf64..22bf1883 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java @@ -40,7 +40,6 @@ import org.spongepowered.tools.obfuscation.MixinValidator; import org.spongepowered.tools.obfuscation.SupportedOptions; import org.spongepowered.tools.obfuscation.TypeHandle; - /** * Validator which checks that the mixin targets are sane */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java index 94b969ec..22182c30 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java @@ -30,7 +30,6 @@ import java.net.URI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - /** * Launch agent base class */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java index c503c3e4..6b542fa5 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java @@ -28,7 +28,6 @@ import java.net.URI; import net.minecraft.launchwrapper.LaunchClassLoader; - /** * Default launch agent, handles the MixinConfigs manifest key */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java index cf9eef3a..0bb58198 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java @@ -35,7 +35,6 @@ import org.apache.logging.log4j.Logger; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; - /** * A collection of {@link IMixinLaunchAgent} launch agents) */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index 56d29481..dce86e5c 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -42,7 +42,6 @@ import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; - /** * TweakClass for running mixins in production. Being a tweaker ensures that we * get injected into the AppClassLoader but does mean that we will need to diff --git a/src/main/java/org/spongepowered/asm/mixin/Intrinsic.java b/src/main/java/org/spongepowered/asm/mixin/Intrinsic.java index 8bb58387..721e513b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Intrinsic.java +++ b/src/main/java/org/spongepowered/asm/mixin/Intrinsic.java @@ -29,7 +29,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - /** * This annotation allows fine-tuning of the overwrite policy for a * soft-implemented interface member method. diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinApplyError.java b/src/main/java/org/spongepowered/asm/mixin/MixinApplyError.java index 0803f8cd..551700a5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinApplyError.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinApplyError.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.mixin; - /** * Error to throw for required mixins when mixing of the mixin fails */ diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 7cf9976b..44a8dc8b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -64,7 +64,6 @@ import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; - /** * The mixin environment manages global state information for the mixin * subsystem. diff --git a/src/main/java/org/spongepowered/asm/mixin/SoftOverride.java b/src/main/java/org/spongepowered/asm/mixin/SoftOverride.java index 05695ee1..5891ac77 100644 --- a/src/main/java/org/spongepowered/asm/mixin/SoftOverride.java +++ b/src/main/java/org/spongepowered/asm/mixin/SoftOverride.java @@ -29,7 +29,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - /** * Decorator for methods which override a method in a supermixin which the * containing mixin does not directly extend diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IEnvironmentTokenProvider.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IEnvironmentTokenProvider.java index 3a9b9937..ba78f23f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IEnvironmentTokenProvider.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IEnvironmentTokenProvider.java @@ -26,7 +26,6 @@ package org.spongepowered.asm.mixin.extensibility; import org.spongepowered.asm.mixin.MixinEnvironment; - /** * Provides a token value into the attached environment */ diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java index 80111834..2492102e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java @@ -26,7 +26,6 @@ package org.spongepowered.asm.mixin.extensibility; import org.apache.logging.log4j.Level; - /** * Interface for objects which want to perform custom behaviour when fatal mixin * errors occur. For example displaying a user-friendly error message diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Coerce.java b/src/main/java/org/spongepowered/asm/mixin/injection/Coerce.java index 3721a03a..149c156f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Coerce.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Coerce.java @@ -27,7 +27,6 @@ package org.spongepowered.asm.mixin.injection; import java.lang.annotation.ElementType; import java.lang.annotation.Target; - /** * Indicates that a local capture injector should coerce top-level primitive * types to covariant types. diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionError.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionError.java index bd53925f..4c1ea1db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionError.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionError.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.mixin.injection; - /** * Error to throw for critical injection problems */ diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java index 902017c1..8ebc8afa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java @@ -24,18 +24,18 @@ */ package org.spongepowered.asm.mixin.injection; -import org.apache.logging.log4j.LogManager; -import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; -import org.spongepowered.asm.util.ASMHelper; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.util.ASMHelper; + /** * Information store for injector groups */ @@ -87,7 +87,7 @@ public class InjectorGroupInfo { * Parse a group from the specified annotation, use the default group * name if no group name is specified on the annotation * - * @param method Annotation or null + * @param annotation Annotation or null * @param defaultGroup Default group name to use * @return Group or NO_GROUP if no group */ diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Surrogate.java b/src/main/java/org/spongepowered/asm/mixin/injection/Surrogate.java index ee583064..e8c6f54b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Surrogate.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Surrogate.java @@ -29,7 +29,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - /** * Annotation used to decorate surrogate injector methods. See * {@link Inject#locals()} for information. 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 a5c02860..5bbb5758 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 @@ -31,7 +31,18 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.InsnNode; +import org.spongepowered.asm.lib.tree.JumpInsnNode; +import org.spongepowered.asm.lib.tree.LabelNode; +import org.spongepowered.asm.lib.tree.LdcInsnNode; +import org.spongepowered.asm.lib.tree.LocalVariableNode; +import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.lib.tree.TypeInsnNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.Coerce; import org.spongepowered.asm.mixin.injection.InjectionError; import org.spongepowered.asm.mixin.injection.InjectionPoint; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/Cancellable.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/Cancellable.java index 615f2b55..a544fdd5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/Cancellable.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/Cancellable.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.mixin.injection.callback; - /** * Interface for things which can be cancelled */ diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/LocalCapture.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/LocalCapture.java index c64273ec..f44baafd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/LocalCapture.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/LocalCapture.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.mixin.injection.callback; - /** * Specifies the behaviour for capturing local variables at an injection point. * 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 3c6f754e..9ddfd250 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 @@ -44,7 +44,6 @@ import org.spongepowered.asm.util.ASMHelper; import com.google.common.base.Joiner; - /** * Base class for bytecode injectors */ diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/points/AfterInvoke.java b/src/main/java/org/spongepowered/asm/mixin/injection/points/AfterInvoke.java index 3c9bb9f1..fc975c18 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/points/AfterInvoke.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/points/AfterInvoke.java @@ -35,7 +35,6 @@ import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.struct.InjectionPointData; - /** *

This injection point searches for INVOKEVIRTUAL, INVOKESTATIC and * INVOKESPECIAL opcodes matching its arguments and returns a list of insns diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java index 0709b6a1..667f53b1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java @@ -31,7 +31,6 @@ import java.util.Map; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; - /** * Data read from an {@link org.spongepowered.asm.mixin.injection.At} annotation * and passed into an InjectionPoint ctor diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index b5ce7c9c..de22ff2b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -33,7 +33,6 @@ import org.spongepowered.asm.util.SignaturePrinter; import net.minecraftforge.srg2source.rangeapplier.MethodData; - /** *

Information bundle about a member (method or field) parsed from a String * token in another annotation, this is used where target members need to be 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 6737f297..5c986faf 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 @@ -30,7 +30,6 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.util.ASMHelper; - /** * Information about the current injection target, mainly just convenience * rather than passing a bunch of values around. diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index c5676683..33e24861 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -49,7 +49,6 @@ import org.spongepowered.asm.mixin.transformer.ClassInfo.Member.Type; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; - /** * Information about a class, used as a way of keeping track of class hierarchy * information needed to support more complex mixin behaviour such as detached diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java b/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java index dfc7764b..dc82fd25 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java @@ -28,7 +28,6 @@ import java.util.SortedSet; import org.spongepowered.asm.lib.tree.ClassNode; - /** * Mixin Transformer Module interface for pre- and post-processors */ diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 98dbe626..4b79f97a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -61,7 +61,6 @@ import org.spongepowered.asm.util.ConstraintParser.Constraint; import org.spongepowered.asm.util.ConstraintViolationException; import org.spongepowered.asm.util.InvalidConstraintException; - /** * Applies mixins to a target class */ diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index ce55883f..1b5b0261 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -43,6 +43,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; import org.spongepowered.asm.util.VersionNumber; @@ -543,7 +544,7 @@ class MixinConfig implements Comparable, IMixinConfig { * class * * @param targetClass - * @return + * @return true if this bundle contains any mixins for the specified target */ public boolean hasMixinsFor(String targetClass) { return this.mixinMapping.containsKey(targetClass); @@ -553,7 +554,7 @@ class MixinConfig implements Comparable, IMixinConfig { * Get mixins for the specified target class * * @param targetClass - * @return + * @return mixins for the specified target */ public List getMixinsFor(String targetClass) { return this.mixinsFor(targetClass); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 49933c6a..c2d94a33 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -634,7 +634,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Get a new mixin target context object for the specified target * * @param target - * @return + * @return new context */ public MixinTargetContext createContextFor(ClassNode target) { return new MixinPreProcessor(this, this.getClassNode(ClassReader.EXPAND_FRAMES)).createContextFor(target); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 8fe20f02..fbb6d89a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -48,7 +48,6 @@ import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; - /** *

Mixin bytecode pre-processor. This class is responsible for bytecode pre- * processing tasks required to be performed on mixin bytecode before the mixin diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 950e6c56..f077646b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -35,7 +35,16 @@ import org.apache.logging.log4j.Level; import org.spongepowered.asm.lib.Handle; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.FieldInsnNode; +import org.spongepowered.asm.lib.tree.FieldNode; +import org.spongepowered.asm.lib.tree.InvokeDynamicInsnNode; +import org.spongepowered.asm.lib.tree.LdcInsnNode; +import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.lib.tree.TypeInsnNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.SoftOverride; @@ -239,7 +248,7 @@ public class MixinTargetContext implements IReferenceMapperContext { /** * Get the injector groups for this target * - * @return + * @return injector groups */ public InjectorGroupInfo.Map getInjectorGroups() { return this.injectorGroups; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerError.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerError.java index 6b0f9978..a0f81384 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerError.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerError.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.mixin.transformer; - /** * Error to throw for things which really shouldn't happen */ diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java index 754a0ea9..ab6b07db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java @@ -30,7 +30,6 @@ import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.util.CheckClassAdapter; - /** * Mixin transformer module which runs CheckClassAdapter on the post-mixin * bytecode diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java index 58cc951a..a9d733bc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java @@ -46,7 +46,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.io.Files; - /** * Checks whether interfaces declared on mixin target classes are actually fully * implemented and generates reports to the console and to files on disk diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java index 99276ea1..c1af764f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java @@ -29,7 +29,6 @@ import java.util.List; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.analysis.SimpleVerifier; - /** * Verifier which handles class info lookups via {@link ClassInfo} */ diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinRenamed.java b/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinRenamed.java index 23322b28..7a5634cf 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinRenamed.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinRenamed.java @@ -29,7 +29,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - /** *

Internal use only.

* diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index b22d18b3..6165e2db 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -38,7 +38,21 @@ import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.FieldInsnNode; +import org.spongepowered.asm.lib.tree.FieldNode; +import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.InsnNode; +import org.spongepowered.asm.lib.tree.IntInsnNode; +import org.spongepowered.asm.lib.tree.JumpInsnNode; +import org.spongepowered.asm.lib.tree.LabelNode; +import org.spongepowered.asm.lib.tree.LdcInsnNode; +import org.spongepowered.asm.lib.tree.LineNumberNode; +import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.lib.util.CheckClassAdapter; public class ASMHelper { diff --git a/src/main/java/org/spongepowered/asm/util/Constants.java b/src/main/java/org/spongepowered/asm/util/Constants.java index ce791d4b..fe96a6b8 100644 --- a/src/main/java/org/spongepowered/asm/util/Constants.java +++ b/src/main/java/org/spongepowered/asm/util/Constants.java @@ -26,7 +26,6 @@ package org.spongepowered.asm.util; import org.spongepowered.asm.mixin.Mixin; - /** * Miscellaneous shared constants */ diff --git a/src/main/java/org/spongepowered/asm/util/ConstraintParser.java b/src/main/java/org/spongepowered/asm/util/ConstraintParser.java index fdabbc76..23a27b8f 100644 --- a/src/main/java/org/spongepowered/asm/util/ConstraintParser.java +++ b/src/main/java/org/spongepowered/asm/util/ConstraintParser.java @@ -29,7 +29,6 @@ import java.util.regex.Pattern; import org.spongepowered.asm.lib.tree.AnnotationNode; - /** * Parser for constraints */ diff --git a/src/main/java/org/spongepowered/asm/util/ConstraintViolationException.java b/src/main/java/org/spongepowered/asm/util/ConstraintViolationException.java index 8165d805..3c3a8e8d 100644 --- a/src/main/java/org/spongepowered/asm/util/ConstraintViolationException.java +++ b/src/main/java/org/spongepowered/asm/util/ConstraintViolationException.java @@ -26,7 +26,6 @@ package org.spongepowered.asm.util; import org.spongepowered.asm.util.ConstraintParser.Constraint; - /** * Exception thrown when a constraint violation is encountered */ diff --git a/src/main/java/org/spongepowered/asm/util/ITokenProvider.java b/src/main/java/org/spongepowered/asm/util/ITokenProvider.java index c86decc9..b63c2ef4 100644 --- a/src/main/java/org/spongepowered/asm/util/ITokenProvider.java +++ b/src/main/java/org/spongepowered/asm/util/ITokenProvider.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.util; - /** * Agent which can supply token values to a * {@link org.spongepowered.asm.util.ConstraintParser.Constraint}. diff --git a/src/main/java/org/spongepowered/asm/util/InvalidConstraintException.java b/src/main/java/org/spongepowered/asm/util/InvalidConstraintException.java index 984ca28f..2e6c1ce9 100644 --- a/src/main/java/org/spongepowered/asm/util/InvalidConstraintException.java +++ b/src/main/java/org/spongepowered/asm/util/InvalidConstraintException.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.util; - /** * Exception thrown when a constraint declaration is invalid */ diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index f9ad8b31..d44a3bf7 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -49,7 +49,6 @@ import org.spongepowered.asm.mixin.transformer.ClassInfo; import org.spongepowered.asm.mixin.transformer.ClassInfo.FrameData; import org.spongepowered.asm.mixin.transformer.MixinVerifier; - /** * Utility methods for working with local variables using ASM */ diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 2c39b880..2f15285f 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -35,7 +35,6 @@ import org.apache.logging.log4j.Logger; import com.google.common.base.Strings; - /** * Prints information in a pretty box */ diff --git a/src/main/java/org/spongepowered/asm/util/SignaturePrinter.java b/src/main/java/org/spongepowered/asm/util/SignaturePrinter.java index f5784843..9d610785 100644 --- a/src/main/java/org/spongepowered/asm/util/SignaturePrinter.java +++ b/src/main/java/org/spongepowered/asm/util/SignaturePrinter.java @@ -32,7 +32,6 @@ import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import com.google.common.base.Strings; - /** * Generates callback signature for callback pretty-print */ diff --git a/src/main/java/org/spongepowered/asm/util/VersionNumber.java b/src/main/java/org/spongepowered/asm/util/VersionNumber.java index a95e3068..50625e93 100644 --- a/src/main/java/org/spongepowered/asm/util/VersionNumber.java +++ b/src/main/java/org/spongepowered/asm/util/VersionNumber.java @@ -28,7 +28,6 @@ import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; - /** * Represents a software version number in major.minor.revision.build * format as a sequence of four shorts packed into a long. This is to From 5e22d4bcb7e71d165bdbe117dd6dcf94e356b5d7 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 13 Jan 2016 01:25:01 +0000 Subject: [PATCH 079/169] Provide more information in CallbackInjector error messages --- .../asm/mixin/injection/callback/CallbackInjector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5bbb5758..748c85e7 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 @@ -408,7 +408,7 @@ public class CallbackInjector extends Injector { if (callback.checkDescriptor(returnableSig)) { // Switching out CallbackInfo for CallbackInfoReturnable // worked, so notify the user that they done derped - throw new InvalidInjectionException(this.info, "Invalid descriptor on callback: CallbackInfoReturnable is required!"); + throw new InvalidInjectionException(this.info, "Invalid descriptor on " + this.info + "! CallbackInfoReturnable is required!"); } MethodNode surrogateHandler = ASMHelper.findMethod(this.classNode, this.methodNode.name, callback.getDescriptor()); @@ -416,7 +416,7 @@ public class CallbackInjector extends Injector { // Found a matching surrogate method, use it callbackMethod = surrogateHandler; } else { - throw new InvalidInjectionException(this.info, "Invalid descriptor on callback: expected " + callback.getDescriptor() + throw new InvalidInjectionException(this.info, "Invalid descriptor on " + this.info + "! Expected " + callback.getDescriptor() + " but found " + this.methodNode.desc); } } From 557f363f26bbf200cf10cf152a9b7cc88737cc9f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 13 Jan 2016 01:30:48 +0000 Subject: [PATCH 080/169] Derp --- .../injection/callback/CallbackInjector.java | 13 +------------ .../mixin/transformer/MixinTargetContext.java | 11 +---------- .../org/spongepowered/asm/util/ASMHelper.java | 16 +--------------- 3 files changed, 3 insertions(+), 37 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 748c85e7..75b927b8 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 @@ -31,18 +31,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.AbstractInsnNode; -import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.InsnList; -import org.spongepowered.asm.lib.tree.InsnNode; -import org.spongepowered.asm.lib.tree.JumpInsnNode; -import org.spongepowered.asm.lib.tree.LabelNode; -import org.spongepowered.asm.lib.tree.LdcInsnNode; -import org.spongepowered.asm.lib.tree.LocalVariableNode; -import org.spongepowered.asm.lib.tree.MethodInsnNode; -import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.lib.tree.TypeInsnNode; -import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.injection.Coerce; import org.spongepowered.asm.mixin.injection.InjectionError; import org.spongepowered.asm.mixin.injection.InjectionPoint; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index f077646b..3c44b2a5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -35,16 +35,7 @@ import org.apache.logging.log4j.Level; import org.spongepowered.asm.lib.Handle; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.AbstractInsnNode; -import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.lib.tree.FieldInsnNode; -import org.spongepowered.asm.lib.tree.FieldNode; -import org.spongepowered.asm.lib.tree.InvokeDynamicInsnNode; -import org.spongepowered.asm.lib.tree.LdcInsnNode; -import org.spongepowered.asm.lib.tree.MethodInsnNode; -import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.lib.tree.TypeInsnNode; -import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.SoftOverride; diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 6165e2db..b22d18b3 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -38,21 +38,7 @@ import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.AbstractInsnNode; -import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.lib.tree.FieldInsnNode; -import org.spongepowered.asm.lib.tree.FieldNode; -import org.spongepowered.asm.lib.tree.InsnList; -import org.spongepowered.asm.lib.tree.InsnNode; -import org.spongepowered.asm.lib.tree.IntInsnNode; -import org.spongepowered.asm.lib.tree.JumpInsnNode; -import org.spongepowered.asm.lib.tree.LabelNode; -import org.spongepowered.asm.lib.tree.LdcInsnNode; -import org.spongepowered.asm.lib.tree.LineNumberNode; -import org.spongepowered.asm.lib.tree.MethodInsnNode; -import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.lib.util.CheckClassAdapter; public class ASMHelper { From c6859f713fdf9d3b945c7f6aa7c5dd4fdb060aca Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 13 Jan 2016 01:49:51 +0000 Subject: [PATCH 081/169] Allow min and max values for group criteria, instead of only min --- .../asm/mixin/injection/Group.java | 13 ++- .../mixin/injection/InjectorGroupInfo.java | 85 +++++++++++++------ 2 files changed, 70 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Group.java b/src/main/java/org/spongepowered/asm/mixin/injection/Group.java index 507cd8fc..fa3c2712 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Group.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Group.java @@ -49,10 +49,17 @@ public @interface Group { public String name() default ""; /** - * Require value for this injector group + * Minimum required injections for this injector group * - * @return require value + * @return required min value */ - public int require() default -1; + public int min() default -1; + + /** + * Maximum allowed injections for this injector group + * + * @return allowed max value + */ + public int max() default -1; } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java index 8ebc8afa..9742c3a0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java @@ -102,11 +102,14 @@ public class InjectorGroupInfo { } InjectorGroupInfo groupInfo = this.forName(name); - Integer require = ASMHelper.getAnnotationValue(annotation, "require"); - if (require != null) { - if (require.intValue() != -1) { - groupInfo.setRequired(require.intValue()); - } + Integer min = ASMHelper.getAnnotationValue(annotation, "min"); + if (min != null && min.intValue() != -1) { + groupInfo.setMinRequired(min.intValue()); + } + + Integer max = ASMHelper.getAnnotationValue(annotation, "max"); + if (max != null && max.intValue() != -1) { + groupInfo.setMaxAllowed(max.intValue()); } return groupInfo; @@ -138,7 +141,12 @@ public class InjectorGroupInfo { /** * Number of callbacks we require injected across this group */ - private int requiredCallbackCount = -1; + private int minCallbackCount = -1; + + /** + * Maximum number of callbacks allowed across this group + */ + private int maxCallbackCount = Integer.MAX_VALUE; public InjectorGroupInfo(String name) { this.name = name; @@ -146,15 +154,19 @@ public class InjectorGroupInfo { @Override public String toString() { - return String.format("@Group(name=%s, require=%d)", this.getName(), this.getRequired()); + return String.format("@Group(name=%s, min=%d, max=%d)", this.getName(), this.getMinRequired(), this.getMaxAllowed()); } public String getName() { return this.name; } - public int getRequired() { - return Math.max(this.requiredCallbackCount, 1); + public int getMinRequired() { + return Math.max(this.minCallbackCount, 1); + } + + public int getMaxAllowed() { + return Math.min(this.maxCallbackCount, Integer.MAX_VALUE); } /** @@ -167,23 +179,43 @@ public class InjectorGroupInfo { } /** - * Set the required value for this group. Since this is normally done on the - * first {@link Group} annotation it is considered a warning-level event if - * a later annotation sets a different value. The highest value specified on - * all annotations is always used + * Set the required minimum value for this group. Since this is normally + * done on the first {@link Group} annotation it is considered a + * warning-level event if a later annotation sets a different value. The + * highest value specified on all annotations is always used. * - * @param required new value for required + * @param min new value for min required */ - public void setRequired(int required) { - if (required < 1) { - throw new IllegalArgumentException("Cannot set zero or negative value for injector group required count. Attempted to set required=" - + required + " on " + this + ""); + public void setMinRequired(int min) { + if (min < 1) { + throw new IllegalArgumentException("Cannot set zero or negative value for injector group min count. Attempted to set min=" + + min + " on " + this); } - if (this.requiredCallbackCount > 0 && this.requiredCallbackCount != required) { - LogManager.getLogger("mixin").warn("Conflicting require value '{}' on @Group({}), previously specified {}", required, this.name, - this.requiredCallbackCount); + if (this.minCallbackCount > 0 && this.minCallbackCount != min) { + LogManager.getLogger("mixin").warn("Conflicting min value '{}' on @Group({}), previously specified {}", min, this.name, + this.minCallbackCount); } - this.requiredCallbackCount = Math.max(this.requiredCallbackCount, required); + this.minCallbackCount = Math.max(this.minCallbackCount, min); + } + + /** + * Set the required minimum value for this group. Since this is normally + * done on the first {@link Group} annotation it is considered a + * warning-level event if a later annotation sets a different value. The + * highest value specified on all annotations is always used. + * + * @param max new value for max allowed + */ + public void setMaxAllowed(int max) { + if (max < 1) { + throw new IllegalArgumentException("Cannot set zero or negative value for injector group max count. Attempted to set max=" + + max + " on " + this); + } + if (this.maxCallbackCount > 0 && this.maxCallbackCount != max) { + LogManager.getLogger("mixin").warn("Conflicting max value '{}' on @Group({}), previously specified {}", max, this.name, + this.maxCallbackCount); + } + this.maxCallbackCount = Math.min(this.maxCallbackCount, max); } /** @@ -214,9 +246,12 @@ public class InjectorGroupInfo { total += member.getInjectedCallbackCount(); } - int required = this.getRequired(); - if (total < required) { - throw new InjectionValidationException(this, String.format("expected %d invocation(s) but only %d succeeded", required, total)); + int min = this.getMinRequired(); + int max = this.getMaxAllowed(); + if (total < min) { + throw new InjectionValidationException(this, String.format("expected %d invocation(s) but only %d succeeded", min, total)); + } else if (total > max) { + throw new InjectionValidationException(this, String.format("maximum of %d invocation(s) allowed but %d succeeded", max, total)); } return this; From 0543aab770f1cfdb65316a1e85a5bac570170396 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 13 Jan 2016 01:53:36 +0000 Subject: [PATCH 082/169] Only apply config-wide require value to un-grouped injectors --- .../asm/mixin/injection/InjectorGroupInfo.java | 18 ++++++++++++++++-- .../mixin/injection/struct/InjectionInfo.java | 3 ++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java index 9742c3a0..07f9697b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java @@ -48,7 +48,7 @@ public class InjectorGroupInfo { private static final long serialVersionUID = 1L; - private static final InjectorGroupInfo NO_GROUP = new InjectorGroupInfo("NONE"); + private static final InjectorGroupInfo NO_GROUP = new InjectorGroupInfo("NONE", true); @Override public InjectorGroupInfo get(Object key) { @@ -138,6 +138,11 @@ public class InjectorGroupInfo { */ private final List members = new ArrayList(); + /** + * True if this is the default group + */ + private final boolean isDefault; + /** * Number of callbacks we require injected across this group */ @@ -147,9 +152,14 @@ public class InjectorGroupInfo { * Maximum number of callbacks allowed across this group */ private int maxCallbackCount = Integer.MAX_VALUE; - + public InjectorGroupInfo(String name) { + this(name, false); + } + + InjectorGroupInfo(String name, boolean flag) { this.name = name; + this.isDefault = flag; } @Override @@ -157,6 +167,10 @@ public class InjectorGroupInfo { return String.format("@Group(name=%s, min=%d, max=%d)", this.getName(), this.getMinRequired(), this.getMaxAllowed()); } + public boolean isDefault() { + return this.isDefault; + } + public String getName() { return this.name; } 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 3297e6a0..2d65e8dd 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 @@ -134,7 +134,6 @@ public abstract class InjectionInfo { this.annotationType = annotation.desc.substring(annotation.desc.lastIndexOf('/') + 1).replace(";", ""); this.classNode = mixin.getTargetClass(); this.isStatic = ASMHelper.methodIsStatic(method); - this.requiredCallbackCount = mixin.getDefaultRequiredInjections(); this.readAnnotation(); } @@ -195,6 +194,8 @@ public abstract class InjectionInfo { Integer require = ASMHelper.getAnnotationValue(this.annotation, "require"); if (require != null) { this.requiredCallbackCount = require.intValue(); + } else if (this.group.isDefault()) { + this.requiredCallbackCount = this.mixin.getDefaultRequiredInjections(); } this.injector = this.initInjector(this.annotation); From ec42236133d4e6a1621feea8683063cd67e97da3 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 15 Jan 2016 15:16:05 +0000 Subject: [PATCH 083/169] Abstract blackboard access and update/abstract FML reflection, fixes #92 --- gradle.properties | 2 +- .../spongepowered/asm/launch/Blackboard.java | 78 +++++++++++++++++++ .../asm/launch/MixinBootstrap.java | 11 ++- .../asm/launch/MixinLaunchAgentAbstract.java | 2 +- .../asm/launch/MixinLaunchAgentFML.java | 52 ++++++++++--- .../asm/launch/MixinTweakContainer.java | 3 +- .../asm/mixin/MixinEnvironment.java | 21 ++--- 7 files changed, 134 insertions(+), 35 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/launch/Blackboard.java diff --git a/gradle.properties b/gradle.properties index 756d88e0..ebfaec96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.11 +buildVersion=0.4.12 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/Blackboard.java b/src/main/java/org/spongepowered/asm/launch/Blackboard.java new file mode 100644 index 00000000..bc6ea837 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/launch/Blackboard.java @@ -0,0 +1,78 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.launch; + +import net.minecraft.launchwrapper.Launch; + +/** + * Abstractions for working with {@link Launch#blackboard} + */ +public final class Blackboard { + + /** + * Blackboard keys + */ + public static final class Keys { + + public static final String TWEAKCLASSES = "TweakClasses"; + public static final String TWEAKS = "Tweaks"; + + public static final String INIT = "mixin.initialised"; + public static final String AGENTS = "mixin.agents"; + public static final String CONFIGS = "mixin.configs"; + public static final String TRANSFORMER = "mixin.transformer"; + + public static final String FML_LOAD_CORE_MOD = "mixin.launch.fml.loadcoremodmethod"; + public static final String FML_GET_REPARSEABLE_COREMODS = "mixin.launch.fml.reparseablecoremodsmethod"; + public static final String FML_CORE_MOD_MANAGER = "mixin.launch.fml.coremodmanagerclass"; + public static final String FML_GET_IGNORED_MODS = "mixin.launch.fml.ignoredmodsmethod"; + + private Keys() {} + + } + + private Blackboard() {} + + @SuppressWarnings("unchecked") + public static T get(String key) { + return (T)Launch.blackboard.get(key); + } + + public static void put(String key, Object value) { + Launch.blackboard.put(key, value); + } + + @SuppressWarnings("unchecked") + public static T get(String key, T defaultValue) { + Object value = Launch.blackboard.get(key); + return value != null ? (T)value : defaultValue; + } + + public static String getString(String key, String defaultValue) { + Object value = Launch.blackboard.get(key); + return value != null ? value.toString() : defaultValue; + } + +} diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 08eb8c0a..66339f75 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,13 +60,13 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.11"; + public static final String VERSION = "0.4.12"; /** * Blackboard key where the subsystem version will be stored to indicate * successful bootstrap */ - public static final String INIT_KEY = "mixin.initialised"; +// public static final String INIT_KEY = Blackboard.Keys.INIT; // Consts private static final String LAUNCH_PACKAGE = "org.spongepowered.asm.launch."; @@ -119,7 +119,7 @@ public abstract class MixinBootstrap { * Phase 1 of mixin initialisation */ static boolean preInit() { - Object registeredVersion = Launch.blackboard.get(MixinBootstrap.INIT_KEY); + Object registeredVersion = Blackboard.get(Blackboard.Keys.INIT); if (registeredVersion != null) { if (!registeredVersion.equals(MixinBootstrap.VERSION)) { throw new MixinInitialisationError("Mixin subsystem version " + registeredVersion @@ -129,7 +129,7 @@ public abstract class MixinBootstrap { return false; } - Launch.blackboard.put(MixinBootstrap.INIT_KEY, MixinBootstrap.VERSION); + Blackboard.put(Blackboard.Keys.INIT, MixinBootstrap.VERSION); if (!MixinBootstrap.initialised) { MixinBootstrap.initialised = true; @@ -161,8 +161,7 @@ public abstract class MixinBootstrap { MixinBootstrap.logger.warn("MixinBootstrap.register() called during a tweak constructor. Expect CoModificationException in 5.. 4.."); } - @SuppressWarnings("unchecked") - List tweakClasses = (List)Launch.blackboard.get("TweakClasses"); + List tweakClasses = Blackboard.>get(Blackboard.Keys.TWEAKCLASSES); if (tweakClasses != null) { tweakClasses.add(MixinEnvironment.class.getName() + "$EnvironmentStateTweaker"); } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java index 22182c30..4ba3b701 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java @@ -38,7 +38,7 @@ public abstract class MixinLaunchAgentAbstract implements IMixinLaunchAgent { /** * Logger */ - protected final Logger logger = LogManager.getLogger("mixin"); + protected static final Logger logger = LogManager.getLogger("mixin"); /** * URI to the container diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java index e2b32bdb..316cf195 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java @@ -28,8 +28,10 @@ import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URI; +import java.util.Collections; import java.util.List; +import org.apache.logging.log4j.Level; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.extensibility.IRemapper; @@ -46,6 +48,13 @@ import net.minecraft.launchwrapper.LaunchClassLoader; * performs no further processing of containers if they contain a tweaker!

*/ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { + + private static final String LOAD_CORE_MOD_METHOD = "loadCoreMod"; + private static final String GET_REPARSEABLE_COREMODS_METHOD = "getReparseableCoremods"; + private static final String CORE_MOD_MANAGER_CLASS = "net.minecraftforge.fml.relauncher.CoreModManager"; + private static final String GET_IGNORED_MODS_METHOD = "getIgnoredMods"; + + private static final String FML_REMAPPER_ADAPTER_CLASS = "org.spongepowered.asm.bridge.RemapperAdapterFML"; private static final String MFATT_FORCELOADASMOD = "ForceLoadAsMod"; private static final String MFATT_FMLCOREPLUGIN = "FMLCorePlugin"; @@ -110,12 +119,9 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { */ private void loadAsMod() { try { - Method mdGetLoadedCoremods = this.clCoreModManager.getDeclaredMethod("getLoadedCoremods"); - @SuppressWarnings("unchecked") - List loadedCoremods = (List)mdGetLoadedCoremods.invoke(null); - loadedCoremods.remove(this.fileName); + MixinLaunchAgentFML.getIgnoredMods(this.clCoreModManager).remove(this.fileName); } catch (Exception ex) { - ex.printStackTrace(); + MixinLaunchAgentAbstract.logger.catching(ex); } if (this.attributes.get(MixinLaunchAgentFML.MFATT_COREMODCONTAINSMOD) != null) { @@ -129,7 +135,8 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { */ private void addReparseableJar() { try { - Method mdGetReparsedCoremods = this.clCoreModManager.getDeclaredMethod("getReparseableCoremods"); + Method mdGetReparsedCoremods = this.clCoreModManager.getDeclaredMethod(Blackboard.getString( + Blackboard.Keys.FML_GET_REPARSEABLE_COREMODS, MixinLaunchAgentFML.GET_REPARSEABLE_COREMODS_METHOD)); @SuppressWarnings("unchecked") List reparsedCoremods = (List)mdGetReparsedCoremods.invoke(null); if (!reparsedCoremods.contains(this.fileName)) { @@ -146,7 +153,8 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { return null; } - Method mdLoadCoreMod = this.clCoreModManager.getDeclaredMethod("loadCoreMod", LaunchClassLoader.class, String.class, File.class); + Method mdLoadCoreMod = this.clCoreModManager.getDeclaredMethod(Blackboard.getString( + Blackboard.Keys.FML_LOAD_CORE_MOD, MixinLaunchAgentFML.LOAD_CORE_MOD_METHOD), LaunchClassLoader.class, String.class, File.class); mdLoadCoreMod.setAccessible(true); ITweaker wrapper = (ITweaker)mdLoadCoreMod.invoke(null, Launch.classLoader, coreModName, this.container); if (wrapper == null) { @@ -176,12 +184,12 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { private void injectRemapper() { try { - Class clFmlRemapperAdapter = Class.forName("org.spongepowered.asm.bridge.RemapperAdapterFML", true, Launch.classLoader); + Class clFmlRemapperAdapter = Class.forName(MixinLaunchAgentFML.FML_REMAPPER_ADAPTER_CLASS, true, Launch.classLoader); Method mdCreate = clFmlRemapperAdapter.getDeclaredMethod("create"); IRemapper remapper = (IRemapper)mdCreate.invoke(null); MixinEnvironment.getDefaultEnvironment().getRemappers().add(remapper); } catch (Exception ex) { - this.logger.debug("Failed instancing remapper adapter for FML, things will probably go horribly for notch-obf'd mods!"); + MixinLaunchAgentAbstract.logger.debug("Failed instancing FML remapper adapter, things will probably go horribly for notch-obf'd mods!"); } } @@ -216,9 +224,8 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { * * @return true if FML was already injected */ - @SuppressWarnings("unchecked") protected final boolean isFMLInjected() { - for (String tweaker : (List)Launch.blackboard.get("TweakClasses")) { + for (String tweaker : Blackboard.>get(Blackboard.Keys.TWEAKCLASSES)) { if (tweaker.endsWith("FMLDeobfTweaker")) { return true; } @@ -232,10 +239,31 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { */ private static Class getCoreModManagerClass() throws ClassNotFoundException { try { - return Class.forName("net.minecraftforge.fml.relauncher.CoreModManager"); + return Class.forName(Blackboard.getString( + Blackboard.Keys.FML_CORE_MOD_MANAGER, MixinLaunchAgentFML.CORE_MOD_MANAGER_CLASS)); } catch (ClassNotFoundException ex) { return Class.forName("cpw.mods.fml.relauncher.CoreModManager"); } } + @SuppressWarnings("unchecked") + private static List getIgnoredMods(Class clCoreModManager) throws IllegalAccessException, InvocationTargetException { + Method mdGetIgnoredMods = null; + + try { + mdGetIgnoredMods = clCoreModManager.getDeclaredMethod(Blackboard.getString( + Blackboard.Keys.FML_GET_IGNORED_MODS, MixinLaunchAgentFML.GET_IGNORED_MODS_METHOD)); + } catch (NoSuchMethodException ex1) { + try { + // Legacy name + mdGetIgnoredMods = clCoreModManager.getDeclaredMethod("getLoadedCoremods"); + } catch (NoSuchMethodException ex2) { + MixinLaunchAgentAbstract.logger.catching(Level.DEBUG, ex2); + return Collections.emptyList(); + } + } + + return (List)mdGetIgnoredMods.invoke(null); + } + } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java index 0bb58198..137b69d9 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java @@ -32,7 +32,6 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; /** @@ -43,7 +42,7 @@ public class MixinTweakContainer { public static final List agentClasses = new ArrayList(); static { - Launch.blackboard.put("mixin.agents", MixinTweakContainer.agentClasses); + Blackboard.put(Blackboard.Keys.AGENTS, MixinTweakContainer.agentClasses); MixinTweakContainer.agentClasses.add("org.spongepowered.asm.launch.MixinLaunchAgentFML"); MixinTweakContainer.agentClasses.add("org.spongepowered.asm.launch.MixinLaunchAgentDefault"); } diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 44a8dc8b..b6a3e0b1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -46,6 +46,7 @@ import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.helpers.Booleans; +import org.spongepowered.asm.launch.Blackboard; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; @@ -191,11 +192,10 @@ public class MixinEnvironment implements ITokenProvider { protected abstract boolean detect(); - @SuppressWarnings("unchecked") protected final String getSideName() { // Using this method first prevents us from accidentally loading FML classes // too early when using the tweaker in dev - for (ITweaker tweaker : (List)Launch.blackboard.get("Tweaks")) { + for (ITweaker tweaker : Blackboard.>get(Blackboard.Keys.TWEAKS)) { if (tweaker.getClass().getName().endsWith(".common.launcher.FMLServerTweaker")) { return "SERVER"; } else if (tweaker.getClass().getName().endsWith(".common.launcher.FMLTweaker")) { @@ -569,10 +569,6 @@ public class MixinEnvironment implements ITokenProvider { "cpw.mods.fml.common.asm.transformers.TerminalTransformer" ); - // Blackboard keys - private static final String CONFIGS_KEY = "mixin.configs"; - private static final String TRANSFORMER_KEY = "mixin.transformer"; - /** * Currently active environment */ @@ -664,10 +660,10 @@ public class MixinEnvironment implements ITokenProvider { MixinEnvironment(Phase phase) { this.phase = phase; - this.configsKey = MixinEnvironment.CONFIGS_KEY + "." + this.phase.name.toLowerCase(); + this.configsKey = Blackboard.Keys.CONFIGS + "." + this.phase.name.toLowerCase(); // Sanity check - Object version = Launch.blackboard.get(MixinBootstrap.INIT_KEY); + Object version = this.getVersion(); if (version == null || !MixinBootstrap.VERSION.equals(version)) { throw new RuntimeException("Environment conflict, mismatched versions or you didn't call MixinBootstrap.init()"); } @@ -734,8 +730,7 @@ public class MixinEnvironment implements ITokenProvider { * @return list of registered mixin configs */ public List getMixinConfigs() { - @SuppressWarnings("unchecked") - List mixinConfigs = (List) Launch.blackboard.get(this.configsKey); + List mixinConfigs = Blackboard.>get(this.configsKey); if (mixinConfigs == null) { mixinConfigs = new ArrayList(); Launch.blackboard.put(this.configsKey, mixinConfigs); @@ -844,7 +839,7 @@ public class MixinEnvironment implements ITokenProvider { * @return active mixin transformer instance */ public Object getActiveTransformer() { - return Launch.blackboard.get(MixinEnvironment.TRANSFORMER_KEY); + return Blackboard.get(Blackboard.Keys.TRANSFORMER); } /** @@ -854,7 +849,7 @@ public class MixinEnvironment implements ITokenProvider { */ public void setActiveTransformer(IClassTransformer transformer) { if (transformer != null) { - Launch.blackboard.put(MixinEnvironment.TRANSFORMER_KEY, transformer); + Blackboard.put(Blackboard.Keys.TRANSFORMER, transformer); } } @@ -895,7 +890,7 @@ public class MixinEnvironment implements ITokenProvider { * @return current version */ public String getVersion() { - return (String)Launch.blackboard.get(MixinBootstrap.INIT_KEY); + return Blackboard.get(Blackboard.Keys.INIT); } /** From a99012eabc9178efad58c7e6d4c0664219280b9b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 17 Jan 2016 01:07:41 +0000 Subject: [PATCH 084/169] Resolve methods references recursively as well as fields, fixes #93 --- .../tools/obfuscation/AnnotatedMixin.java | 29 +--------- .../tools/obfuscation/AnnotatedMixins.java | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index e9bcbdc9..9eb4e722 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -627,7 +627,7 @@ class AnnotatedMixin { } if (targetMember.isField()) { - ObfuscationData obfFieldData = this.getObfFieldRecursive(targetMember); + ObfuscationData obfFieldData = this.mixins.getObfFieldRecursive(targetMember); if (obfFieldData.isEmpty()) { this.mixins.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); return false; @@ -645,33 +645,6 @@ class AnnotatedMixin { return true; } - private ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { - ObfuscationData targetNames = this.mixins.getObfClass(targetMember.owner); - ObfuscationData obfFieldData = this.mixins.getObfField(targetMember.toSrg()); - try { - while (obfFieldData.isEmpty()) { - TypeHandle targetType = this.mixins.getTypeHandle(targetMember.owner); - if (targetType == null) { - return obfFieldData; - } - TypeHandle superClass = targetType.getSuperclass(); - if (superClass == null) { - return obfFieldData; - } - targetMember = targetMember.move(superClass.getName()); - obfFieldData = this.mixins.getObfField(targetMember.toSrg()); - if (!obfFieldData.isEmpty()) { - for (ObfuscationType type : obfFieldData) { - obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); - } - } - } - } catch (Exception ex) { - // ??? - } - return obfFieldData; - } - /** * Add a field mapping to the local table */ diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 907560d2..af54467b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -300,6 +300,33 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return new PrintWriter(outSrg.openWriter()); } + public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { + ObfuscationData targetNames = this.getObfClass(targetMember.owner); + ObfuscationData obfMethodData = this.getObfMethod(targetMember.asMethodData()); + try { + while (obfMethodData.isEmpty()) { + TypeHandle targetType = this.getTypeHandle(targetMember.owner); + if (targetType == null) { + return obfMethodData; + } + TypeHandle superClass = targetType.getSuperclass(); + if (superClass == null) { + return obfMethodData; + } + targetMember = targetMember.move(superClass.getName()); + obfMethodData = this.getObfMethod(targetMember.asMethodData()); + if (!obfMethodData.isEmpty()) { + for (ObfuscationType type : obfMethodData) { + obfMethodData.add(type, MemberInfo.fromSrgMethod(obfMethodData.get(type)).move(targetNames.get(type)).asMethodData()); + } + } + } + } catch (Exception ex) { + // ??? + } + return obfMethodData; + } + public ObfuscationData getObfMethod(MemberInfo method) { ObfuscationData data = new ObfuscationData(); @@ -329,6 +356,33 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return data; } + public ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { + ObfuscationData targetNames = this.getObfClass(targetMember.owner); + ObfuscationData obfFieldData = this.getObfField(targetMember.toSrg()); + try { + while (obfFieldData.isEmpty()) { + TypeHandle targetType = this.getTypeHandle(targetMember.owner); + if (targetType == null) { + return obfFieldData; + } + TypeHandle superClass = targetType.getSuperclass(); + if (superClass == null) { + return obfFieldData; + } + targetMember = targetMember.move(superClass.getName()); + obfFieldData = this.getObfField(targetMember.toSrg()); + if (!obfFieldData.isEmpty()) { + for (ObfuscationType type : obfFieldData) { + obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); + } + } + } + } catch (Exception ex) { + // ??? + } + return obfFieldData; + } + /** * Get an obfuscation mapping for a field */ From 4fd21a77c490c86221c765dbf84c3de8996983d1 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 17 Jan 2016 01:08:37 +0000 Subject: [PATCH 085/169] Actually commit the correct code, actually fixes #93 --- .../org/spongepowered/tools/obfuscation/AnnotatedMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 9eb4e722..467767b1 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -634,7 +634,7 @@ class AnnotatedMixin { } this.mixins.addFieldMapping(this.classRef, target, targetMember, obfFieldData); } else { - ObfuscationData obfMethodData = this.mixins.getObfMethod(targetMember); + ObfuscationData obfMethodData = this.mixins.getObfMethodRecursive(targetMember); if (obfMethodData.isEmpty()) { if (targetMember.owner == null || !targetMember.owner.startsWith("java/lang/")) { this.mixins.printMessage(Kind.WARNING, "Cannot find method mapping for @At(" + key + ") '" + target + "'", element, inject); From 09d9d0534bdc73be775b686fe356ca6911929f7c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 17 Jan 2016 01:32:13 +0000 Subject: [PATCH 086/169] Genericise recursive member resolver --- .../tools/obfuscation/AnnotatedMixins.java | 75 +++++++++---------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index af54467b..af4dae7f 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -299,32 +299,52 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp this.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); return new PrintWriter(outSrg.openWriter()); } - - public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { - ObfuscationData targetNames = this.getObfClass(targetMember.owner); - ObfuscationData obfMethodData = this.getObfMethod(targetMember.asMethodData()); + + @SuppressWarnings("unchecked") + public ObfuscationData getObfEntryRecursive(final MemberInfo targetMember) { + MemberInfo currentTarget = targetMember; + ObfuscationData obfTargetNames = this.getObfClass(currentTarget.owner); + ObfuscationData obfData = this.getObfEntry(currentTarget); try { - while (obfMethodData.isEmpty()) { - TypeHandle targetType = this.getTypeHandle(targetMember.owner); + while (obfData.isEmpty()) { + TypeHandle targetType = this.getTypeHandle(currentTarget.owner); if (targetType == null) { - return obfMethodData; + return obfData; } TypeHandle superClass = targetType.getSuperclass(); if (superClass == null) { - return obfMethodData; + return obfData; } - targetMember = targetMember.move(superClass.getName()); - obfMethodData = this.getObfMethod(targetMember.asMethodData()); - if (!obfMethodData.isEmpty()) { - for (ObfuscationType type : obfMethodData) { - obfMethodData.add(type, MemberInfo.fromSrgMethod(obfMethodData.get(type)).move(targetNames.get(type)).asMethodData()); + currentTarget = currentTarget.move(superClass.getName()); + obfData = this.getObfEntry(currentTarget); + if (!obfData.isEmpty()) { + for (ObfuscationType type : obfData) { + String obfClass = obfTargetNames.get(type); + T obfMember = obfData.get(type); + if (currentTarget.isField()) { + obfData.add(type, (T)MemberInfo.fromSrgField(obfMember.toString(), "").move(obfClass).toSrg()); + } else { + obfData.add(type, (T)MemberInfo.fromSrgMethod((MethodData)obfMember).move(obfClass).asMethodData()); + } } } } } catch (Exception ex) { - // ??? + return this.getObfEntry(targetMember); } - return obfMethodData; + return obfData; + } + + @SuppressWarnings("unchecked") + public ObfuscationData getObfEntry(MemberInfo targetMember) { + if (targetMember.isField()) { + return (ObfuscationData)this.getObfField(targetMember.toSrg()); + } + return (ObfuscationData)this.getObfMethod(targetMember.asMethodData()); + } + + public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { + return this.getObfEntryRecursive(targetMember); } public ObfuscationData getObfMethod(MemberInfo method) { @@ -357,30 +377,7 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp } public ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { - ObfuscationData targetNames = this.getObfClass(targetMember.owner); - ObfuscationData obfFieldData = this.getObfField(targetMember.toSrg()); - try { - while (obfFieldData.isEmpty()) { - TypeHandle targetType = this.getTypeHandle(targetMember.owner); - if (targetType == null) { - return obfFieldData; - } - TypeHandle superClass = targetType.getSuperclass(); - if (superClass == null) { - return obfFieldData; - } - targetMember = targetMember.move(superClass.getName()); - obfFieldData = this.getObfField(targetMember.toSrg()); - if (!obfFieldData.isEmpty()) { - for (ObfuscationType type : obfFieldData) { - obfFieldData.add(type, MemberInfo.fromSrgField(obfFieldData.get(type), "").move(targetNames.get(type)).toSrg()); - } - } - } - } catch (Exception ex) { - // ??? - } - return obfFieldData; + return this.getObfEntryRecursive(targetMember); } /** From c1d494d41cc6858f2eb4e9ef3d1f9e41a53fd8ec Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 18 Jan 2016 12:45:00 +0000 Subject: [PATCH 087/169] Fall back to generated LVT for synthetic locals, fixes #88 --- .../org/spongepowered/asm/util/Locals.java | 72 ++++++++++++++----- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index d44a3bf7..4ff784b0 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -219,23 +219,48 @@ public class Locals { * variable at the specified location in the specified local slot */ public static LocalVariableNode getLocalVariableAt(ClassNode classNode, MethodNode method, AbstractInsnNode node, int var) { + return Locals.getLocalVariableAt(classNode, method, method.instructions.indexOf(node), var); + } + + /** + * Attempts to locate the appropriate entry in the local variable table for + * the specified local variable index at the location specified by pos. + * + * @param classNode Containing class + * @param method Method + * @param var Local variable index + * @param pos The opcode index to get the local variable table at + * @return a LocalVariableNode containing information about the local + * variable at the specified location in the specified local slot + */ + private static LocalVariableNode getLocalVariableAt(ClassNode classNode, MethodNode method, int pos, int var) { LocalVariableNode localVariableNode = null; + LocalVariableNode fallbackNode = null; - int pos = method.instructions.indexOf(node); - - List localVariables = Locals.getLocalVariableTable(classNode, method); - for (LocalVariableNode local : localVariables) { + for (LocalVariableNode local : Locals.getLocalVariableTable(classNode, method)) { if (local.index != var) { continue; } - int start = method.instructions.indexOf(local.start); - int end = method.instructions.indexOf(local.end); - if (localVariableNode == null || start < pos && end > pos) { + if (Locals.isOpcodeInRange(method.instructions, local, pos)) { localVariableNode = local; + } else if (localVariableNode == null) { + fallbackNode = local; } } + + if (localVariableNode == null && !method.localVariables.isEmpty()) { + for (LocalVariableNode local : Locals.getGeneratedLocalVariableTable(classNode, method)) { + if (local.index == var && Locals.isOpcodeInRange(method.instructions, local, pos)) { + localVariableNode = local; + } + } + } + + return localVariableNode != null ? localVariableNode : fallbackNode; + } - return localVariableNode; + private static boolean isOpcodeInRange(InsnList insns, LocalVariableNode local, int pos) { + return insns.indexOf(local.start) < pos && insns.indexOf(local.end) > pos; } /** @@ -247,23 +272,32 @@ public class Locals { * * @param classNode Containing class * @param method Method - * @return generated local variable table + * @return local variable table */ public static List getLocalVariableTable(ClassNode classNode, MethodNode method) { if (method.localVariables.isEmpty()) { - String signature = String.format("%s.%s%s", classNode.name, method.name, method.desc); - - List localVars = Locals.calculatedLocalVariables.get(signature); - if (localVars != null) { - return localVars; - } - - localVars = Locals.generateLocalVariableTable(classNode, method); - Locals.calculatedLocalVariables.put(signature, localVars); + return Locals.getGeneratedLocalVariableTable(classNode, method); + } + return method.localVariables; + } + + /** + * Gets the generated the local variable table for the specified method. + * + * @param classNode Containing class + * @param method Method + * @return generated local variable table + */ + public static List getGeneratedLocalVariableTable(ClassNode classNode, MethodNode method) { + String methodId = String.format("%s.%s%s", classNode.name, method.name, method.desc); + List localVars = Locals.calculatedLocalVariables.get(methodId); + if (localVars != null) { return localVars; } - return method.localVariables; + localVars = Locals.generateLocalVariableTable(classNode, method); + Locals.calculatedLocalVariables.put(methodId, localVars); + return localVars; } /** From 35acd06d4b52e5c6407f1c5c378997c57ac34f6d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 20 Jan 2016 11:52:38 +0000 Subject: [PATCH 088/169] Fix erroneous warning in InjectorGroupInfo --- .../spongepowered/asm/mixin/injection/InjectorGroupInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java index 07f9697b..a9fdf162 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java @@ -225,7 +225,7 @@ public class InjectorGroupInfo { throw new IllegalArgumentException("Cannot set zero or negative value for injector group max count. Attempted to set max=" + max + " on " + this); } - if (this.maxCallbackCount > 0 && this.maxCallbackCount != max) { + if (this.maxCallbackCount < Integer.MAX_VALUE && this.maxCallbackCount != max) { LogManager.getLogger("mixin").warn("Conflicting max value '{}' on @Group({}), previously specified {}", max, this.name, this.maxCallbackCount); } From 8c450d428264f536f138abd4a80d2017f26261b4 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 20 Jan 2016 15:04:51 +0000 Subject: [PATCH 089/169] Add Final annotation, version bump to 0.4.13 --- checkstyle.xml | 259 +++++++----------- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../org/spongepowered/asm/mixin/Final.java | 62 +++++ .../asm/mixin/transformer/ClassInfo.java | 37 ++- .../mixin/transformer/MixinApplicator.java | 8 +- .../mixin/transformer/MixinPreProcessor.java | 27 +- .../mixin/transformer/MixinTargetContext.java | 53 +++- 8 files changed, 268 insertions(+), 182 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/Final.java diff --git a/checkstyle.xml b/checkstyle.xml index 25b8ebfd..3e06aaf5 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,171 +1,100 @@ - - + + - + This configuration file was written by the eclipse-cs plugin configuration editor +--> + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle.properties b/gradle.properties index ebfaec96..2069d9c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.12 +buildVersion=0.4.13 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 66339f75..aeaad19a 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.12"; + public static final String VERSION = "0.4.13"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/Final.java b/src/main/java/org/spongepowered/asm/mixin/Final.java new file mode 100644 index 00000000..1b78a4de --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/Final.java @@ -0,0 +1,62 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.transformer.InvalidMixinException; + +/** + * This annotation has two uses: + * + *
    + *
  • + * On an {@link Shadow} field, it can be used to raise an error-level log + * message if any write occurrences appear in the mixin bytecode. This can + * be used in place of declaring the field as actually final. This + * is required since it is normally desirable to remove the final + * modifier from shadow fields to avoid unwanted field initialisers. If + * {@link Option#DEBUG_VERIFY} is true, then an + * {@link InvalidMixinException} is thrown. + *
  • + *
  • + * On an {@link Inject injector} or {@link Overwrite overwritten} method, + * it is equivalent to setting the priority of the containing mixin to + * {@link Integer#MAX_VALUE} but applies only to the annotated method. This + * allows methods to mark themselves as effectively final, preventing their + * replacement by later mixins with higher priority. + *
  • + *
+ */ +@Target({ ElementType.METHOD, ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface Final { + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 33e24861..8fdc1a3d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -43,6 +43,7 @@ import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.FrameNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.transformer.ClassInfo.Member.Type; @@ -190,6 +191,11 @@ public class ClassInfo extends TreeInfo { * if the member has been renamed */ private String currentName; + + /** + * True if this member is decorated with {@link Final} + */ + private boolean decoratedFinal; protected Member(Member member) { this(member.type, member.memberName, member.memberDesc, member.modifiers, member.isInjected); @@ -237,6 +243,22 @@ public class ClassInfo extends TreeInfo { return (this.modifiers & Opcodes.ACC_STATIC) != 0; } + public boolean isAbstract() { + return (this.modifiers & Opcodes.ACC_ABSTRACT) != 0; + } + + public boolean isFinal() { + return (this.modifiers & Opcodes.ACC_FINAL) != 0; + } + + public boolean isDecoratedFinal() { + return this.decoratedFinal; + } + + public void setDecoratedFinal(boolean decoratedFinal) { + this.decoratedFinal = decoratedFinal; + } + public boolean matchesFlags(int flags) { return (((~this.modifiers | (flags & ClassInfo.INCLUDE_PRIVATE)) & ClassInfo.INCLUDE_PRIVATE) != 0 && ((~this.modifiers | (flags & ClassInfo.INCLUDE_STATIC)) & ClassInfo.INCLUDE_STATIC) != 0); @@ -282,11 +304,11 @@ public class ClassInfo extends TreeInfo { @Override public String toString() { - return this.memberName + this.memberDesc; + return String.format(this.getDisplayFormat(), this.memberName, this.memberDesc); } - public boolean isAbstract() { - return (this.modifiers & Opcodes.ACC_ABSTRACT) != 0; + protected String getDisplayFormat() { + return "%s%s"; } } @@ -419,6 +441,11 @@ public class ClassInfo extends TreeInfo { return super.equals(obj); } + + @Override + protected String getDisplayFormat() { + return "%s:%s"; + } } private static final Logger logger = LogManager.getLogger("mixin"); @@ -579,9 +606,7 @@ public class ClassInfo extends TreeInfo { } } - if ((field.access & Opcodes.ACC_STATIC) == 0) { - this.fields.add(new Field(field, this.isMixin)); - } + this.fields.add(new Field(field, this.isMixin)); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 4b79f97a..142ada0b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -46,6 +46,7 @@ import org.spongepowered.asm.lib.tree.LabelNode; import org.spongepowered.asm.lib.tree.LineNumberNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; @@ -380,7 +381,12 @@ public class MixinApplicator { int priority = ASMHelper.getAnnotationValue(merged, "priority"); if (priority >= mixin.getPriority() && !owner.equals(mixin.getClassName())) { - this.logger.warn("Method overwrite conflict for {}, previously written by {}. Skipping method.", method.name, owner); + this.logger.warn("Method overwrite conflict for {} in {}, previously written by {}. Skipping method.", method.name, mixin, owner); + return true; + } + + if (ASMHelper.getVisibleAnnotation(target, Final.class) != null) { + this.logger.warn("Method overwrite conflict for @Final method {} in {} declared by {}. Skipping method.", method.name, mixin, owner); return true; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index fbb6d89a..dfa23fbe 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -30,6 +30,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.AnnotationNode; @@ -38,10 +40,12 @@ import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.RemapperChain; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; @@ -68,6 +72,11 @@ import org.spongepowered.asm.util.Constants; * class members for obvious reasons.

*/ class MixinPreProcessor { + + /** + * Logger + */ + private static final Logger logger = LogManager.getLogger("mixin"); /** * The mixin @@ -79,11 +88,14 @@ class MixinPreProcessor { */ private final ClassNode classNode; + private final boolean verboseLogging; + private boolean prepared, attached; MixinPreProcessor(MixinInfo mixin, ClassNode classNode) { this.mixin = mixin; this.classNode = classNode; + this.verboseLogging = mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERBOSE); } /** @@ -212,6 +224,7 @@ class MixinPreProcessor { for (Iterator iter = this.classNode.fields.iterator(); iter.hasNext();) { FieldNode mixinField = iter.next(); AnnotationNode shadow = ASMHelper.getVisibleAnnotation(mixinField, Shadow.class); + boolean isFinal = ASMHelper.getVisibleAnnotation(mixinField, Final.class) != null; if (!this.validateField(context, mixinField, shadow)) { iter.remove(); continue; @@ -252,7 +265,19 @@ class MixinPreProcessor { iter.remove(); if (shadow != null) { - context.addShadowField(mixinField); + if (field == null) { + throw new InvalidMixinException(this.mixin, "Unable to locate field surrogate: " + mixinField.name + " in " + this.mixin); + } + field.setDecoratedFinal(isFinal); + + if (this.verboseLogging && MixinApplicator.hasFlag(target, Opcodes.ACC_FINAL) != isFinal) { + String message = isFinal + ? "@Shadow field {}::{} is decorated with @Final but target is not final" + : "@Shadow target {}::{} is final but shadow is not decorated with @Final"; + MixinPreProcessor.logger.warn(message, this.mixin, mixinField.name); + } + + context.addShadowField(mixinField, field); } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 3c44b2a5..4b12d9db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -25,19 +25,25 @@ package org.spongepowered.asm.mixin.transformer; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.Handle; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.SoftOverride; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.InjectionError; @@ -45,6 +51,7 @@ import org.spongepowered.asm.mixin.injection.InjectionValidationException; import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Traversal; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; @@ -58,6 +65,11 @@ import org.spongepowered.asm.util.Constants; * in the mixin to the appropriate members in the target class hierarchy. */ public class MixinTargetContext implements IReferenceMapperContext { + + /** + * Logger + */ + private static final Logger logger = LogManager.getLogger("mixin"); /** * Mixin info @@ -87,7 +99,7 @@ public class MixinTargetContext implements IReferenceMapperContext { /** * Shadow field list */ - private final List shadowFields = new ArrayList(); + private final Map shadowFields = new LinkedHashMap(); /** * Information about methods in the target class, used to keep track of @@ -141,10 +153,10 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * @param field + * @param fieldNode */ - void addShadowField(FieldNode field) { - this.shadowFields.add(field); + void addShadowField(FieldNode fieldNode, Field fieldInfo) { + this.shadowFields.put(fieldNode, fieldInfo); } /* (non-Javadoc) @@ -286,6 +298,7 @@ public class MixinTargetContext implements IReferenceMapperContext { this.transformMethodRef(method, iter, new MemberRef.Method((MethodInsnNode)insn)); } else if (insn instanceof FieldInsnNode) { this.transformFieldRef(method, iter, new MemberRef.Field((FieldInsnNode)insn)); + this.checkFinal(method, iter, (FieldInsnNode)insn); } else if (insn instanceof TypeInsnNode) { this.transformTypeNode(method, iter, (TypeInsnNode)insn, lastInsn); } else if (insn instanceof LdcInsnNode) { @@ -370,6 +383,32 @@ public class MixinTargetContext implements IReferenceMapperContext { } } + private void checkFinal(MethodNode method, Iterator iter, FieldInsnNode fieldNode) { + if (!fieldNode.owner.equals(this.targetClass.name)) { + return; + } + + int opcode = fieldNode.getOpcode(); + if (opcode == Opcodes.GETFIELD || opcode == Opcodes.GETSTATIC) { + return; + } + + for (Entry shadow : this.shadowFields.entrySet()) { + FieldNode shadowField = shadow.getKey(); + if (!shadowField.desc.equals(fieldNode.desc) || !shadowField.name.equals(fieldNode.name)) { + continue; + } + if (shadow.getValue().isDecoratedFinal()) { + MixinTargetContext.logger.error("Write access detected to @Final field {} in {}::{}", shadow.getValue(), this.mixin, method.name); + if (this.mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERIFY)) { + throw new InvalidMixinException(this.mixin, "Write access detected to @Final field " + shadow.getValue() + " in " + this.mixin + + "::" + method.name); + } + } + return; + } + } + /** * Transforms type operations (eg. cast, instanceof) in the method being * processed. Changes references to mixin classes to that of the appropriate @@ -720,7 +759,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * * @return shadow methods in the mixin */ - public List getShadowMethods() { + public Collection getShadowMethods() { return this.shadowMethods; } @@ -738,8 +777,8 @@ public class MixinTargetContext implements IReferenceMapperContext { * * @return shadow fields in the mixin */ - public List getShadowFields() { - return this.shadowFields; + public Collection getShadowFields() { + return this.shadowFields.keySet(); } /** From 46e20b1f4e864a7d7b27bb61e45cb8b59c4fe26f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 15 Jan 2016 15:35:09 +0000 Subject: [PATCH 090/169] Interface mixins dev --- gradle.properties | 2 +- .../tools/obfuscation/AnnotatedMixin.java | 23 +++- .../tools/obfuscation/MixinProcessor.java | 4 +- .../validation/TargetValidator.java | 22 ++- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/MixinEnvironment.java | 8 +- .../asm/mixin/extensibility/IMixinInfo.java | 8 ++ .../injection/InvalidInjectionException.java | 12 ++ .../asm/mixin/transformer/ClassInfo.java | 2 +- .../transformer/IMixinTransformerModule.java | 16 +-- .../transformer/InterfaceMixinApplicator.java | 108 +++++++++++++++ .../InterfaceMixinPreProcessor.java | 82 +++++++++++ .../mixin/transformer/MixinApplicator.java | 79 ++++++----- .../asm/mixin/transformer/MixinInfo.java | 78 +++++++++-- .../mixin/transformer/MixinPreProcessor.java | 72 ++++++---- .../mixin/transformer/MixinTransformer.java | 54 ++++---- .../MixinTransformerModuleCheckClass.java | 17 +-- ...ixinTransformerModuleInterfaceChecker.java | 16 +-- .../mixin/transformer/TargetClassContext.java | 130 ++++++++++++++++++ 19 files changed, 585 insertions(+), 150 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java diff --git a/gradle.properties b/gradle.properties index 2069d9c3..0fc458be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.13 +buildVersion=0.4.14 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 467767b1..d2f4d560 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -37,6 +37,7 @@ import java.util.Set; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; @@ -230,6 +231,11 @@ class AnnotatedMixin { */ private final TypeHandle handle; + /** + * True if this is an interface mixin + */ + private final boolean isInterface; + /** * Specified targets */ @@ -266,11 +272,11 @@ class AnnotatedMixin { private final Map> methodMappings = new HashMap>(); public AnnotatedMixin(AnnotatedMixins mixins, TypeElement type) { - this.annotation = MirrorUtils.getAnnotation(type, Mixin.class); this.mixins = mixins; this.mixin = type; this.handle = new TypeHandle(type); + this.isInterface = type.getKind() == ElementKind.INTERFACE; this.classRef = type.getQualifiedName().toString().replace('.', '/'); TypeHandle primaryTarget = this.initTargets(); @@ -376,6 +382,13 @@ class AnnotatedMixin { return this.handle; } + /** + * Get whether this is an interface mixin + */ + public boolean isInterface() { + return this.isInterface; + } + /** * Get the mixin's targets */ @@ -544,6 +557,10 @@ class AnnotatedMixin { * @return pending error message or null if no error condition */ public Message registerInjector(ExecutableElement method, AnnotationMirror inject, boolean remap) { + if (this.isInterface) { + this.mixins.printMessage(Kind.ERROR, "Injector in interface is unsupported", method); + } + String originalReference = MirrorUtils.getAnnotationValue(inject, "method"); MemberInfo targetMember = MemberInfo.parse(originalReference); if (targetMember.name == null) { @@ -591,6 +608,10 @@ class AnnotatedMixin { * and process the references */ public int registerInjectionPoint(Element element, AnnotationMirror inject, AnnotationMirror at) { + if (this.isInterface) { + this.mixins.printMessage(Kind.ERROR, "Injector in interface is unsupported", element); + } + if (!AnnotatedMixins.getRemapValue(at)) { return 0; } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java index 77bb75d0..6c585c48 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java @@ -61,10 +61,10 @@ public abstract class MixinProcessor extends AbstractProcessor { this.mixins.onPassStarted(); for (Element elem : roundEnv.getElementsAnnotatedWith(Mixin.class)) { - if (elem.getKind() == ElementKind.CLASS) { + if (elem.getKind() == ElementKind.CLASS || elem.getKind() == ElementKind.INTERFACE) { this.mixins.registerMixin((TypeElement)elem); } else { - this.mixins.printMessage(Kind.ERROR, "Found an @Mixin annotation on an element which is not a class", elem); + this.mixins.printMessage(Kind.ERROR, "Found an @Mixin annotation on an element which is not a class or interface", elem); } } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java index 22bf1883..13bd46b4 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java @@ -29,6 +29,7 @@ import java.util.Collection; import javax.annotation.processing.Messager; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; @@ -67,6 +68,25 @@ public class TargetValidator extends MixinValidator { return true; } + if (mixin.getKind() == ElementKind.INTERFACE) { + this.validateInterfaceMixin(mixin, targets); + } else { + this.validateClassMixin(mixin, targets); + } + + return true; + } + + private void validateInterfaceMixin(TypeElement mixin, Collection targets) { + for (TypeHandle target : targets) { + TypeElement targetType = target.getElement(); + if (targetType != null && !(targetType.getKind() == ElementKind.INTERFACE)) { + this.error("Targetted type '" + target + " of " + mixin + " is not an interface", mixin); + } + } + } + + private void validateClassMixin(TypeElement mixin, Collection targets) { TypeMirror superClass = mixin.getSuperclass(); for (TypeHandle target : targets) { @@ -75,8 +95,6 @@ public class TargetValidator extends MixinValidator { this.error("Superclass " + superClass + " of " + mixin + " was not found in the hierarchy of target class " + targetType, mixin); } } - - return true; } private boolean validateSuperClass(TypeMirror targetType, TypeMirror superClass) { diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index aeaad19a..036209b9 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.13"; + public static final String VERSION = "0.4.14"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index b6a3e0b1..61686407 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -437,11 +437,11 @@ public class MixinEnvironment implements ITokenProvider { private final int classVersion; - private final boolean resolveMethodsInInterfaces; + private final boolean supportsMethodsInInterfaces; private CompatibilityLevel(int classVersion, boolean resolveMethodsInInterfaces) { this.classVersion = classVersion; - this.resolveMethodsInInterfaces = resolveMethodsInInterfaces; + this.supportsMethodsInInterfaces = resolveMethodsInInterfaces; } boolean isSupported() { @@ -452,8 +452,8 @@ public class MixinEnvironment implements ITokenProvider { return this.classVersion; } - public boolean resolveMethodsInInterfaces() { - return this.resolveMethodsInInterfaces; + public boolean supportsMethodsInInterfaces() { + return this.supportsMethodsInInterfaces; } public boolean isAtLeast(CompatibilityLevel level) { diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java index e5237400..696417c2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java @@ -102,4 +102,12 @@ public interface IMixinInfo { * @return the phase */ public abstract Phase getPhase(); + + /** + * Get whether this is an interface mixin or not + * + * @return true if this is an interface mixin + */ + public abstract boolean isInterfaceMixin(); + } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java index a698cd90..03d551e3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java @@ -32,29 +32,41 @@ import org.spongepowered.asm.mixin.transformer.MixinTargetContext; public class InvalidInjectionException extends InvalidMixinException { private static final long serialVersionUID = 1L; + + private final InjectionInfo info; public InvalidInjectionException(MixinTargetContext mixin, String message) { super(mixin, message); + this.info = null; } public InvalidInjectionException(InjectionInfo info, String message) { super(info.getContext(), message); + this.info = info; } public InvalidInjectionException(MixinTargetContext mixin, Throwable cause) { super(mixin, cause); + this.info = null; } public InvalidInjectionException(InjectionInfo info, Throwable cause) { super(info.getContext(), cause); + this.info = info; } public InvalidInjectionException(MixinTargetContext mixin, String message, Throwable cause) { super(mixin, message, cause); + this.info = null; } public InvalidInjectionException(InjectionInfo info, String message, Throwable cause) { super(info.getContext(), message, cause); + this.info = info; + } + + public InjectionInfo getInjectionInfo() { + return this.info; } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 8fdc1a3d..05b1f95b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -1282,7 +1282,7 @@ public class ClassInfo extends TreeInfo { } } - if (type == Type.METHOD && (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces())) { + if (type == Type.METHOD && (this.isInterface || MixinEnvironment.getCompatibilityLevel().supportsMethodsInInterfaces())) { for (String implemented : this.interfaces) { ClassInfo iface = ClassInfo.forName(implemented); if (iface == null) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java b/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java index dc82fd25..75919aaa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/IMixinTransformerModule.java @@ -24,10 +24,6 @@ */ package org.spongepowered.asm.mixin.transformer; -import java.util.SortedSet; - -import org.spongepowered.asm.lib.tree.ClassNode; - /** * Mixin Transformer Module interface for pre- and post-processors */ @@ -36,19 +32,15 @@ public interface IMixinTransformerModule { /** * Called before the mixins are applied * - * @param transformedName Target class name - * @param targetClass Target class tree - * @param mixins Mixins to be applied + * @param context Target class context */ - public abstract void preApply(String transformedName, ClassNode targetClass, SortedSet mixins); + public abstract void preApply(TargetClassContext context); /** * Called after the mixins are applied * - * @param transformedName Target class name - * @param targetClass Target class tree - * @param mixins Mixins which were applied + * @param context Target class context */ - public abstract void postApply(String transformedName, ClassNode targetClass, SortedSet mixins); + public abstract void postApply(TargetClassContext context); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java new file mode 100644 index 00000000..5a309940 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java @@ -0,0 +1,108 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer; + +import org.spongepowered.asm.lib.tree.FieldNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.InvalidInjectionException; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; + +/** + * Applicator for interface mixins, mainly just disables things which aren't + * supported for interface mixins + */ +public class InterfaceMixinApplicator extends MixinApplicator { + + /** + * ctor + * + * @param context applier context + */ + InterfaceMixinApplicator(TargetClassContext context) { + super(context); + } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.transformer.MixinApplicator + * #applyInterfaces( + * org.spongepowered.asm.mixin.transformer.MixinTargetContext) + */ + @Override + protected void applyInterfaces(MixinTargetContext mixin) { + for (String interfaceName : mixin.getInterfaces()) { + if (!this.targetClass.name.equals(interfaceName) && !this.targetClass.interfaces.contains(interfaceName)) { + this.targetClass.interfaces.add(interfaceName); + mixin.getTargetClassInfo().addInterface(interfaceName); + } + } + } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.transformer.MixinApplicator + * #applyFields( + * org.spongepowered.asm.mixin.transformer.MixinTargetContext) + */ + @Override + protected void applyFields(MixinTargetContext mixin) { + // shadow fields have no meaning for interfaces, just spam the dev with messages + for (FieldNode shadow : mixin.getShadowFields()) { + this.logger.error("Ignoring redundant @Shadow field {}:{} in {}", shadow.name, shadow.desc, mixin); + } + + this.mergeNewFields(mixin); + } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.transformer.MixinApplicator + * #applyInitialisers( + * org.spongepowered.asm.mixin.transformer.MixinTargetContext) + */ + @Override + protected void applyInitialisers(MixinTargetContext mixin) { + // disabled for interface mixins + } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.transformer.MixinApplicator + * #applyInjections( + * org.spongepowered.asm.mixin.transformer.MixinTargetContext) + */ + @Override + protected void applyInjections(MixinTargetContext mixin) { + // disabled for interface mixins + for (MethodNode method : this.targetClass.methods) { + try { + InjectionInfo injectInfo = InjectionInfo.parse(mixin, method); + if (injectInfo != null) { + throw new InvalidMixinException(mixin, injectInfo + " is not supported"); + } + } catch (InvalidInjectionException ex) { + String description = ex.getInjectionInfo() != null ? ex.getInjectionInfo().toString() : "Injection"; + throw new InvalidMixinException(mixin, description + " is not supported"); + } + } + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java new file mode 100644 index 00000000..da26f550 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java @@ -0,0 +1,82 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer; + +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.FieldNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; + +/** + * Bytecode preprocessor for interface mixins, simply performs some additional + * verification for things which are unsupported in interfaces + */ +class InterfaceMixinPreProcessor extends MixinPreProcessor { + + /** + * Ctor + * + * @param mixin Mixin info + * @param classNode Mixin classnode + */ + InterfaceMixinPreProcessor(MixinInfo mixin, ClassNode classNode) { + super(mixin, classNode); + } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.transformer.MixinPreProcessor + * #prepareMethod(org.spongepowered.asm.lib.tree.MethodNode, + * org.spongepowered.asm.mixin.transformer.ClassInfo.Method) + */ + @Override + protected void prepareMethod(MethodNode mixinMethod, Method method) { + // I have no idea how the hell you'd compile this, but we make sure anyway! + if (!MixinApplicator.hasFlag(mixinMethod, Opcodes.ACC_PUBLIC)) { + throw new InvalidMixinException(this.mixin, "Interface mixin contains a non-public method! Found " + method + " in " + this.mixin); + } + + super.prepareMethod(mixinMethod, method); + } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.transformer.MixinPreProcessor + * #validateField( + * org.spongepowered.asm.mixin.transformer.MixinTargetContext, + * org.spongepowered.asm.lib.tree.FieldNode, + * org.spongepowered.asm.lib.tree.AnnotationNode) + */ + @Override + protected boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { + if (!MixinApplicator.hasFlag(field, Opcodes.ACC_STATIC)) { + throw new InvalidMixinException(this.mixin, "Interface mixin contains an instance field! Found " + field.name + " in " + + this.mixin); + } + + return super.validateField(context, field, shadow); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 142ada0b..6a49c70b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -146,7 +146,7 @@ public class MixinApplicator { * locals are shifted so that they don't interfere with locals in the * receiving constructor. */ - private static final int[] INITIALISER_OPCODE_BLACKLIST = { + protected static final int[] INITIALISER_OPCODE_BLACKLIST = { Opcodes.RETURN, Opcodes.ILOAD, Opcodes.LLOAD, Opcodes.FLOAD, Opcodes.DLOAD, Opcodes.IALOAD, Opcodes.LALOAD, Opcodes.FALOAD, Opcodes.DALOAD, Opcodes.AALOAD, Opcodes.BALOAD, Opcodes.CALOAD, Opcodes.SALOAD, Opcodes.ISTORE, Opcodes.LSTORE, Opcodes.FSTORE, Opcodes.DSTORE, Opcodes.ASTORE, Opcodes.IASTORE, Opcodes.LASTORE, Opcodes.FASTORE, Opcodes.DASTORE, Opcodes.AASTORE, Opcodes.BASTORE, Opcodes.CASTORE, @@ -156,29 +156,29 @@ public class MixinApplicator { /** * Log more things */ - private final Logger logger = LogManager.getLogger("mixin"); + protected final Logger logger = LogManager.getLogger("mixin"); /** * Session ID, used as a check when parsing {@link MixinMerged} annotations * to prevent them being applied at compile time by people trying to * circumvent mixin application */ - private final String sessionId; + protected final String sessionId; /** * Target class name */ - private final String targetName; + protected final String targetName; /** * Target class tree */ - private final ClassNode targetClass; + protected final ClassNode targetClass; - MixinApplicator(String sessionId, String transformedName, ClassNode targetClass) { - this.sessionId = sessionId; - this.targetName = transformedName; - this.targetClass = targetClass; + MixinApplicator(TargetClassContext context) { + this.sessionId = context.getSessionId(); + this.targetName = context.getName(); + this.targetClass = context.getClassNode(); } /** @@ -196,7 +196,7 @@ public class MixinApplicator { * * @param mixin Mixin to apply */ - private void applyMixin(MixinTargetContext mixin) { + protected final void applyMixin(MixinTargetContext mixin) { try { mixin.preApply(this.targetName, this.targetClass); @@ -221,7 +221,7 @@ public class MixinApplicator { * * @param mixin */ - private void applyInterfaces(MixinTargetContext mixin) { + protected void applyInterfaces(MixinTargetContext mixin) { for (String interfaceName : mixin.getInterfaces()) { if (!this.targetClass.interfaces.contains(interfaceName)) { this.targetClass.interfaces.add(interfaceName); @@ -235,7 +235,7 @@ public class MixinApplicator { * * @param mixin */ - private void applyAttributes(MixinTargetContext mixin) { + protected void applyAttributes(MixinTargetContext mixin) { if (mixin.shouldSetSourceFile()) { this.targetClass.sourceFile = mixin.getSourceFile(); } @@ -247,7 +247,7 @@ public class MixinApplicator { * * @param mixin */ - private void applyAnnotations(MixinTargetContext mixin) { + protected void applyAnnotations(MixinTargetContext mixin) { ClassNode sourceClass = mixin.getClassNode(); this.mergeAnnotations(sourceClass, this.targetClass); } @@ -260,14 +260,21 @@ public class MixinApplicator { * * @param mixin */ - private void applyFields(MixinTargetContext mixin) { + protected void applyFields(MixinTargetContext mixin) { + this.mergeShadowFieldAnnotations(mixin); + this.mergeNewFields(mixin); + } + + protected void mergeShadowFieldAnnotations(MixinTargetContext mixin) { for (FieldNode shadow : mixin.getShadowFields()) { FieldNode target = this.findTargetField(shadow); if (target != null) { this.mergeAnnotations(shadow, target); } } - + } + + protected void mergeNewFields(MixinTargetContext mixin) { for (FieldNode field : mixin.getFields()) { FieldNode target = this.findTargetField(field); if (target == null) { @@ -282,7 +289,7 @@ public class MixinApplicator { * * @param mixin */ - private void applyMethods(MixinTargetContext mixin) { + protected void applyMethods(MixinTargetContext mixin) { for (MethodNode shadow : mixin.getShadowMethods()) { MethodNode target = this.findTargetMethod(shadow); if (target != null) { @@ -325,11 +332,11 @@ public class MixinApplicator { * @param isOverwrite true if the method is annotated with an * {@link Overwrite} annotation */ - private void mergeMethod(MixinTargetContext mixin, MethodNode method, boolean isOverwrite) { + protected void mergeMethod(MixinTargetContext mixin, MethodNode method, boolean isOverwrite) { MethodNode target = this.findTargetMethod(method); if (target != null) { - if (this.alreadyMerged(mixin, method, isOverwrite, target)) { + if (this.isAlreadyMerged(mixin, method, isOverwrite, target)) { return; } @@ -365,7 +372,7 @@ public class MixinApplicator { * @param target target method being checked * @return true if the target was already merged and should be skipped */ - private boolean alreadyMerged(MixinTargetContext mixin, MethodNode method, boolean isOverwrite, MethodNode target) { + protected boolean isAlreadyMerged(MixinTargetContext mixin, MethodNode method, boolean isOverwrite, MethodNode target) { AnnotationNode merged = ASMHelper.getVisibleAnnotation(target, MixinMerged.class); if (merged == null) { return false; @@ -406,7 +413,7 @@ public class MixinApplicator { * @return true if the intrinsic method was skipped (short-circuit further * merge operations) */ - private boolean mergeIntrinsic(MixinTargetContext mixin, MethodNode method, boolean isOverwrite, + protected boolean mergeIntrinsic(MixinTargetContext mixin, MethodNode method, boolean isOverwrite, MethodNode target, AnnotationNode intrinsic) { if (isOverwrite) { @@ -439,7 +446,7 @@ public class MixinApplicator { * @param method Method being merged * @param target target method being checked */ - private void displaceIntrinsic(MixinTargetContext mixin, MethodNode method, MethodNode target) { + protected void displaceIntrinsic(MixinTargetContext mixin, MethodNode method, MethodNode target) { // Deliberately include invalid character in the method name so that // we guarantee no hackiness String proxyName = "proxy+" + target.name; @@ -463,7 +470,7 @@ public class MixinApplicator { * * @param method */ - private void appendInsns(MethodNode method) { + protected final void appendInsns(MethodNode method) { if (Type.getReturnType(method.desc) != Type.VOID_TYPE) { throw new IllegalArgumentException("Attempted to merge insns from a method which does not return void"); } @@ -498,7 +505,7 @@ public class MixinApplicator { * * @param mixin */ - private void applyInitialisers(MixinTargetContext mixin) { + protected void applyInitialisers(MixinTargetContext mixin) { // Try to find a suitable constructor, we need a constructor with line numbers in order to extract the initialiser MethodNode ctor = this.getConstructor(mixin); if (ctor == null) { @@ -526,7 +533,7 @@ public class MixinApplicator { * @param mixin mixin to search * @return appropriate ctor or null if none found */ - private MethodNode getConstructor(MixinTargetContext mixin) { + protected MethodNode getConstructor(MixinTargetContext mixin) { MethodNode ctor = null; for (MethodNode mixinMethod : mixin.getMethods()) { @@ -598,7 +605,7 @@ public class MixinApplicator { * @return initialiser bytecode extracted from the supplied constructor, or * null if the constructor range could not be parsed */ - private Deque getInitialiser(MixinTargetContext mixin, MethodNode ctor) { + protected final Deque getInitialiser(MixinTargetContext mixin, MethodNode ctor) { // Find the range of line numbers which corresponds to the constructor body Range init = this.getConstructorRange(ctor); if (!init.isValid()) { @@ -669,7 +676,7 @@ public class MixinApplicator { * @param ctor * @param initialiser */ - private void injectInitialiser(MixinTargetContext mixin, MethodNode ctor, Deque initialiser) { + protected final void injectInitialiser(MixinTargetContext mixin, MethodNode ctor, Deque initialiser) { Map labels = ASMHelper.cloneLabels(ctor.instructions); for (Iterator iter = ctor.instructions.iterator(0); iter.hasNext();) { @@ -698,7 +705,7 @@ public class MixinApplicator { * methods * @param mixin */ - private void applyInjections(MixinTargetContext mixin) { + protected void applyInjections(MixinTargetContext mixin) { List injected = new ArrayList(); for (MethodNode method : this.targetClass.methods) { @@ -727,7 +734,7 @@ public class MixinApplicator { * @param mixin Mixin being applied * @param annotation Annotation node to check constraints */ - private void checkConstraints(MixinTargetContext mixin, AnnotationNode annotation) { + protected final void checkConstraints(MixinTargetContext mixin, AnnotationNode annotation) { try { Constraint constraint = ConstraintParser.parse(annotation); MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); @@ -756,7 +763,7 @@ public class MixinApplicator { * @param from ClassNode to merge annotations from * @param to ClassNode to merge annotations to */ - private void mergeAnnotations(ClassNode from, ClassNode to) { + protected final void mergeAnnotations(ClassNode from, ClassNode to) { to.visibleAnnotations = this.mergeAnnotations(from.visibleAnnotations, to.visibleAnnotations, from.name); to.invisibleAnnotations = this.mergeAnnotations(from.invisibleAnnotations, to.invisibleAnnotations, from.name); } @@ -772,7 +779,7 @@ public class MixinApplicator { * @param from MethodNode to merge annotations from * @param to MethodNode to merge annotations to */ - private void mergeAnnotations(MethodNode from, MethodNode to) { + protected final void mergeAnnotations(MethodNode from, MethodNode to) { to.visibleAnnotations = this.mergeAnnotations(from.visibleAnnotations, to.visibleAnnotations, from.name); to.invisibleAnnotations = this.mergeAnnotations(from.invisibleAnnotations, to.invisibleAnnotations, from.name); } @@ -788,7 +795,7 @@ public class MixinApplicator { * @param from FieldNode to merge annotations from * @param to FieldNode to merge annotations to */ - private void mergeAnnotations(FieldNode from, FieldNode to) { + protected final void mergeAnnotations(FieldNode from, FieldNode to) { to.visibleAnnotations = this.mergeAnnotations(from.visibleAnnotations, to.visibleAnnotations, from.name); to.invisibleAnnotations = this.mergeAnnotations(from.invisibleAnnotations, to.invisibleAnnotations, from.name); } @@ -840,7 +847,7 @@ public class MixinApplicator { * @param opcode opcode to search for * @return found node or null if not found */ - private static AbstractInsnNode findInsn(MethodNode method, int opcode) { + protected static AbstractInsnNode findInsn(MethodNode method, int opcode) { Iterator findReturnIter = method.instructions.iterator(); while (findReturnIter.hasNext()) { AbstractInsnNode insn = findReturnIter.next(); @@ -872,7 +879,7 @@ public class MixinApplicator { * * @return Target method matching searchFor, or null if not found */ - private MethodNode findTargetMethod(MethodNode searchFor) { + protected final MethodNode findTargetMethod(MethodNode searchFor) { for (MethodNode target : this.targetClass.methods) { if (target.name.equals(searchFor.name) && target.desc.equals(searchFor.desc)) { return target; @@ -888,7 +895,7 @@ public class MixinApplicator { * * @return Target field matching searchFor, or null if not found */ - private FieldNode findTargetField(FieldNode searchFor) { + protected final FieldNode findTargetField(FieldNode searchFor) { for (FieldNode target : this.targetClass.fields) { if (target.name.equals(searchFor.name)) { return target; @@ -905,7 +912,7 @@ public class MixinApplicator { * @param flag * @return True if the specified flag is set in this method's access flags */ - static boolean hasFlag(MethodNode method, int flag) { + protected static boolean hasFlag(MethodNode method, int flag) { return (method.access & flag) == flag; } @@ -916,7 +923,7 @@ public class MixinApplicator { * @param flag * @return True if the specified flag is set in this field's access flags */ - static boolean hasFlag(FieldNode field, int flag) { + protected static boolean hasFlag(FieldNode field, int flag) { return (field.access & flag) == flag; } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index c2d94a33..dc5a90c8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -234,6 +234,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Cached class info */ private final transient ClassInfo info; + + /** + * True if this is an interface mixin rather than a regular mixin + */ + private final transient boolean isInterfaceMixin; /** * Holds state that currently is not fully initialised or validated @@ -267,6 +272,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { byte[] mixinBytes = this.loadMixinClass(this.className, runTransformers); this.uninitialisedState = new ValidationState(mixinBytes); this.info = this.uninitialisedState.classInfo; + this.isInterfaceMixin = this.info.isInterface(); ClassNode classNode = this.uninitialisedState.getClassNode(0); this.priority = this.readPriority(classNode); @@ -284,7 +290,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { if (this.uninitialisedState instanceof ReloadedState) { ((ReloadedState) this.uninitialisedState).validateChanges(); } else { - new MixinPreProcessor(this, classNode).prepare(); + this.createPreProcessor(classNode).prepare(); } this.uninitialisedState.classNode = null; // the state is now fully initialised and validated @@ -316,7 +322,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { @Override public String apply(Type input) { return input.getClassName(); - }; + } }), suppressPlugin, false); } @@ -335,16 +341,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { targetClassName = targetClassName.replace('/', '.'); if (this.plugin == null || suppressPlugin || this.plugin.shouldApplyMixin(targetClassName, this.className)) { ClassInfo targetInfo = ClassInfo.forName(targetClassName); - if (targetInfo == null) { - throw new RuntimeException("@Mixin target " + targetClassName + " was not found " + this); - } - if (targetInfo.isInterface()) { - throw new InvalidMixinException(this, "@Mixin target " + targetClassName + " is an interface in " + this); - } - if (checkPublic && targetInfo.isPublic()) { - throw new InvalidMixinException(this, "@Mixin target " + targetClassName + " is public in " + this - + " and must be specified in value"); - } + this.checkTarget(targetClassName, targetInfo, checkPublic); if (!outTargets.contains(targetInfo)) { outTargets.add(targetInfo); targetInfo.addMixin(this); @@ -353,6 +350,21 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } } + private void checkTarget(String targetClassName, ClassInfo targetInfo, boolean checkPublic) throws InvalidMixinException { + if (targetInfo == null) { + throw new RuntimeException("@Mixin target " + targetClassName + " was not found " + this); + } + boolean targetIsInterface = targetInfo.isInterface(); + if (targetIsInterface != this.isInterfaceMixin) { + String not = targetIsInterface ? "" : "not "; + throw new InvalidMixinException(this, "@Mixin target type mismatch: " + targetClassName + " is " + not + "an interface in " + this); + } + if (checkPublic && targetInfo.isPublic()) { + throw new InvalidMixinException(this, "@Mixin target " + targetClassName + " is public in " + this + + " and must be specified in value"); + } + } + /** * Read the priority from the {@link Mixin} annotation * @@ -370,6 +382,21 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } private boolean validateTargetClasses(ClassNode classNode) { + if (this.isInterfaceMixin) { + return this.validateInterfaceMixinTargets(classNode); + } + return this.validateClassMixinTargets(classNode); + } + + private boolean validateInterfaceMixinTargets(ClassNode classNode) { + if (!"java/lang/Object".equals(classNode.superName)) { + throw new InvalidMixinException(this, "Super class of " + this + " is invalid, found " + classNode.superName.replace('/', '.')); + } + + return false; + } + + private boolean validateClassMixinTargets(ClassNode classNode) { boolean detached = false; for (ClassInfo targetClass : this.targetClasses) { @@ -405,6 +432,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param state State to validate */ private void validateMixin(ValidationState state) { + if (this.isInterfaceMixin && !MixinEnvironment.getCompatibilityLevel().supportsMethodsInInterfaces()) { + throw new InvalidMixinException(this, "Interface mixin not supported in current enviromnment"); + } + // isInner (shouldn't) return true for static inner classes if (!state.classInfo.isProbablyStatic()) { throw new InvalidMixinException(this, "Inner class mixin must be declared static"); @@ -568,6 +599,14 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { public Phase getPhase() { return this.phase; } + + /** + * Get whether this is an interface mixin or not + */ + @Override + public boolean isInterfaceMixin() { + return this.isInterfaceMixin; + } /** * Get a new tree for the class bytecode @@ -637,7 +676,20 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @return new context */ public MixinTargetContext createContextFor(ClassNode target) { - return new MixinPreProcessor(this, this.getClassNode(ClassReader.EXPAND_FRAMES)).createContextFor(target); + ClassNode classNode = this.getClassNode(ClassReader.EXPAND_FRAMES); + return this.createPreProcessor(classNode).prepare().createContextFor(target); + } + + /** + * Create a preprocessor based on this mixin's type + * + * @return new preprocessor + */ + private MixinPreProcessor createPreProcessor(ClassNode classNode) { + if (this.isInterfaceMixin) { + return new InterfaceMixinPreProcessor(this, classNode); + } + return new MixinPreProcessor(this, classNode); } /** diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index dfa23fbe..ae0dc6ea 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -81,12 +81,12 @@ class MixinPreProcessor { /** * The mixin */ - private final MixinInfo mixin; + protected final MixinInfo mixin; /** * Mixin class node */ - private final ClassNode classNode; + protected final ClassNode classNode; private final boolean verboseLogging; @@ -103,21 +103,29 @@ class MixinPreProcessor { * * @return Prepared classnode */ - ClassNode prepare() { + MixinPreProcessor prepare() { if (!this.prepared) { this.prepared = true; for (MethodNode mixinMethod : this.classNode.methods) { Method method = this.mixin.getClassInfo().findMethod(mixinMethod); - this.prepareShadow(mixinMethod, method); - this.prepareSoftImplements(mixinMethod, method); + this.prepareMethod(mixinMethod, method); + } + + for (FieldNode mixinField : this.classNode.fields) { + this.prepareField(mixinField); } } - return this.classNode; + return this; } - private void prepareShadow(MethodNode mixinMethod, Method method) { + protected void prepareMethod(MethodNode mixinMethod, Method method) { + this.prepareShadow(mixinMethod, method); + this.prepareSoftImplements(mixinMethod, method); + } + + protected void prepareShadow(MethodNode mixinMethod, Method method) { AnnotationNode shadowAnnotation = ASMHelper.getVisibleAnnotation(mixinMethod, Shadow.class); if (shadowAnnotation == null) { return; @@ -132,7 +140,7 @@ class MixinPreProcessor { } } - private void prepareSoftImplements(MethodNode mixinMethod, Method method) { + protected void prepareSoftImplements(MethodNode mixinMethod, Method method) { for (InterfaceInfo iface : this.mixin.getSoftImplements()) { if (iface.renameMethod(mixinMethod)) { method.renameTo(mixinMethod.name); @@ -140,8 +148,11 @@ class MixinPreProcessor { } } + protected void prepareField(FieldNode mixinField) { + // stub + } + MixinTargetContext createContextFor(ClassNode target) { - this.prepare(); MixinTargetContext context = new MixinTargetContext(this.mixin, this.classNode, target); this.attach(context); return context; @@ -167,10 +178,15 @@ class MixinPreProcessor { this.transform(context); } - private void attachMethods(MixinTargetContext context) { + protected void attachMethods(MixinTargetContext context) { for (Iterator iter = this.classNode.methods.iterator(); iter.hasNext();) { MethodNode mixinMethod = iter.next(); + if (!this.validateMethod(context, mixinMethod)) { + iter.remove(); + continue; + } + if (this.processMethod(context, mixinMethod, Shadow.class, true, true)) { iter.remove(); context.addShadowMethod(mixinMethod); @@ -181,7 +197,11 @@ class MixinPreProcessor { } } - private boolean processMethod(MixinTargetContext context, MethodNode mixinMethod, Class annotationType, + protected boolean validateMethod(MixinTargetContext context, MethodNode mixinMethod) { + return true; + } + + protected boolean processMethod(MixinTargetContext context, MethodNode mixinMethod, Class annotationType, boolean mustExist, boolean mustBePrivate) { AnnotationNode annotation = ASMHelper.getVisibleAnnotation(mixinMethod, annotationType); if (annotation == null) { @@ -220,7 +240,7 @@ class MixinPreProcessor { return true; } - private void attachFields(MixinTargetContext context) { + protected void attachFields(MixinTargetContext context) { for (Iterator iter = this.classNode.fields.iterator(); iter.hasNext();) { FieldNode mixinField = iter.next(); AnnotationNode shadow = ASMHelper.getVisibleAnnotation(mixinField, Shadow.class); @@ -282,7 +302,7 @@ class MixinPreProcessor { } } - private boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { + protected boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { // Public static fields will fall foul of early static binding in java, including them in a mixin is an error condition if (MixinApplicator.hasFlag(field, Opcodes.ACC_STATIC) && !MixinApplicator.hasFlag(field, Opcodes.ACC_PRIVATE) @@ -316,7 +336,7 @@ class MixinPreProcessor { * Apply discovered method and field renames to method invocations and field * accesses in the mixin */ - private void transform(MixinTargetContext context) { + protected void transform(MixinTargetContext context) { for (MethodNode mixinMethod : this.classNode.methods) { for (Iterator iter = mixinMethod.instructions.iterator(); iter.hasNext();) { AbstractInsnNode insn = iter.next(); @@ -337,7 +357,7 @@ class MixinPreProcessor { } } - private static MethodNode findMethod(ClassNode classNode, MethodNode method, AnnotationNode annotation) { + protected static MethodNode findMethod(ClassNode classNode, MethodNode method, AnnotationNode annotation) { Deque aliases = new LinkedList(); aliases.add(method.name); if (annotation != null) { @@ -347,10 +367,10 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findMethod(classNode, aliases, method.desc); + return MixinPreProcessor.findMethodRecursive(classNode, aliases, method.desc); } - private static MethodNode findRemappedMethod(ClassNode classNode, MethodNode method) { + protected static MethodNode findRemappedMethod(ClassNode classNode, MethodNode method) { RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); String remappedName = remapperChain.mapMethodName(classNode.name, method.name, method.desc); if (remappedName.equals(method.name)) { @@ -360,10 +380,10 @@ class MixinPreProcessor { Deque aliases = new LinkedList(); aliases.add(remappedName); - return MixinPreProcessor.findMethod(classNode, aliases, method.desc); + return MixinPreProcessor.findMethodRecursive(classNode, aliases, method.desc); } - private static MethodNode findMethod(ClassNode classNode, Deque aliases, String desc) { + private static MethodNode findMethodRecursive(ClassNode classNode, Deque aliases, String desc) { String alias = aliases.poll(); if (alias == null) { return null; @@ -375,10 +395,10 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findMethod(classNode, aliases, desc); + return MixinPreProcessor.findMethodRecursive(classNode, aliases, desc); } - private static FieldNode findField(ClassNode classNode, FieldNode field, AnnotationNode shadow) { + protected static FieldNode findField(ClassNode classNode, FieldNode field, AnnotationNode shadow) { Deque aliases = new LinkedList(); aliases.add(field.name); if (shadow != null) { @@ -388,10 +408,10 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findField(classNode, aliases, field.desc); + return MixinPreProcessor.findFieldRecursive(classNode, aliases, field.desc); } - private static FieldNode findRemappedField(ClassNode classNode, FieldNode field) { + protected static FieldNode findRemappedField(ClassNode classNode, FieldNode field) { RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); String remappedName = remapperChain.mapFieldName(classNode.name, field.name, field.desc); if (remappedName.equals(field.name)) { @@ -400,7 +420,7 @@ class MixinPreProcessor { Deque aliases = new LinkedList(); aliases.add(remappedName); - return MixinPreProcessor.findField(classNode, aliases, field.desc); + return MixinPreProcessor.findFieldRecursive(classNode, aliases, field.desc); } /** @@ -410,7 +430,7 @@ class MixinPreProcessor { * @param desc * @return Target field or null if not found */ - private static FieldNode findField(ClassNode classNode, Deque aliases, String desc) { + private static FieldNode findFieldRecursive(ClassNode classNode, Deque aliases, String desc) { String alias = aliases.poll(); if (alias == null) { return null; @@ -422,6 +442,6 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findField(classNode, aliases, desc); + return MixinPreProcessor.findFieldRecursive(classNode, aliases, desc); } } 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 c1d9a6c7..ca19c0f9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -434,7 +434,10 @@ public class MixinTransformer extends TreeTransformer { } try { - basicClass = this.applyMixins(transformedName, basicClass, mixins); + // Tree for target class + ClassNode targetClassNode = this.readClass(basicClass, true); + TargetClassContext context = new TargetClassContext(this.sessionId, transformedName, targetClassNode, mixins); + basicClass = this.applyMixins(context); } catch (InvalidMixinException th) { if (environment.getOption(Option.DUMP_TARGET_ON_FAILURE)) { this.dumpClass(transformedName.replace('.', '/') + ".target", basicClass); @@ -606,65 +609,52 @@ public class MixinTransformer extends TreeTransformer { * Apply mixins for specified target class to the class described by the * supplied byte array. * - * @param transformedName - * @param basicClass - * @param mixins + * @param context * @return class bytecode after application of mixins */ - private byte[] applyMixins(String transformedName, byte[] basicClass, SortedSet mixins) { - // Tree for target class - ClassNode targetClass = this.readClass(basicClass, true); - - this.preApply(transformedName, targetClass, mixins); - this.apply(transformedName, targetClass, mixins); + private byte[] applyMixins(TargetClassContext context) { + this.preApply(context); + this.apply(context); try { - this.postApply(transformedName, targetClass, mixins); + this.postApply(context); } catch (ValidationFailedException ex) { this.logger.info(ex.getMessage()); // If verify is enabled and failed, write out the bytecode to allow us to inspect it if (MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_EXPORT)) { - this.writeClass(transformedName, targetClass); + this.writeClass(context); } } - - return this.writeClass(transformedName, targetClass); + return this.writeClass(context); } /** * Process tasks before mixin application * - * @param transformedName Target class transformed name - * @param targetClass Target class - * @param mixins Mixin which were just applied + * @param context Target class context */ - private void preApply(String transformedName, ClassNode targetClass, SortedSet mixins) { + private void preApply(TargetClassContext context) { for (IMixinTransformerModule module : this.modules) { - module.preApply(transformedName, targetClass, mixins); + module.preApply(context); } } /** * Apply the mixins to the target class * - * @param transformedName Target class transformed name - * @param targetClass Target class - * @param mixins Mixin which were just applied + * @param context Target class context */ - private void apply(String transformedName, ClassNode targetClass, SortedSet mixins) { - MixinApplicator applicator = new MixinApplicator(this.sessionId, transformedName, targetClass); - applicator.apply(mixins); + private void apply(TargetClassContext context) { + context.applyMixins(); } /** * Process tasks after mixin application * - * @param transformedName Target class transformed name - * @param targetClass Target class - * @param mixins Mixin which were just applied + * @param context Target class context */ - private void postApply(String transformedName, ClassNode targetClass, SortedSet mixins) { + private void postApply(TargetClassContext context) { for (IMixinTransformerModule module : this.modules) { - module.postApply(transformedName, targetClass, mixins); + module.postApply(context); } } @@ -725,6 +715,10 @@ public class MixinTransformer extends TreeTransformer { return Pattern.compile(this.prepareFilter(filter), Pattern.CASE_INSENSITIVE).matcher(subject).matches(); } + private byte[] writeClass(TargetClassContext context) { + return this.writeClass(context.getName(), context.getClassNode()); + } + private byte[] writeClass(String transformedName, ClassNode targetClass) { // Collapse tree to bytes byte[] bytes = this.writeClass(targetClass); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java index ab6b07db..ac9029fb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java @@ -24,10 +24,7 @@ */ package org.spongepowered.asm.mixin.transformer; -import java.util.SortedSet; - import org.spongepowered.asm.lib.ClassWriter; -import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.util.CheckClassAdapter; /** @@ -56,22 +53,20 @@ public class MixinTransformerModuleCheckClass implements IMixinTransformerModule /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinTransformerModule - * #preTransform(java.lang.String, org.objectweb.asm.tree.ClassNode, - * java.util.SortedSet) + * #preApply(org.spongepowered.asm.mixin.transformer.TargetClassContext) */ @Override - public void preApply(String transformedName, ClassNode targetClass, SortedSet mixins) { + public void preApply(TargetClassContext context) { } - + /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinTransformerModule - * #postTransform(java.lang.String, org.objectweb.asm.tree.ClassNode, - * java.util.SortedSet) + * #postApply(org.spongepowered.asm.mixin.transformer.TargetClassContext) */ @Override - public void postApply(String transformedName, ClassNode targetClass, SortedSet mixins) { + public void postApply(TargetClassContext context) { try { - targetClass.accept(new CheckClassAdapter(new MixinClassWriter(ClassWriter.COMPUTE_FRAMES))); + context.getClassNode().accept(new CheckClassAdapter(new MixinClassWriter(ClassWriter.COMPUTE_FRAMES))); } catch (RuntimeException ex) { throw new ValidationFailedException(ex.getMessage(), ex); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java index a9d733bc..89c88f0b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleInterfaceChecker.java @@ -32,10 +32,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashSet; import java.util.Set; -import java.util.SortedSet; import org.apache.commons.io.IOUtils; -import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.ClassInfo.Traversal; import org.spongepowered.asm.util.PrettyPrinter; @@ -90,12 +88,11 @@ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformer /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinTransformerModule - * #preTransform(java.lang.String, org.objectweb.asm.tree.ClassNode, - * java.util.SortedSet) + * #preApply(org.spongepowered.asm.mixin.transformer.TargetClassContext) */ @Override - public void preApply(String transformedName, ClassNode targetClass, SortedSet mixins) { - ClassInfo targetClassInfo = ClassInfo.forName(targetClass.name); + public void preApply(TargetClassContext context) { + ClassInfo targetClassInfo = context.getClassInfo(); for (Method m : targetClassInfo.getInterfaceMethods(false)) { this.interfaceMethods.put(targetClassInfo, m); } @@ -103,12 +100,11 @@ public class MixinTransformerModuleInterfaceChecker implements IMixinTransformer /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinTransformerModule - * #postTransform(java.lang.String, org.objectweb.asm.tree.ClassNode, - * java.util.SortedSet) + * #postApply(org.spongepowered.asm.mixin.transformer.TargetClassContext) */ @Override - public void postApply(String transformedName, ClassNode targetClass, SortedSet mixins) { - ClassInfo targetClassInfo = ClassInfo.forName(targetClass.name); + public void postApply(TargetClassContext context) { + ClassInfo targetClassInfo = context.getClassInfo(); String className = targetClassInfo.getName().replace('/', '.'); int missingMethodCount = 0; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java new file mode 100644 index 00000000..58585486 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -0,0 +1,130 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer; + +import java.util.SortedSet; + +import org.spongepowered.asm.lib.tree.ClassNode; + +/** + * Struct for containing target class information during mixin application + */ +class TargetClassContext { + + /** + * Transformer session ID + */ + private final String sessionId; + + /** + * Target class name + */ + private final String name; + + /** + * Target class as tree + */ + private final ClassNode classNode; + + /** + * Target class metadata + */ + private final ClassInfo classInfo; + + /** + * Mixins to apply + */ + private final SortedSet mixins; + + /** + * True once mixins have been applied to this class + */ + private boolean applied; + + TargetClassContext(String sessionId, String name, ClassNode classNode, SortedSet mixins) { + this.sessionId = sessionId; + this.name = name; + this.classNode = classNode; + this.classInfo = ClassInfo.fromClassNode(classNode); + this.mixins = mixins; + } + + /** + * Get the transformer session ID + */ + public String getSessionId() { + return this.sessionId; + } + + /** + * Get the class name + */ + public String getName() { + return this.name; + } + + /** + * Get the class tree + */ + public ClassNode getClassNode() { + return this.classNode; + } + + /** + * Get the target class metadata + */ + public ClassInfo getClassInfo() { + return this.classInfo; + } + + /** + * Get the mixins for this target class + */ + public SortedSet getMixins() { + return this.mixins; + } + + /** + * Apply mixins to this class + * + * @param sessionId + */ + public void applyMixins() { + if (this.applied) { + throw new IllegalStateException("Mixins already applied to target class " + this.name); + } + this.applied = true; + MixinApplicator applicator = this.createApplicator(); + applicator.apply(this.mixins); + } + + private MixinApplicator createApplicator() { + if (this.classInfo.isInterface()) { + return new InterfaceMixinApplicator(this); + } + return new MixinApplicator(this); + } + +} From ebdaf69e29305facad9d3b1f8b376d3dc9f8cadc Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 21 Jan 2016 12:38:35 +0000 Subject: [PATCH 091/169] Write soft targets to the refmap and remap them at runtime --- gradle.properties | 2 +- .../tools/obfuscation/AnnotatedMixin.java | 17 +++++++++++++++-- .../tools/obfuscation/AnnotatedMixins.java | 16 ++++++++++++++++ .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/transformer/MixinConfig.java | 9 +++++++++ .../asm/mixin/transformer/MixinInfo.java | 7 ++++++- 6 files changed, 48 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0fc458be..e88e86b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.14 +buildVersion=0.4.15 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index d2f4d560..6257d7c0 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -318,7 +318,7 @@ class AnnotatedMixin { if (this.targets.contains(type)) { continue; } - this.targets.add(type); + this.addTarget(type); if (primaryTarget == null) { primaryTarget = type; } @@ -343,7 +343,7 @@ class AnnotatedMixin { this.mixins.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " is public and must be specified in value", this); return null; } - this.targets.add(type); + this.addSoftTarget(type, privateTarget); if (primaryTarget == null) { primaryTarget = type; } @@ -358,7 +358,20 @@ class AnnotatedMixin { return primaryTarget; } + + private void addSoftTarget(TypeHandle type, String reference) { + ObfuscationData obfClassData = this.mixins.getObfClass(type); + if (!obfClassData.isEmpty()) { + this.mixins.addClassMapping(this.classRef, reference, obfClassData); + } + + this.addTarget(type); + } + private void addTarget(TypeHandle type) { + this.targets.add(type); + } + @Override public String toString() { return this.mixin.getSimpleName().toString(); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index af4dae7f..71751044 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -396,6 +396,13 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return data; } + /** + * Get an obfuscation mapping for a class + */ + public ObfuscationData getObfClass(TypeHandle type) { + return this.getObfClass(type.getName()); + } + /** * Get an obfuscation mapping for a class */ @@ -446,6 +453,15 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp } } + void addClassMapping(String className, String reference, ObfuscationData obfClassData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String remapped = obfClassData.get(targetEnv.getType()); + if (remapped != null) { + targetEnv.addMapping(className, reference, remapped); + } + } + } + /** * Get the reference mapper */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 036209b9..d210de57 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.14"; + public static final String VERSION = "0.4.15"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 1b5b0261..9a32bfe0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -487,6 +487,14 @@ class MixinConfig implements Comparable, IMixinConfig { return this.refMapper; } + String remapClassName(String className, String reference) { +// String remapped = this.plugin != null ? this.plugin.remap(className, reference) : null; +// if (remapped != null) { +// return remapped; +// } + return this.getReferenceMapper().remap(className, reference); + } + /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinConfig#getPlugin() */ @@ -626,4 +634,5 @@ class MixinConfig implements Comparable, IMixinConfig { throw new IllegalArgumentException(String.format("The specified configuration file '%s' was invalid or could not be read", configFile)); } } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index dc5a90c8..1737e0da 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -327,7 +327,12 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } if (privateTargets != null) { - this.readTargets(targets, privateTargets, suppressPlugin, true); + this.readTargets(targets, Lists.transform(privateTargets, new Function() { + @Override + public String apply(String input) { + return MixinInfo.this.getParent().remapClassName(MixinInfo.this.getClassRef(), input); + } + }), suppressPlugin, true); } return targets; From a8a3251cf22500421632340ad819ac6516f7b866 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 21 Jan 2016 15:56:08 +0000 Subject: [PATCH 092/169] Refactor and tidy up Mixin AP, split god classes up into modular parts --- .../tools/obfuscation/AnnotatedMixin.java | 641 +++--------------- .../AnnotatedMixinElementHandler.java | 407 +++++++++++ .../AnnotatedMixinInjectorHandler.java | 153 +++++ .../AnnotatedMixinOverwriteHandler.java | 100 +++ .../AnnotatedMixinShadowHandler.java | 92 +++ .../tools/obfuscation/AnnotatedMixins.java | 294 ++------ .../tools/obfuscation/MixinValidator.java | 12 +- .../tools/obfuscation/ObfuscationManager.java | 363 ++++++++++ .../tools/obfuscation/ObfuscationType.java | 2 + .../TargetObfuscationEnvironment.java | 41 +- .../interfaces/IJavadocProvider.java | 42 ++ .../interfaces/IMixinAnnotationProcessor.java | 62 ++ .../{ => interfaces}/IMixinValidator.java | 4 +- .../interfaces/IObfuscationManager.java | 155 +++++ .../{ => interfaces}/IOptionProvider.java | 2 +- .../{ => interfaces}/ITypeHandleProvider.java | 13 +- .../validation/ParentValidator.java | 12 +- .../validation/TargetValidator.java | 12 +- 18 files changed, 1553 insertions(+), 854 deletions(-) create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IJavadocProvider.java create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinAnnotationProcessor.java rename src/ap/java/org/spongepowered/tools/obfuscation/{ => interfaces}/IMixinValidator.java (94%) create mode 100644 src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java rename src/ap/java/org/spongepowered/tools/obfuscation/{ => interfaces}/IOptionProvider.java (96%) rename src/ap/java/org/spongepowered/tools/obfuscation/{ => interfaces}/ITypeHandleProvider.java (80%) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 6257d7c0..69bd7590 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -24,7 +24,6 @@ */ package org.spongepowered.tools.obfuscation; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -34,9 +33,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.annotation.processing.Messager; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; @@ -46,180 +45,38 @@ import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; -import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.util.Constants; -import org.spongepowered.asm.util.ConstraintParser; -import org.spongepowered.asm.util.ConstraintParser.Constraint; -import org.spongepowered.asm.util.ConstraintViolationException; -import org.spongepowered.asm.util.InvalidConstraintException; import org.spongepowered.tools.MirrorUtils; -import org.spongepowered.tools.obfuscation.IMixinValidator.ValidationPass; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +import org.spongepowered.tools.obfuscation.interfaces.IMixinValidator; +import org.spongepowered.tools.obfuscation.interfaces.IMixinValidator.ValidationPass; +import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; +import org.spongepowered.tools.obfuscation.interfaces.ITypeHandleProvider; import org.spongepowered.tools.obfuscation.struct.Message; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - /** * Information about a mixin stored during processing */ class AnnotatedMixin { - /** - * A name of an element which may have aliases - */ - static class AliasedElementName { - - /** - * The original name including any original prefix (the "actual" name) - */ - protected final String originalName; - - /** - * Aliases declared by the annotation (if any), never null - */ - private final List aliases; - - public AliasedElementName(Element element, AnnotationMirror annotation) { - this.originalName = element.getSimpleName().toString(); - List aliases = MirrorUtils.>getAnnotationValue(annotation, "aliases"); - this.aliases = MirrorUtils.unfold(aliases); - } - - /** - * Get whether this member has any aliases defined - */ - public boolean hasAliases() { - return this.aliases.size() > 0; - } - - /** - * Get this member's aliases - */ - public List getAliases() { - return this.aliases; - } - - /** - * Gets the original name of the member (including prefix) - */ - public String elementName() { - return this.originalName; - } - - public String baseName() { - return this.originalName; - } - - } - - /** - * Convenience class to store information about an - * {@link org.spongepowered.asm.mixin.Shadow}ed member's names - */ - static class ShadowElementName extends AliasedElementName { - - /** - * True if the real element is prefixed - */ - private final boolean hasPrefix; - - /** - * Expected prefix read from the annotation, this is set even if - * {@link #hasPrefix} is false - */ - private final String prefix; - - /** - * The base name without the prefix - */ - private final String baseName; - - /** - * Obfuscated name (once determined) - */ - private String obfuscated; - - ShadowElementName(Element element, AnnotationMirror shadow) { - super(element, shadow); - - this.prefix = MirrorUtils.getAnnotationValue(shadow, "prefix", "shadow$"); - - boolean hasPrefix = false; - String name = this.originalName; - if (name.startsWith(this.prefix)) { - hasPrefix = true; - name = name.substring(this.prefix.length()); - } - - this.hasPrefix = hasPrefix; - this.obfuscated = this.baseName = name; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return this.baseName; - } - - @Override - public String baseName() { - return this.baseName; - } - - /** - * Sets the obfuscated name for this element - * - * @param name New name - * @return fluent interface - */ - public ShadowElementName setObfuscatedName(String name) { - this.obfuscated = name.substring(name.lastIndexOf('/') + 1); - return this; - } - - /** - * Get the prefix (if set), does not return the expected prefix - */ - public String prefix() { - return this.hasPrefix ? this.prefix : ""; - } - - /** - * Get the base name - */ - public String name() { - return this.prefix(this.baseName); - } - - /** - * Gets the obfuscated name (including prefix where appropriate - */ - public String obfuscated() { - return this.prefix(this.obfuscated); - } - - /** - * Apply the prefix (if any) to the specified string - * - * @param name String to prefix - * @return Prefixed string or original string if no prefix - */ - public String prefix(String name) { - return this.hasPrefix ? this.prefix + name : name; - } - } - /** * Mixin annotation */ private final AnnotationMirror annotation; - /** + /** + * Messager + */ + private final Messager messager; + + /** + * Type handle provider + */ + private final ITypeHandleProvider typeProvider; + + /** * Manager */ - private final AnnotatedMixins mixins; + private final IObfuscationManager obf; /** * Mixin class @@ -230,11 +87,6 @@ class AnnotatedMixin { * Mixin class */ private final TypeHandle handle; - - /** - * True if this is an interface mixin - */ - private final boolean isInterface; /** * Specified targets @@ -270,13 +122,29 @@ class AnnotatedMixin { * Stored (ordered) method mappings */ private final Map> methodMappings = new HashMap>(); + + /** + * Overwrite handler + */ + private final AnnotatedMixinOverwriteHandler overwrites; + + /** + * Shadow handler + */ + private final AnnotatedMixinShadowHandler shadows; + + /** + * Injector handler + */ + private final AnnotatedMixinInjectorHandler injectors; - public AnnotatedMixin(AnnotatedMixins mixins, TypeElement type) { + public AnnotatedMixin(IMixinAnnotationProcessor ap, TypeElement type) { this.annotation = MirrorUtils.getAnnotation(type, Mixin.class); - this.mixins = mixins; + this.typeProvider = ap.getTypeProvider(); + this.obf = ap.getObfuscationManager(); + this.messager = ap; this.mixin = type; this.handle = new TypeHandle(type); - this.isInterface = type.getKind() == ElementKind.INTERFACE; this.classRef = type.getQualifiedName().toString().replace('.', '/'); TypeHandle primaryTarget = this.initTargets(); @@ -294,6 +162,10 @@ class AnnotatedMixin { this.fieldMappings.put(obfType, new LinkedHashSet()); this.methodMappings.put(obfType, new LinkedHashSet()); } + + this.overwrites = new AnnotatedMixinOverwriteHandler(ap, this); + this.shadows = new AnnotatedMixinShadowHandler(ap, this); + this.injectors = new AnnotatedMixinInjectorHandler(ap, this); } AnnotatedMixin runValidators(ValidationPass pass, Collection validators) { @@ -324,7 +196,7 @@ class AnnotatedMixin { } } } catch (Exception ex) { - this.mixins.printMessage(Kind.WARNING, "Error processing public targets: " + ex.getClass().getName() + ": " + ex.getMessage(), this); + this.printMessage(Kind.WARNING, "Error processing public targets: " + ex.getClass().getName() + ": " + ex.getMessage(), this); } // Private targets, referenced by name @@ -332,15 +204,15 @@ class AnnotatedMixin { List privateTargets = MirrorUtils.>getAnnotationValue(this.annotation, "targets", Collections.emptyList()); for (String privateTarget : MirrorUtils.unfold(privateTargets)) { - TypeHandle type = this.mixins.getTypeHandle(privateTarget); + TypeHandle type = this.typeProvider.getTypeHandle(privateTarget); if (this.targets.contains(type)) { continue; } if (type == null) { - this.mixins.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " could not be found", this); + this.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " could not be found", this); return null; } else if (type.isPublic()) { - this.mixins.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " is public and must be specified in value", this); + this.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " is public and must be specified in value", this); return null; } this.addSoftTarget(type, privateTarget); @@ -349,20 +221,27 @@ class AnnotatedMixin { } } } catch (Exception ex) { - this.mixins.printMessage(Kind.WARNING, "Error processing private targets: " + ex.getClass().getName() + ": " + ex.getMessage(), this); + this.printMessage(Kind.WARNING, "Error processing private targets: " + ex.getClass().getName() + ": " + ex.getMessage(), this); } if (primaryTarget == null) { - this.mixins.printMessage(Kind.ERROR, "Mixin has no targets", this); + this.printMessage(Kind.ERROR, "Mixin has no targets", this); } return primaryTarget; } + /** + * Print a message to the AP messager + */ + private void printMessage(Kind kind, CharSequence msg, AnnotatedMixin mixin) { + this.messager.printMessage(kind, msg, this.mixin, this.annotation); + } + private void addSoftTarget(TypeHandle type, String reference) { - ObfuscationData obfClassData = this.mixins.getObfClass(type); + ObfuscationData obfClassData = this.obf.getObfClass(type); if (!obfClassData.isEmpty()) { - this.mixins.addClassMapping(this.classRef, reference, obfClassData); + this.obf.addClassMapping(this.classRef, reference, obfClassData); } this.addTarget(type); @@ -395,11 +274,32 @@ class AnnotatedMixin { return this.handle; } + /** + * Get the mixin class reference + */ + public String getClassRef() { + return this.classRef; + } + /** * Get whether this is an interface mixin */ public boolean isInterface() { - return this.isInterface; + return this.mixin.getKind() == ElementKind.INTERFACE; + } + + /** + * Get the primary target class reference + */ + public String getPrimaryTargetRef() { + return this.targetRef; + } + + /** + * Get the primary target + */ + public TypeHandle getPrimaryTarget() { + return this.targetType; } /** @@ -438,397 +338,32 @@ class AnnotatedMixin { this.methodMappings.clear(); } - /** - * Validate method for {@link org.spongepowered.asm.mixin.Shadow} and - * {@link org.spongepowered.asm.mixin.Overwrite} registrations to check that - * only a single target is registered. Mixins containing annotated methods - * with these annotations cannot be multi-targetted. - */ - private boolean validateSingleTarget(String annotation, Element element) { - if (this.targetRef == null || this.targets.size() > 1) { - this.mixins.printMessage(Kind.ERROR, "Mixin with " + annotation + " members must have exactly one target.", element); - this.mixins.printMessage(Kind.ERROR, "Mixin with " + annotation + " members must have exactly one target.", this.mixin); - return false; - } - return true; - } - - /** - * Register an {@link org.spongepowered.asm.mixin.Overwrite} method - */ public void registerOverwrite(ExecutableElement method, AnnotationMirror overwrite) { - AliasedElementName name = new AliasedElementName(method, overwrite); - this.validateTargetMethod(method, overwrite, name, "@Overwrite"); - this.checkConstraints(method, overwrite); - - if (!this.remap || !this.validateSingleTarget("@Overwrite", method)) { - return; - } - - String mcpName = method.getSimpleName().toString(); - String mcpSignature = MirrorUtils.generateSignature(method); - ObfuscationData obfMethodData = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + mcpName, mcpSignature)); - - if (obfMethodData.isEmpty()) { - Kind error = Kind.ERROR; - - try { - // Try to access isStatic from com.sun.tools.javac.code.Symbol - Method md = method.getClass().getMethod("isStatic"); - if (((Boolean)md.invoke(method)).booleanValue()) { - error = Kind.WARNING; - } - } catch (Exception ex) { - // well, we tried - } - - this.mixins.printMessage(error, "No obfuscation mapping for @Overwrite method", method); - return; - } - - for (ObfuscationType type : obfMethodData) { - MethodData obfMethod = obfMethodData.get(type); - String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); - this.addMethodMapping(type, mcpName, obfName, mcpSignature, obfMethod.sig); - } - - if (!"true".equalsIgnoreCase(this.mixins.getOption(SupportedOptions.DISABLE_OVERWRITE_CHECKER))) { - Kind overwriteErrorKind = "error".equalsIgnoreCase(this.mixins.getOption(SupportedOptions.OVERWRITE_ERROR_LEVEL)) - ? Kind.ERROR : Kind.WARNING; - - String javadoc = this.mixins.getJavadoc(method); - if (javadoc == null) { - this.mixins.printMessage(overwriteErrorKind, "@Overwrite is missing javadoc comment", method); - return; - } - - if (!javadoc.toLowerCase().contains("@author")) { - this.mixins.printMessage(overwriteErrorKind, "@Overwrite is missing an @author tag", method); - } - - if (!javadoc.toLowerCase().contains("@reason")) { - this.mixins.printMessage(overwriteErrorKind, "@Overwrite is missing an @reason tag", method); - } - } + this.overwrites.registerOverwrite(method, overwrite); } - /** - * Register a {@link org.spongepowered.asm.mixin.Shadow} field - */ - public void registerShadow(VariableElement field, AnnotationMirror shadow, boolean remap) { - ShadowElementName name = new ShadowElementName(field, shadow); - this.validateTargetField(field, shadow, name, "@Shadow"); - - if (!remap || !this.validateSingleTarget("@Shadow", field)) { - return; - } - - ObfuscationData obfFieldData = this.mixins.getObfField(this.targetRef + "/" + name); - - if (obfFieldData.isEmpty()) { - this.mixins.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow field", field, shadow); - return; - } - - for (ObfuscationType type : obfFieldData) { - String fieldName = obfFieldData.get(type); - this.addFieldMapping(type, name.setObfuscatedName(fieldName)); - } + public void registerShadow(VariableElement field, AnnotationMirror shadow, boolean shouldRemap) { + this.shadows.registerShadow(field, shadow, shouldRemap); } - /** - * Register a {@link org.spongepowered.asm.mixin.Shadow} method - */ - public void registerShadow(ExecutableElement method, AnnotationMirror shadow, boolean remap) { - ShadowElementName name = new ShadowElementName(method, shadow); - this.validateTargetMethod(method, shadow, name, "@Shadow"); - - if (!remap || !this.validateSingleTarget("@Shadow", method)) { - return; - } - - String mcpSignature = MirrorUtils.generateSignature(method); - ObfuscationData obfMethodData = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + name, mcpSignature)); - - if (obfMethodData.isEmpty()) { - this.mixins.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow method", method, shadow); - return; - } - - for (ObfuscationType type : obfMethodData) { - MethodData obfMethod = obfMethodData.get(type); - this.addMethodMapping(type, name.setObfuscatedName(obfMethod.name), mcpSignature, obfMethod.sig); - } + public void registerShadow(ExecutableElement method, AnnotationMirror shadow, boolean shouldRemap) { + this.shadows.registerShadow(method, shadow, shouldRemap); } - /** - * Register a {@link org.spongepowered.asm.mixin.injection.Inject} method - * - * @param method Callback method - * @param inject Inject annotation - * @param remap - * @return pending error message or null if no error condition - */ public Message registerInjector(ExecutableElement method, AnnotationMirror inject, boolean remap) { - if (this.isInterface) { - this.mixins.printMessage(Kind.ERROR, "Injector in interface is unsupported", method); - } - - String originalReference = MirrorUtils.getAnnotationValue(inject, "method"); - MemberInfo targetMember = MemberInfo.parse(originalReference); - if (targetMember.name == null) { - return null; - } - - try { - targetMember.validate(); - } catch (InvalidMemberDescriptorException ex) { - this.mixins.printMessage(Kind.ERROR, ex.getMessage(), method, inject); - } - - String type = "@" + inject.getAnnotationType().asElement().getSimpleName() + ""; - if (targetMember.desc != null) { - this.validateReferencedTarget(method, inject, targetMember, type); - } - - if (!remap || !this.validateSingleTarget(type, method)) { - return null; - } - - String desc = this.targetType.findDescriptor(targetMember); - if (desc == null) { - if (this.targetType.isImaginary()) { - this.mixins.printMessage(Kind.WARNING, type + " target requires method signature because enclosing type information is unavailable", - method, inject); - } else if (!Constants.INIT.equals(targetMember.name)) { - this.mixins.printMessage(Kind.WARNING, "Unable to determine signature for " + type + " target method", method, inject); - } - return null; - } - - ObfuscationData obfMethod = this.mixins.getObfMethod(new MethodData(this.targetRef + "/" + targetMember.name, desc)); - if (obfMethod.isEmpty()) { - Kind error = Constants.INIT.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; - return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); - } - - this.mixins.addMethodMapping(this.classRef, originalReference, obfMethod); - return null; + return this.injectors.registerInjector(method, inject, remap); } - /** - * Register a {@link org.spongepowered.asm.mixin.injection.At} annotation - * and process the references - */ - public int registerInjectionPoint(Element element, AnnotationMirror inject, AnnotationMirror at) { - if (this.isInterface) { - this.mixins.printMessage(Kind.ERROR, "Injector in interface is unsupported", element); - } - - if (!AnnotatedMixins.getRemapValue(at)) { - return 0; - } - - String type = MirrorUtils.getAnnotationValue(at, "value"); - String target = MirrorUtils.getAnnotationValue(at, "target"); - int remapped = this.remapReference(type + ".", target, element, inject, at) ? 1 : 0; - - // Pattern for replacing references in args, not used yet -// if ("SOMETYPE".equals(type)) { -// Map args = AnnotatedMixin.getAtArgs(at); -// this.remapReference(type + ".args[target]", args.get("target")); -// } - - return remapped; + public int registerInjectionPoint(ExecutableElement element, AnnotationMirror inject, AnnotationMirror at) { + return this.injectors.registerInjectionPoint(element, inject, at); } - private boolean remapReference(String key, String target, Element element, AnnotationMirror inject, AnnotationMirror at) { - if (target == null) { - return false; - } - - MemberInfo targetMember = MemberInfo.parse(target); - if (!targetMember.isFullyQualified()) { - String missing = "missing " + (targetMember.owner == null ? (targetMember.desc == null ? "owner and signature" : "owner") : "signature"); - this.mixins.printMessage(Kind.ERROR, "@At(" + key + ") is not fully qualified, " + missing, element, inject); - return false; - } - - try { - targetMember.validate(); - } catch (InvalidMemberDescriptorException ex) { - this.mixins.printMessage(Kind.ERROR, ex.getMessage(), element, inject); - } - - if (targetMember.isField()) { - ObfuscationData obfFieldData = this.mixins.getObfFieldRecursive(targetMember); - if (obfFieldData.isEmpty()) { - this.mixins.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); - return false; - } - this.mixins.addFieldMapping(this.classRef, target, targetMember, obfFieldData); - } else { - ObfuscationData obfMethodData = this.mixins.getObfMethodRecursive(targetMember); - if (obfMethodData.isEmpty()) { - if (targetMember.owner == null || !targetMember.owner.startsWith("java/lang/")) { - this.mixins.printMessage(Kind.WARNING, "Cannot find method mapping for @At(" + key + ") '" + target + "'", element, inject); - } - } - this.mixins.addMethodMapping(this.classRef, target, targetMember, obfMethodData); - } - return true; - } - - /** - * Add a field mapping to the local table - */ - private void addFieldMapping(ObfuscationType type, ShadowElementName name) { - String mapping = String.format("FD: %s %s", this.classRef + "/" + name.name(), this.classRef + "/" + name.obfuscated()); + void addFieldMapping(ObfuscationType type, String mapping) { this.fieldMappings.get(type).add(mapping); } - - /** - * Add a method mapping to the local table - */ - private void addMethodMapping(ObfuscationType type, ShadowElementName name, String mcpSignature, String obfSignature) { - this.addMethodMapping(type, name.name(), name.obfuscated(), mcpSignature, obfSignature); - } - /** - * Add a method mapping to the local table - */ - private void addMethodMapping(ObfuscationType type, String mcpName, String obfName, String mcpSignature, String obfSignature) { - String mapping = String.format("MD: %s %s %s %s", this.classRef + "/" + mcpName, mcpSignature, this.classRef + "/" + obfName, obfSignature); + void addMethodMapping(ObfuscationType type, String mapping) { this.methodMappings.get(type).add(mapping); } - /** - * Check constraints for the specified annotation based on token values in - * the current environment - * - * @param method Annotated method - * @param annotation Annotation to check constraints - */ - private void checkConstraints(ExecutableElement method, AnnotationMirror annotation) { - try { - Constraint constraint = ConstraintParser.parse(MirrorUtils.getAnnotationValue(annotation, "constraints")); - try { - constraint.check(this.mixins); - } catch (ConstraintViolationException ex) { - this.mixins.printMessage(Kind.ERROR, ex.getMessage(), method, annotation); - } - } catch (InvalidConstraintException ex) { - this.mixins.printMessage(Kind.WARNING, ex.getMessage(), method, annotation); - } - } - - /** - * Checks whether the specified method exists in all targets and raises - * warnings where appropriate - */ - private void validateTargetMethod(ExecutableElement method, AnnotationMirror annotation, AliasedElementName name, String type) { - String signature = TypeHandle.getElementSignature(method); - - for (TypeHandle target : this.targets) { - if (target.isImaginary()) { - continue; - } - - // Find method as-is - MethodHandle targetMethod = target.findMethod(method); - if (targetMethod != null) { - continue; - } - - if (!name.baseName().equals(name.elementName())) { - // Find method without prefix - targetMethod = target.findMethod(name.baseName(), signature); - if (targetMethod != null) { - continue; - } - } - - // Check aliases - for (String alias : name.getAliases()) { - if ((targetMethod = target.findMethod(alias, signature)) != null) { - break; - } - } - - if (targetMethod == null) { - this.mixins.printMessage(Kind.WARNING, "Cannot find target for " + type + " method in " + target, method, annotation); - } - } - } - - /** - * Checks whether the specified field exists in all targets and raises - * warnings where appropriate - */ - private void validateTargetField(VariableElement field, AnnotationMirror shadow, AliasedElementName name, String type) { - String fieldType = field.asType().toString(); - - for (TypeHandle target : this.targets) { - if (target.isImaginary()) { - continue; - } - - // Search for field - FieldHandle targetField = target.findField(field); - if (targetField != null) { - continue; - } - - // Try search by alias - List aliases = name.getAliases(); - for (String alias : aliases) { - if ((targetField = target.findField(alias, fieldType)) != null) { - break; - } - } - - if (targetField == null) { - this.mixins.printMessage(Kind.WARNING, "Cannot find target for " + type + " field in " + target, field, shadow); - } - } - } - - /** - * Checks whether the referenced method exists in all targets and raises - * warnings where appropriate - */ - private void validateReferencedTarget(ExecutableElement method, AnnotationMirror inject, MemberInfo reference, String type) { - String signature = reference.toDescriptor(); - - for (TypeHandle target : this.targets) { - if (target.isImaginary()) { - continue; - } - - MethodHandle targetMethod = target.findMethod(reference.name, signature); - if (targetMethod == null) { - this.mixins.printMessage(Kind.WARNING, "Cannot find target method for " + type + " in " + target, method, inject); - } - } - } - - static Map getAtArgs(AnnotationMirror at) { - Map args = new HashMap(); - List argv = MirrorUtils.>getAnnotationValue(at, "args"); - if (argv != null) { - for (AnnotationValue av : argv) { - String arg = (String)av.getValue(); - if (arg == null) { - continue; - } - int eqPos = arg.indexOf('='); - if (eqPos > -1) { - args.put(arg.substring(0, eqPos), arg.substring(eqPos + 1)); - } else { - args.put(arg, ""); - } - } - } - return args; - } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java new file mode 100644 index 00000000..b2406214 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -0,0 +1,407 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.util.List; + +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.VariableElement; +import javax.tools.Diagnostic.Kind; + +import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; +import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.util.ConstraintParser; +import org.spongepowered.asm.util.ConstraintParser.Constraint; +import org.spongepowered.asm.util.ConstraintViolationException; +import org.spongepowered.asm.util.InvalidConstraintException; +import org.spongepowered.tools.MirrorUtils; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; + +import net.minecraftforge.srg2source.rangeapplier.MethodData; + +abstract class AnnotatedMixinElementHandler { + + /** + * A name of an element which may have aliases + */ + static class AliasedElementName { + + /** + * The original name including any original prefix (the "actual" name) + */ + protected final String originalName; + + /** + * Aliases declared by the annotation (if any), never null + */ + private final List aliases; + + public AliasedElementName(Element element, AnnotationMirror annotation) { + this.originalName = element.getSimpleName().toString(); + List aliases = MirrorUtils.>getAnnotationValue(annotation, "aliases"); + this.aliases = MirrorUtils.unfold(aliases); + } + + /** + * Get whether this member has any aliases defined + */ + public boolean hasAliases() { + return this.aliases.size() > 0; + } + + /** + * Get this member's aliases + */ + public List getAliases() { + return this.aliases; + } + + /** + * Gets the original name of the member (including prefix) + */ + public String elementName() { + return this.originalName; + } + + public String baseName() { + return this.originalName; + } + + } + + /** + * Convenience class to store information about an + * {@link org.spongepowered.asm.mixin.Shadow}ed member's names + */ + static class ShadowElementName extends AliasedElementName { + + /** + * True if the real element is prefixed + */ + private final boolean hasPrefix; + + /** + * Expected prefix read from the annotation, this is set even if + * {@link #hasPrefix} is false + */ + private final String prefix; + + /** + * The base name without the prefix + */ + private final String baseName; + + /** + * Obfuscated name (once determined) + */ + private String obfuscated; + + ShadowElementName(Element element, AnnotationMirror shadow) { + super(element, shadow); + + this.prefix = MirrorUtils.getAnnotationValue(shadow, "prefix", "shadow$"); + + boolean hasPrefix = false; + String name = this.originalName; + if (name.startsWith(this.prefix)) { + hasPrefix = true; + name = name.substring(this.prefix.length()); + } + + this.hasPrefix = hasPrefix; + this.obfuscated = this.baseName = name; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return this.baseName; + } + + @Override + public String baseName() { + return this.baseName; + } + + /** + * Sets the obfuscated name for this element + * + * @param name New name + * @return fluent interface + */ + public ShadowElementName setObfuscatedName(String name) { + this.obfuscated = name.substring(name.lastIndexOf('/') + 1); + return this; + } + + /** + * Get the prefix (if set), does not return the expected prefix + */ + public String prefix() { + return this.hasPrefix ? this.prefix : ""; + } + + /** + * Get the base name + */ + public String name() { + return this.prefix(this.baseName); + } + + /** + * Gets the obfuscated name (including prefix where appropriate + */ + public String obfuscated() { + return this.prefix(this.obfuscated); + } + + /** + * Apply the prefix (if any) to the specified string + * + * @param name String to prefix + * @return Prefixed string or original string if no prefix + */ + public String prefix(String name) { + return this.hasPrefix ? this.prefix + name : name; + } + + } + + /** + * Mixin + */ + protected final AnnotatedMixin mixin; + + protected final String classRef; + + /** + * Annotation processor + */ + protected final IMixinAnnotationProcessor ap; + + /** + * Manager + */ + protected final IObfuscationManager obf; + + AnnotatedMixinElementHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { + this.ap = ap; + this.mixin = mixin; + this.classRef = mixin.getClassRef(); + this.obf = ap.getObfuscationManager(); + } + + protected final boolean remapReference(String key, String target, Element element, AnnotationMirror inject, AnnotationMirror at) { + if (target == null) { + return false; + } + + MemberInfo targetMember = MemberInfo.parse(target); + if (!targetMember.isFullyQualified()) { + String missing = "missing " + (targetMember.owner == null ? (targetMember.desc == null ? "owner and signature" : "owner") : "signature"); + this.ap.printMessage(Kind.ERROR, "@At(" + key + ") is not fully qualified, " + missing, element, inject); + return false; + } + + try { + targetMember.validate(); + } catch (InvalidMemberDescriptorException ex) { + this.ap.printMessage(Kind.ERROR, ex.getMessage(), element, inject); + } + + if (targetMember.isField()) { + ObfuscationData obfFieldData = this.obf.getObfFieldRecursive(targetMember); + if (obfFieldData.isEmpty()) { + this.ap.printMessage(Kind.WARNING, "Cannot find field mapping for @At(" + key + ") '" + target + "'", element, inject); + return false; + } + this.obf.addFieldMapping(this.classRef, target, targetMember, obfFieldData); + } else { + ObfuscationData obfMethodData = this.obf.getObfMethodRecursive(targetMember); + if (obfMethodData.isEmpty()) { + if (targetMember.owner == null || !targetMember.owner.startsWith("java/lang/")) { + this.ap.printMessage(Kind.WARNING, "Cannot find method mapping for @At(" + key + ") '" + target + "'", element, inject); + } + } + this.obf.addMethodMapping(this.classRef, target, targetMember, obfMethodData); + } + return true; + } + + /** + * Add a field mapping to the local table + */ + protected final void addFieldMapping(ObfuscationType type, ShadowElementName name) { + String mapping = String.format("FD: %s %s", this.classRef + "/" + name.name(), this.classRef + "/" + name.obfuscated()); + this.mixin.addFieldMapping(type, mapping); + } + + /** + * Add a method mapping to the local table + */ + protected final void addMethodMapping(ObfuscationType type, ShadowElementName name, String mcpSignature, String obfSignature) { + this.addMethodMapping(type, name.name(), name.obfuscated(), mcpSignature, obfSignature); + } + + /** + * Add a method mapping to the local table + */ + protected final void addMethodMapping(ObfuscationType type, String mcpName, String obfName, String mcpSignature, String obfSignature) { + String mapping = String.format("MD: %s %s %s %s", this.classRef + "/" + mcpName, mcpSignature, this.classRef + "/" + obfName, obfSignature); + this.mixin.addMethodMapping(type, mapping); + } + + /** + * Validate method for {@link org.spongepowered.asm.mixin.Shadow} and + * {@link org.spongepowered.asm.mixin.Overwrite} registrations to check that + * only a single target is registered. Mixins containing annotated methods + * with these annotations cannot be multi-targetted. + */ + protected final boolean validateSingleTarget(String annotation, Element element) { + if (this.mixin.getPrimaryTargetRef() == null || this.mixin.getTargets().size() > 1) { + this.ap.printMessage(Kind.ERROR, "Mixin with " + annotation + " members must have exactly one target.", element); + this.ap.printMessage(Kind.ERROR, "Mixin with " + annotation + " members must have exactly one target.", this.mixin.getMixin()); + return false; + } + return true; + } + + /** + * Check constraints for the specified annotation based on token values in + * the current environment + * + * @param method Annotated method + * @param annotation Annotation to check constraints + */ + protected final void checkConstraints(ExecutableElement method, AnnotationMirror annotation) { + try { + Constraint constraint = ConstraintParser.parse(MirrorUtils.getAnnotationValue(annotation, "constraints")); + try { + constraint.check(this.ap.getTokenProvider()); + } catch (ConstraintViolationException ex) { + this.ap.printMessage(Kind.ERROR, ex.getMessage(), method, annotation); + } + } catch (InvalidConstraintException ex) { + this.ap.printMessage(Kind.WARNING, ex.getMessage(), method, annotation); + } + } + + /** + * Checks whether the specified method exists in all targets and raises + * warnings where appropriate + */ + protected final void validateTargetMethod(ExecutableElement method, AnnotationMirror annotation, AliasedElementName name, String type) { + String signature = TypeHandle.getElementSignature(method); + + for (TypeHandle target : this.mixin.getTargets()) { + if (target.isImaginary()) { + continue; + } + + // Find method as-is + MethodHandle targetMethod = target.findMethod(method); + if (targetMethod != null) { + continue; + } + + if (!name.baseName().equals(name.elementName())) { + // Find method without prefix + targetMethod = target.findMethod(name.baseName(), signature); + if (targetMethod != null) { + continue; + } + } + + // Check aliases + for (String alias : name.getAliases()) { + if ((targetMethod = target.findMethod(alias, signature)) != null) { + break; + } + } + + if (targetMethod == null) { + this.ap.printMessage(Kind.WARNING, "Cannot find target for " + type + " method in " + target, method, annotation); + } + } + } + + /** + * Checks whether the specified field exists in all targets and raises + * warnings where appropriate + */ + protected final void validateTargetField(VariableElement field, AnnotationMirror shadow, AliasedElementName name, String type) { + String fieldType = field.asType().toString(); + + for (TypeHandle target : this.mixin.getTargets()) { + if (target.isImaginary()) { + continue; + } + + // Search for field + FieldHandle targetField = target.findField(field); + if (targetField != null) { + continue; + } + + // Try search by alias + List aliases = name.getAliases(); + for (String alias : aliases) { + if ((targetField = target.findField(alias, fieldType)) != null) { + break; + } + } + + if (targetField == null) { + this.ap.printMessage(Kind.WARNING, "Cannot find target for " + type + " field in " + target, field, shadow); + } + } + } + + /** + * Checks whether the referenced method exists in all targets and raises + * warnings where appropriate + */ + protected final void validateReferencedTarget(ExecutableElement method, AnnotationMirror inject, MemberInfo reference, String type) { + String signature = reference.toDescriptor(); + + for (TypeHandle target : this.mixin.getTargets()) { + if (target.isImaginary()) { + continue; + } + + MethodHandle targetMethod = target.findMethod(reference.name, signature); + if (targetMethod == null) { + this.ap.printMessage(Kind.WARNING, "Cannot find target method for " + type + " in " + target, method, inject); + } + } + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java new file mode 100644 index 00000000..74823c6d --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java @@ -0,0 +1,153 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ExecutableElement; +import javax.tools.Diagnostic.Kind; + +import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; +import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.util.Constants; +import org.spongepowered.tools.MirrorUtils; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +import org.spongepowered.tools.obfuscation.struct.Message; + +import net.minecraftforge.srg2source.rangeapplier.MethodData; + +class AnnotatedMixinInjectorHandler extends AnnotatedMixinElementHandler { + + AnnotatedMixinInjectorHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { + super(ap, mixin); + } + + /** + * Register a {@link org.spongepowered.asm.mixin.injection.Inject} method + * + * @param method Callback method + * @param inject Inject annotation + * @param remap + * @return pending error message or null if no error condition + */ + public Message registerInjector(ExecutableElement method, AnnotationMirror inject, boolean remap) { + if (this.mixin.isInterface()) { + this.ap.printMessage(Kind.ERROR, "Injector in interface is unsupported", method); + } + + String originalReference = MirrorUtils.getAnnotationValue(inject, "method"); + MemberInfo targetMember = MemberInfo.parse(originalReference); + if (targetMember.name == null) { + return null; + } + + try { + targetMember.validate(); + } catch (InvalidMemberDescriptorException ex) { + this.ap.printMessage(Kind.ERROR, ex.getMessage(), method, inject); + } + + String type = "@" + inject.getAnnotationType().asElement().getSimpleName() + ""; + if (targetMember.desc != null) { + this.validateReferencedTarget(method, inject, targetMember, type); + } + + if (!remap || !this.validateSingleTarget(type, method)) { + return null; + } + + String desc = this.mixin.getPrimaryTarget().findDescriptor(targetMember); + if (desc == null) { + if (this.mixin.getPrimaryTarget().isImaginary()) { + this.ap.printMessage(Kind.WARNING, type + " target requires method signature because enclosing type information is unavailable", + method, inject); + } else if (!Constants.INIT.equals(targetMember.name)) { + this.ap.printMessage(Kind.WARNING, "Unable to determine signature for " + type + " target method", method, inject); + } + return null; + } + + ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + targetMember.name, desc)); + if (obfData.isEmpty()) { + Kind error = Constants.INIT.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; + return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); + } + + this.obf.addMethodMapping(this.classRef, originalReference, obfData); + return null; + } + + /** + * Register a {@link org.spongepowered.asm.mixin.injection.At} annotation + * and process the references + */ + public int registerInjectionPoint(Element element, AnnotationMirror inject, AnnotationMirror at) { + if (this.mixin.isInterface()) { + this.ap.printMessage(Kind.ERROR, "Injector in interface is unsupported", element); + } + + if (!AnnotatedMixins.getRemapValue(at)) { + return 0; + } + + String type = MirrorUtils.getAnnotationValue(at, "value"); + String target = MirrorUtils.getAnnotationValue(at, "target"); + int remapped = this.remapReference(type + ".", target, element, inject, at) ? 1 : 0; + + // Pattern for replacing references in args, not used yet +// if ("SOMETYPE".equals(type)) { +// Map args = InjectorHandler.getAtArgs(at); +// this.remapReference(type + ".args[target]", args.get("target")); +// } + + return remapped; + } + + static Map getAtArgs(AnnotationMirror at) { + Map args = new HashMap(); + List argv = MirrorUtils.>getAnnotationValue(at, "args"); + if (argv != null) { + for (AnnotationValue av : argv) { + String arg = (String)av.getValue(); + if (arg == null) { + continue; + } + int eqPos = arg.indexOf('='); + if (eqPos > -1) { + args.put(arg.substring(0, eqPos), arg.substring(eqPos + 1)); + } else { + args.put(arg, ""); + } + } + } + return args; + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java new file mode 100644 index 00000000..692e065e --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java @@ -0,0 +1,100 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.lang.reflect.Method; + +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; +import javax.tools.Diagnostic.Kind; + +import org.spongepowered.tools.MirrorUtils; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; + +import net.minecraftforge.srg2source.rangeapplier.MethodData; + +class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { + + AnnotatedMixinOverwriteHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { + super(ap, mixin); + } + + void registerOverwrite(ExecutableElement method, AnnotationMirror overwrite) { + AliasedElementName name = new AliasedElementName(method, overwrite); + this.validateTargetMethod(method, overwrite, name, "@Overwrite"); + this.checkConstraints(method, overwrite); + + if (!this.mixin.remap() || !this.validateSingleTarget("@Overwrite", method)) { + return; + } + + String mcpName = method.getSimpleName().toString(); + String mcpSignature = MirrorUtils.generateSignature(method); + ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + mcpName, mcpSignature)); + + if (obfData.isEmpty()) { + Kind error = Kind.ERROR; + + try { + // Try to access isStatic from com.sun.tools.javac.code.Symbol + Method md = method.getClass().getMethod("isStatic"); + if (((Boolean)md.invoke(method)).booleanValue()) { + error = Kind.WARNING; + } + } catch (Exception ex) { + // well, we tried + } + + this.ap.printMessage(error, "No obfuscation mapping for @Overwrite method", method); + return; + } + + for (ObfuscationType type : obfData) { + MethodData obfMethod = obfData.get(type); + String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); + this.addMethodMapping(type, mcpName, obfName, mcpSignature, obfMethod.sig); + } + + if (!"true".equalsIgnoreCase(this.ap.getOption(SupportedOptions.DISABLE_OVERWRITE_CHECKER))) { + Kind overwriteErrorKind = "error".equalsIgnoreCase(this.ap.getOption(SupportedOptions.OVERWRITE_ERROR_LEVEL)) + ? Kind.ERROR : Kind.WARNING; + + String javadoc = this.ap.getJavadocProvider().getJavadoc(method); + if (javadoc == null) { + this.ap.printMessage(overwriteErrorKind, "@Overwrite is missing javadoc comment", method); + return; + } + + if (!javadoc.toLowerCase().contains("@author")) { + this.ap.printMessage(overwriteErrorKind, "@Overwrite is missing an @author tag", method); + } + + if (!javadoc.toLowerCase().contains("@reason")) { + this.ap.printMessage(overwriteErrorKind, "@Overwrite is missing an @reason tag", method); + } + } + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java new file mode 100644 index 00000000..aa212c5e --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java @@ -0,0 +1,92 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.VariableElement; +import javax.tools.Diagnostic.Kind; + +import org.spongepowered.tools.MirrorUtils; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; + +import net.minecraftforge.srg2source.rangeapplier.MethodData; + +class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { + + AnnotatedMixinShadowHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { + super(ap, mixin); + } + + /** + * Register a {@link org.spongepowered.asm.mixin.Shadow} field + */ + public void registerShadow(VariableElement field, AnnotationMirror shadow, boolean remap) { + ShadowElementName name = new ShadowElementName(field, shadow); + this.validateTargetField(field, shadow, name, "@Shadow"); + + if (!remap || !this.validateSingleTarget("@Shadow", field)) { + return; + } + + ObfuscationData obfFieldData = this.obf.getObfField(this.mixin.getPrimaryTargetRef() + "/" + name); + + if (obfFieldData.isEmpty()) { + this.ap.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow field", field, shadow); + return; + } + + for (ObfuscationType type : obfFieldData) { + String fieldName = obfFieldData.get(type); + this.addFieldMapping(type, name.setObfuscatedName(fieldName)); + } + } + + /** + * Register a {@link org.spongepowered.asm.mixin.Shadow} method + */ + public void registerShadow(ExecutableElement method, AnnotationMirror shadow, boolean remap) { + ShadowElementName name = new ShadowElementName(method, shadow); + this.validateTargetMethod(method, shadow, name, "@Shadow"); + + if (!remap || !this.validateSingleTarget("@Shadow", method)) { + return; + } + + String mcpSignature = MirrorUtils.generateSignature(method); + ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + name, mcpSignature)); + + if (obfData.isEmpty()) { + this.ap.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow method", method, shadow); + return; + } + + for (ObfuscationType type : obfData) { + MethodData obfMethod = obfData.get(type); + this.addMethodMapping(type, name.setObfuscatedName(obfMethod.name), mcpSignature, obfMethod.sig); + } + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 71751044..79c272d4 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -24,10 +24,7 @@ */ package org.spongepowered.tools.obfuscation; -import java.io.File; -import java.io.IOException; import java.io.InputStream; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -38,7 +35,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.processing.Filer; -import javax.annotation.processing.Messager; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; @@ -57,24 +53,25 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.tools.MirrorUtils; -import org.spongepowered.tools.obfuscation.IMixinValidator.ValidationPass; +import org.spongepowered.tools.obfuscation.interfaces.IJavadocProvider; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +import org.spongepowered.tools.obfuscation.interfaces.IMixinValidator; +import org.spongepowered.tools.obfuscation.interfaces.IMixinValidator.ValidationPass; +import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; +import org.spongepowered.tools.obfuscation.interfaces.ITypeHandleProvider; import org.spongepowered.tools.obfuscation.struct.Message; import org.spongepowered.tools.obfuscation.validation.ParentValidator; import org.spongepowered.tools.obfuscation.validation.TargetValidator; import com.google.common.collect.ImmutableList; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - /** * Mixin info manager, stores all of the mixin info during processing and also * manages access to the srgs */ -class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITypeHandleProvider { +class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider, ITypeHandleProvider, IJavadocProvider { private static final String MAPID_SYSTEM_PROPERTY = "mixin.target.mapid"; @@ -113,19 +110,9 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp private final List mixinsForPass = new ArrayList(); /** - * Name of the resource to write remapped refs to + * Obfuscation manager */ - private final String outRefMapFileName; - - /** - * Target obfuscation environments - */ - private final List targetEnvironments = new ArrayList(); - - /** - * Reference mapper for reference mapping - */ - private final ReferenceMapper refMapper = new ReferenceMapper(); + private final ObfuscationManager obf; /** * Rule validators @@ -155,19 +142,13 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp this.env = this.detectEnvironment(processingEnv); this.processingEnv = processingEnv; this.targets = this.initTargetMap(); - this.outRefMapFileName = this.getOption(SupportedOptions.OUT_REFMAP_FILE); + this.obf = new ObfuscationManager(this); this.printMessage(Kind.NOTE, "SpongePowered Mixin Annotation Processor v" + MixinBootstrap.VERSION); - for (ObfuscationType obfType : ObfuscationType.values()) { - if (obfType.isSupported(this)) { - this.targetEnvironments.add(new TargetObfuscationEnvironment(obfType, this, this, this, this.refMapper)); - } - } - this.validators = ImmutableList.of( - new ParentValidator(processingEnv, this, this), - new TargetValidator(processingEnv, this, this) + new ParentValidator(this), + new TargetValidator(this) ); this.initTokenCache(this.getOption("tokens")); @@ -192,6 +173,31 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp } } } + + @Override + public ITypeHandleProvider getTypeProvider() { + return this; + } + + @Override + public ITokenProvider getTokenProvider() { + return this; + } + + @Override + public IObfuscationManager getObfuscationManager() { + return this.obf; + } + + @Override + public IJavadocProvider getJavadocProvider() { + return this; + } + + @Override + public ProcessingEnvironment getProcessingEnvironment() { + return this.processingEnv; + } @Override public Integer getToken(String token) { @@ -253,222 +259,16 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp * Write out generated srgs */ public void writeSrgs() { - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - targetEnv.writeSrgs(this.processingEnv.getFiler(), this.mixins); - } + this.obf.writeSrgs(this.mixins); } /** * Write out stored mappings */ public void writeRefs() { - if (this.outRefMapFileName == null) { - return; - } - - PrintWriter writer = null; - - try { - writer = this.openFileWriter(this.outRefMapFileName, "refmap"); - this.refMapper.write(writer); - } catch (IOException ex) { - ex.printStackTrace(); - } finally { - if (writer != null) { - try { - writer.close(); - } catch (Exception ex) { - // oh well - } - } - } + this.obf.writeRefs(); } - /** - * Open a writer for an output file - */ - private PrintWriter openFileWriter(String fileName, String description) throws IOException { - if (fileName.matches("^.*[\\\\/:].*$")) { - File outSrgFile = new File(fileName); - outSrgFile.getParentFile().mkdirs(); - this.printMessage(Kind.NOTE, "Writing " + description + " to " + outSrgFile.getAbsolutePath()); - return new PrintWriter(outSrgFile); - } - - FileObject outSrg = this.processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", fileName); - this.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); - return new PrintWriter(outSrg.openWriter()); - } - - @SuppressWarnings("unchecked") - public ObfuscationData getObfEntryRecursive(final MemberInfo targetMember) { - MemberInfo currentTarget = targetMember; - ObfuscationData obfTargetNames = this.getObfClass(currentTarget.owner); - ObfuscationData obfData = this.getObfEntry(currentTarget); - try { - while (obfData.isEmpty()) { - TypeHandle targetType = this.getTypeHandle(currentTarget.owner); - if (targetType == null) { - return obfData; - } - TypeHandle superClass = targetType.getSuperclass(); - if (superClass == null) { - return obfData; - } - currentTarget = currentTarget.move(superClass.getName()); - obfData = this.getObfEntry(currentTarget); - if (!obfData.isEmpty()) { - for (ObfuscationType type : obfData) { - String obfClass = obfTargetNames.get(type); - T obfMember = obfData.get(type); - if (currentTarget.isField()) { - obfData.add(type, (T)MemberInfo.fromSrgField(obfMember.toString(), "").move(obfClass).toSrg()); - } else { - obfData.add(type, (T)MemberInfo.fromSrgMethod((MethodData)obfMember).move(obfClass).asMethodData()); - } - } - } - } - } catch (Exception ex) { - return this.getObfEntry(targetMember); - } - return obfData; - } - - @SuppressWarnings("unchecked") - public ObfuscationData getObfEntry(MemberInfo targetMember) { - if (targetMember.isField()) { - return (ObfuscationData)this.getObfField(targetMember.toSrg()); - } - return (ObfuscationData)this.getObfMethod(targetMember.asMethodData()); - } - - public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { - return this.getObfEntryRecursive(targetMember); - } - - public ObfuscationData getObfMethod(MemberInfo method) { - ObfuscationData data = new ObfuscationData(); - - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = targetEnv.getObfMethod(method); - if (obfMethod != null) { - data.add(targetEnv.getType(), obfMethod); - } - } - - return data; - } - - /** - * Get an obfuscation mapping for a method - */ - public ObfuscationData getObfMethod(MethodData method) { - ObfuscationData data = new ObfuscationData(); - - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = targetEnv.getObfMethod(method); - if (obfMethod != null) { - data.add(targetEnv.getType(), obfMethod); - } - } - - return data; - } - - public ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { - return this.getObfEntryRecursive(targetMember); - } - - /** - * Get an obfuscation mapping for a field - */ - public ObfuscationData getObfField(String field) { - ObfuscationData data = new ObfuscationData(); - - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - String obfField = targetEnv.getObfField(field); - if (obfField != null) { - data.add(targetEnv.getType(), obfField); - } - } - - return data; - } - - /** - * Get an obfuscation mapping for a class - */ - public ObfuscationData getObfClass(TypeHandle type) { - return this.getObfClass(type.getName()); - } - - /** - * Get an obfuscation mapping for a class - */ - public ObfuscationData getObfClass(String className) { - ObfuscationData data = new ObfuscationData(className); - - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - String obfClass = targetEnv.getObfClass(className); - if (obfClass != null) { - data.add(targetEnv.getType(), obfClass); - } - } - - return data; - } - - void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = obfMethodData.get(targetEnv.getType()); - if (obfMethod != null) { - int slashPos = obfMethod.name.lastIndexOf('/'); - String obfName = obfMethod.name.substring(slashPos + 1); - String obfOwner = obfMethod.name.substring(0, slashPos); - MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); - targetEnv.addMapping(className, reference, remappedReference.toString()); - } - } - } - - void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData) { - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = obfMethodData.get(targetEnv.getType()); - if (obfMethod != null) { - MemberInfo remappedReference = context.remapUsing(obfMethod, true); - targetEnv.addMapping(className, reference, remappedReference.toString()); - } - } - } - - void addFieldMapping(String className, String reference, MemberInfo context, ObfuscationData obfFieldData) { - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - String obfField = obfFieldData.get(targetEnv.getType()); - if (obfField != null) { - MemberInfo remappedReference = MemberInfo.fromSrgField(obfField, context.desc); - String remapped = remappedReference.toString(); - targetEnv.addMapping(className, reference, remapped); - } - } - } - - void addClassMapping(String className, String reference, ObfuscationData obfClassData) { - for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - String remapped = obfClassData.get(targetEnv.getType()); - if (remapped != null) { - targetEnv.addMapping(className, reference, remapped); - } - } - } - - /** - * Get the reference mapper - */ - public ReferenceMapper getReferenceMapper() { - return this.refMapper; - } - /** * Clear all registered mixins */ @@ -692,13 +492,6 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp this.processingEnv.getMessager().printMessage(kind, msg, element, annotation, value); } - /** - * Print a message to the AP messager - */ - public void printMessage(Kind kind, CharSequence msg, AnnotatedMixin mixin) { - this.processingEnv.getMessager().printMessage(kind, msg, mixin.getMixin(), mixin.getAnnotation()); - } - /** * Get a TypeHandle representing another type in the current processing * environment @@ -729,12 +522,11 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return null; } - /** - * Get javadoc on element - * - * @param element Element to fetch javadoc for - * @return javadoc + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IJavadocProvider + * #getJavadoc(javax.lang.model.element.Element) */ + @Override public String getJavadoc(Element element) { Elements elements = this.processingEnv.getElementUtils(); return elements.getDocComment(element); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java index 82a25edf..244e944a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java @@ -34,6 +34,10 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +import org.spongepowered.tools.obfuscation.interfaces.IMixinValidator; +import org.spongepowered.tools.obfuscation.interfaces.IOptionProvider; + /** * Base class for mixin validators */ @@ -68,10 +72,10 @@ public abstract class MixinValidator implements IMixinValidator { * @param options Option provider * @param pass Validation pass being performed */ - public MixinValidator(ProcessingEnvironment processingEnv, Messager messager, IOptionProvider options, ValidationPass pass) { - this.processingEnv = processingEnv; - this.messager = messager; - this.options = options; + public MixinValidator(IMixinAnnotationProcessor ap, ValidationPass pass) { + this.processingEnv = ap.getProcessingEnvironment(); + this.messager = ap; + this.options = ap; this.pass = pass; } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java new file mode 100644 index 00000000..a8fe23ff --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -0,0 +1,363 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.tools.Diagnostic.Kind; +import javax.tools.FileObject; +import javax.tools.StandardLocation; + +import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; + +import net.minecraftforge.srg2source.rangeapplier.MethodData; + +public class ObfuscationManager implements IObfuscationManager { + + /** + * Annotation processor + */ + private final IMixinAnnotationProcessor ap; + + /** + * Name of the resource to write remapped refs to + */ + private final String outRefMapFileName; + + /** + * Target obfuscation environments + */ + private final List targetEnvironments = new ArrayList(); + + /** + * Reference mapper for reference mapping + */ + private final ReferenceMapper refMapper = new ReferenceMapper(); + + public ObfuscationManager(IMixinAnnotationProcessor ap) { + this.ap = ap; + this.outRefMapFileName = this.ap.getOption(SupportedOptions.OUT_REFMAP_FILE); + for (ObfuscationType obfType : ObfuscationType.values()) { + if (obfType.isSupported(this.ap)) { + this.targetEnvironments.add(new TargetObfuscationEnvironment(ap, obfType, this.refMapper)); + } + } + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getReferenceMapper() + */ + @Override + public ReferenceMapper getReferenceMapper() { + return this.refMapper; + } + + /** + * Write out generated srgs + */ + public void writeSrgs(Map mixins) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + targetEnv.writeSrgs(this.ap.getProcessingEnvironment().getFiler(), mixins); + } + } + + /** + * Write out stored mappings + */ + public void writeRefs() { + if (this.outRefMapFileName == null) { + return; + } + + PrintWriter writer = null; + + try { + writer = this.newWriter(this.outRefMapFileName, "refmap"); + this.refMapper.write(writer); + } catch (IOException ex) { + ex.printStackTrace(); + } finally { + if (writer != null) { + try { + writer.close(); + } catch (Exception ex) { + // oh well + } + } + } + } + + /** + * Open a writer for an output file + */ + private PrintWriter newWriter(String fileName, String description) throws IOException { + if (fileName.matches("^.*[\\\\/:].*$")) { + File outSrgFile = new File(fileName); + outSrgFile.getParentFile().mkdirs(); + this.ap.printMessage(Kind.NOTE, "Writing " + description + " to " + outSrgFile.getAbsolutePath()); + return new PrintWriter(outSrgFile); + } + + FileObject outSrg = this.ap.getProcessingEnvironment().getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", fileName); + this.ap.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); + return new PrintWriter(outSrg.openWriter()); + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfEntryRecursive( + * org.spongepowered.asm.mixin.injection.struct.MemberInfo) + */ + @Override + @SuppressWarnings("unchecked") + public ObfuscationData getObfEntryRecursive(final MemberInfo targetMember) { + MemberInfo currentTarget = targetMember; + ObfuscationData obfTargetNames = this.getObfClass(currentTarget.owner); + ObfuscationData obfData = this.getObfEntry(currentTarget); + try { + while (obfData.isEmpty()) { + TypeHandle targetType = this.ap.getTypeProvider().getTypeHandle(currentTarget.owner); + if (targetType == null) { + return obfData; + } + TypeHandle superClass = targetType.getSuperclass(); + if (superClass == null) { + return obfData; + } + currentTarget = currentTarget.move(superClass.getName()); + obfData = this.getObfEntry(currentTarget); + if (!obfData.isEmpty()) { + for (ObfuscationType type : obfData) { + String obfClass = obfTargetNames.get(type); + T obfMember = obfData.get(type); + if (currentTarget.isField()) { + obfData.add(type, (T)MemberInfo.fromSrgField(obfMember.toString(), "").move(obfClass).toSrg()); + } else { + obfData.add(type, (T)MemberInfo.fromSrgMethod((MethodData)obfMember).move(obfClass).asMethodData()); + } + } + } + } + } catch (Exception ex) { + return this.getObfEntry(targetMember); + } + return obfData; + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfEntry( + * org.spongepowered.asm.mixin.injection.struct.MemberInfo) + */ + @Override + @SuppressWarnings("unchecked") + public ObfuscationData getObfEntry(MemberInfo targetMember) { + if (targetMember.isField()) { + return (ObfuscationData)this.getObfField(targetMember.toSrg()); + } + return (ObfuscationData)this.getObfMethod(targetMember.asMethodData()); + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfMethodRecursive( + * org.spongepowered.asm.mixin.injection.struct.MemberInfo) + */ + @Override + public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { + return this.getObfEntryRecursive(targetMember); + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfMethod( + * org.spongepowered.asm.mixin.injection.struct.MemberInfo) + */ + @Override + public ObfuscationData getObfMethod(MemberInfo method) { + ObfuscationData data = new ObfuscationData(); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = targetEnv.getObfMethod(method); + if (obfMethod != null) { + data.add(targetEnv.getType(), obfMethod); + } + } + + return data; + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfMethod(net.minecraftforge.srg2source.rangeapplier.MethodData) + */ + @Override + public ObfuscationData getObfMethod(MethodData method) { + ObfuscationData data = new ObfuscationData(); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = targetEnv.getObfMethod(method); + if (obfMethod != null) { + data.add(targetEnv.getType(), obfMethod); + } + } + + return data; + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfFieldRecursive( + * org.spongepowered.asm.mixin.injection.struct.MemberInfo) + */ + @Override + public ObfuscationData getObfFieldRecursive(MemberInfo targetMember) { + return this.getObfEntryRecursive(targetMember); + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfField(java.lang.String) + */ + @Override + public ObfuscationData getObfField(String field) { + ObfuscationData data = new ObfuscationData(); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String obfField = targetEnv.getObfField(field); + if (obfField != null) { + data.add(targetEnv.getType(), obfField); + } + } + + return data; + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfClass(org.spongepowered.tools.obfuscation.TypeHandle) + */ + @Override + public ObfuscationData getObfClass(TypeHandle type) { + return this.getObfClass(type.getName()); + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.IObfuscationManager + * #getObfClass(java.lang.String) + */ + @Override + public ObfuscationData getObfClass(String className) { + ObfuscationData data = new ObfuscationData(className); + + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String obfClass = targetEnv.getObfClass(className); + if (obfClass != null) { + data.add(targetEnv.getType(), obfClass); + } + } + + return data; + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager + * #addMethodMapping(java.lang.String, java.lang.String, + * org.spongepowered.tools.obfuscation.ObfuscationData) + */ + @Override + public void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + if (obfMethod != null) { + int slashPos = obfMethod.name.lastIndexOf('/'); + String obfName = obfMethod.name.substring(slashPos + 1); + String obfOwner = obfMethod.name.substring(0, slashPos); + MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); + targetEnv.addMapping(className, reference, remappedReference.toString()); + } + } + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager + * #addMethodMapping(java.lang.String, java.lang.String, + * org.spongepowered.asm.mixin.injection.struct.MemberInfo, + * org.spongepowered.tools.obfuscation.ObfuscationData) + */ + @Override + public void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + if (obfMethod != null) { + MemberInfo remappedReference = context.remapUsing(obfMethod, true); + targetEnv.addMapping(className, reference, remappedReference.toString()); + } + } + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager + * #addFieldMapping(java.lang.String, java.lang.String, + * org.spongepowered.asm.mixin.injection.struct.MemberInfo, + * org.spongepowered.tools.obfuscation.ObfuscationData) + */ + @Override + public void addFieldMapping(String className, String reference, MemberInfo context, ObfuscationData obfFieldData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String obfField = obfFieldData.get(targetEnv.getType()); + if (obfField != null) { + MemberInfo remappedReference = MemberInfo.fromSrgField(obfField, context.desc); + String remapped = remappedReference.toString(); + targetEnv.addMapping(className, reference, remapped); + } + } + } + + /* (non-Javadoc) + * @see org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager + * #addClassMapping(java.lang.String, java.lang.String, + * org.spongepowered.tools.obfuscation.ObfuscationData) + */ + @Override + public void addClassMapping(String className, String reference, ObfuscationData obfClassData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String remapped = obfClassData.get(targetEnv.getType()); + if (remapped != null) { + targetEnv.addMapping(className, reference, remapped); + } + } + } + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java index 19b2d494..5df85f3b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java @@ -24,6 +24,8 @@ */ package org.spongepowered.tools.obfuscation; +import org.spongepowered.tools.obfuscation.interfaces.IOptionProvider; + enum ObfuscationType { SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.OUT_SRG_SRG_FILE), diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 22dc6660..80e92554 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -32,7 +32,6 @@ import java.util.Map; import java.util.Set; import javax.annotation.processing.Filer; -import javax.annotation.processing.Messager; import javax.lang.model.element.TypeElement; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; @@ -43,6 +42,7 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import net.minecraftforge.srg2source.rangeapplier.MethodData; import net.minecraftforge.srg2source.rangeapplier.SrgContainer; @@ -55,19 +55,9 @@ class TargetObfuscationEnvironment { private final ObfuscationType type; /** - * Messager + * Annotation processor */ - private final Messager messager; - - /** - * Type handle provider - */ - private final ITypeHandleProvider typeProvider; - - /** - * Options - */ - private final IOptionProvider options; + private final IMixinAnnotationProcessor ap; /** * Name of the resource to write generated srgs to @@ -95,16 +85,13 @@ class TargetObfuscationEnvironment { */ private boolean initDone; - public TargetObfuscationEnvironment(ObfuscationType type, Messager messager, ITypeHandleProvider typeProvider, IOptionProvider options, - ReferenceMapper refMapper) { + public TargetObfuscationEnvironment(IMixinAnnotationProcessor ap, ObfuscationType type, ReferenceMapper refMapper) { + this.ap = ap; this.type = type; - this.messager = messager; - this.typeProvider = typeProvider; - this.options = options; this.refMapper = refMapper; - this.reobfSrgFileName = type.getSrgFileName(options); - this.outSrgFileName = type.getOutputSrgFileName(options); + this.reobfSrgFileName = type.getSrgFileName(ap); + this.outSrgFileName = type.getOutputSrgFileName(ap); } private boolean initSrgs() { @@ -112,18 +99,18 @@ class TargetObfuscationEnvironment { this.initDone = true; if (this.reobfSrgFileName == null) { - this.messager.printMessage(Kind.ERROR, "The " + this.type.getSrgFileOption() + this.ap.printMessage(Kind.ERROR, "The " + this.type.getSrgFileOption() + " argument was not supplied, obfuscation processing will not occur"); return false; } try { File reobfSrgFile = new File(this.reobfSrgFileName); - this.messager.printMessage(Kind.NOTE, "Loading " + this.type + " mappings from " + reobfSrgFile.getAbsolutePath()); + this.ap.printMessage(Kind.NOTE, "Loading " + this.type + " mappings from " + reobfSrgFile.getAbsolutePath()); this.srgs = new SrgContainer().readSrg(reobfSrgFile); } catch (Exception ex) { ex.printStackTrace(); - this.messager.printMessage(Kind.ERROR, "The specified " + this.type + " SRG file could not be read, processing cannot continue"); + this.ap.printMessage(Kind.ERROR, "The specified " + this.type + " SRG file could not be read, processing cannot continue"); this.srgs = null; } } @@ -140,7 +127,7 @@ class TargetObfuscationEnvironment { public void addMapping(String className, String reference, String newReference) { this.refMapper.addMapping(this.type.getKey(), className, reference, newReference); - if (this.type.isDefault(this.options)) { + if (this.type.isDefault(this.ap)) { this.refMapper.addMapping(null, className, reference, newReference); } } @@ -155,7 +142,7 @@ class TargetObfuscationEnvironment { } // Get a type handle for the declared method owner - TypeHandle type = this.typeProvider.getTypeHandle(method.owner); + TypeHandle type = this.ap.getTypeProvider().getTypeHandle(method.owner); if (type == null || type.isImaginary()) { return null; } @@ -247,12 +234,12 @@ class TargetObfuscationEnvironment { if (fileName.matches("^.*[\\\\/:].*$")) { File outSrgFile = new File(fileName); outSrgFile.getParentFile().mkdirs(); - this.messager.printMessage(Kind.NOTE, "Writing " + description + " to " + outSrgFile.getAbsolutePath()); + this.ap.printMessage(Kind.NOTE, "Writing " + description + " to " + outSrgFile.getAbsolutePath()); return new PrintWriter(outSrgFile); } FileObject outSrg = filer.createResource(StandardLocation.CLASS_OUTPUT, "", fileName); - this.messager.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); + this.ap.printMessage(Kind.NOTE, "Writing " + description + " to " + new File(outSrg.toUri()).getAbsolutePath()); return new PrintWriter(outSrg.openWriter()); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IJavadocProvider.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IJavadocProvider.java new file mode 100644 index 00000000..9dae68b7 --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IJavadocProvider.java @@ -0,0 +1,42 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation.interfaces; + +import javax.lang.model.element.Element; + +/** + * Provides javadoc. What else did you expect? + */ +public interface IJavadocProvider { + + /** + * Get javadoc on element + * + * @param element Element to fetch javadoc for + * @return javadoc + */ + public abstract String getJavadoc(Element element); + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinAnnotationProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinAnnotationProcessor.java new file mode 100644 index 00000000..1abf502f --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinAnnotationProcessor.java @@ -0,0 +1,62 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation.interfaces; + +import javax.annotation.processing.Messager; +import javax.annotation.processing.ProcessingEnvironment; + +import org.spongepowered.asm.util.ITokenProvider; + +/** + * Interface for annotation processor core + */ +public interface IMixinAnnotationProcessor extends Messager, IOptionProvider { + + /** + * Get the underlying processing environment + */ + public abstract ProcessingEnvironment getProcessingEnvironment(); + + /** + * Get the obfuscation manager + */ + public abstract IObfuscationManager getObfuscationManager(); + + /** + * Get the token provider + */ + public abstract ITokenProvider getTokenProvider(); + + /** + * Get the type handle provider + */ + public abstract ITypeHandleProvider getTypeProvider(); + + /** + * Get the javadoc provider + */ + public abstract IJavadocProvider getJavadocProvider(); + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/IMixinValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinValidator.java similarity index 94% rename from src/ap/java/org/spongepowered/tools/obfuscation/IMixinValidator.java rename to src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinValidator.java index 8dc83ae5..9f43e6b9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/IMixinValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinValidator.java @@ -22,13 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.tools.obfuscation; +package org.spongepowered.tools.obfuscation.interfaces; import java.util.Collection; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.TypeElement; +import org.spongepowered.tools.obfuscation.TypeHandle; + /** * A mixin validator module, basically just a way of making the various sanity * checks modular diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java new file mode 100644 index 00000000..38beeb7d --- /dev/null +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java @@ -0,0 +1,155 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.tools.obfuscation.interfaces; + +import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.tools.obfuscation.ObfuscationData; +import org.spongepowered.tools.obfuscation.TypeHandle; + +import net.minecraftforge.srg2source.rangeapplier.MethodData; + +/** + * Manages obfuscation things + */ +public interface IObfuscationManager { + + /** + * Get the underlying reference mapper + */ + public abstract ReferenceMapper getReferenceMapper(); + + /** + * Attempts to resolve an obfuscation entry by recursively enumerating + * superclasses of the target member until a match is found. If a match is + * found in a superclass then the reference is remapped to the original + * owner class. + * + * @param targetMember Member to search for + * @return ObfuscationData with remapped owner class corresponding to the + * original owner class + */ + public abstract ObfuscationData getObfEntryRecursive(MemberInfo targetMember); + + /** + * Resolves a field or method reference to an ObfuscationData set + * + * @param targetMember member to search for + * @return obfuscation data (by type) for the supplied member + */ + public abstract ObfuscationData getObfEntry(MemberInfo targetMember); + + /** + * Attempts to resolve an obfuscated method by recursively enumerating + * superclasses of the target method until a match is found. If a match is + * found in a superclass then the method owner is remapped to the obfuscated + * name of the original owner class. + * + * @param method Method to search for + * @return ObfuscationData with remapped owner class corresponding to the + * original owner class + */ + public abstract ObfuscationData getObfMethodRecursive(MemberInfo method); + + /** + * Get an obfuscation mapping for a method + */ + public abstract ObfuscationData getObfMethod(MemberInfo method); + + /** + * Get an obfuscation mapping for a method + */ + public abstract ObfuscationData getObfMethod(MethodData method); + + /** + * Attempts to resolve an obfuscated field by recursively enumerating + * superclasses of the target field until a match is found. If a match is + * found in a superclass then the field owner is remapped to the obfuscated + * name of the original owner class. + * + * @param field Field to search for + * @return ObfuscationData with remapped owner class corresponding to the + * original owner class + */ + public abstract ObfuscationData getObfFieldRecursive(MemberInfo field); + + /** + * Get an obfuscation mapping for a field + */ + public abstract ObfuscationData getObfField(String field); + + /** + * Get an obfuscation mapping for a class + */ + public abstract ObfuscationData getObfClass(TypeHandle type); + + /** + * Get an obfuscation mapping for a class + */ + public abstract ObfuscationData getObfClass(String className); + + /** + * Adds a method mapping to the internal refmap + * + * @param className Mixin class name which owns the refmap entry + * @param reference Original reference, as it appears in the annotation + * @param obfMethodData Method data to add for this mapping + */ + public abstract void addMethodMapping(String className, String reference, ObfuscationData obfMethodData); + + /** + * Adds a method mapping to the internal refmap, generates refmap entries + * using the supplied parsed memberinfo as context + * + * @param className Mixin class name which owns the refmap entry + * @param reference Original reference, as it appears in the annotation + * @param context The context for this mapping entry, remapped using the + * supplied obfuscation data + * @param obfMethodData Method data to add for this mapping + */ + public abstract void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData); + + /** + * Adds a field mapping to the internal refmap, generates refmap entries + * using the supplied parsed memberinfo as context + * + * @param className Mixin class name which owns the refmap entry + * @param reference Original reference, as it appears in the annotation + * @param context The context for this mapping entry, remapped using the + * supplied obfuscation data + * @param obfFieldData Field data to add for this mapping + */ + public abstract void addFieldMapping(String className, String reference, MemberInfo context, ObfuscationData obfFieldData); + + /** + * Adds a class mapping to the internal refmap + * + * @param className Mixin class name which owns the refmap entry + * @param reference Original reference, as it appears in the annotation + * @param obfClassData Class obf names + */ + public abstract void addClassMapping(String className, String reference, ObfuscationData obfClassData); + +} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/IOptionProvider.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IOptionProvider.java similarity index 96% rename from src/ap/java/org/spongepowered/tools/obfuscation/IOptionProvider.java rename to src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IOptionProvider.java index 81f3f3ac..e0bbd48a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/IOptionProvider.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IOptionProvider.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.tools.obfuscation; +package org.spongepowered.tools.obfuscation.interfaces; /** * An object which can provide option values to consumers diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ITypeHandleProvider.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/ITypeHandleProvider.java similarity index 80% rename from src/ap/java/org/spongepowered/tools/obfuscation/ITypeHandleProvider.java rename to src/ap/java/org/spongepowered/tools/obfuscation/interfaces/ITypeHandleProvider.java index f885afb9..48556bec 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ITypeHandleProvider.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/ITypeHandleProvider.java @@ -22,10 +22,21 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.tools.obfuscation; +package org.spongepowered.tools.obfuscation.interfaces; +import org.spongepowered.tools.obfuscation.TypeHandle; + +/** + * Manager object which cann supply {@link TypeHandle} instances + */ public interface ITypeHandleProvider { + /** + * Generate a type handle for the specified type + * + * @param name Type name (class name) + * @return A new type handle + */ public abstract TypeHandle getTypeHandle(String name); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java index af718b11..a2ebd5be 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/ParentValidator.java @@ -26,16 +26,14 @@ package org.spongepowered.tools.obfuscation.validation; import java.util.Collection; -import javax.annotation.processing.Messager; -import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; -import org.spongepowered.tools.obfuscation.IOptionProvider; import org.spongepowered.tools.obfuscation.MixinValidator; import org.spongepowered.tools.obfuscation.TypeHandle; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; /** * Validator which checks that the mixin parent is sane @@ -45,12 +43,10 @@ public class ParentValidator extends MixinValidator { /** * ctor * - * @param processingEnv Processing environment - * @param messager Messager - * @param options Option provider + * @param ap Processing environment */ - public ParentValidator(ProcessingEnvironment processingEnv, Messager messager, IOptionProvider options) { - super(processingEnv, messager, options, ValidationPass.EARLY); + public ParentValidator(IMixinAnnotationProcessor ap) { + super(ap, ValidationPass.EARLY); } /* (non-Javadoc) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java index 13bd46b4..e445b98a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java @@ -26,8 +26,6 @@ package org.spongepowered.tools.obfuscation.validation; import java.util.Collection; -import javax.annotation.processing.Messager; -import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; @@ -36,10 +34,10 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import org.spongepowered.tools.MirrorUtils; -import org.spongepowered.tools.obfuscation.IOptionProvider; import org.spongepowered.tools.obfuscation.MixinValidator; import org.spongepowered.tools.obfuscation.SupportedOptions; import org.spongepowered.tools.obfuscation.TypeHandle; +import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; /** * Validator which checks that the mixin targets are sane @@ -49,12 +47,10 @@ public class TargetValidator extends MixinValidator { /** * ctor * - * @param processingEnv Processing environment - * @param messager Messager - * @param options Option provider + * @param ap Processing environment */ - public TargetValidator(ProcessingEnvironment processingEnv, Messager messager, IOptionProvider options) { - super(processingEnv, messager, options, ValidationPass.LATE); + public TargetValidator(IMixinAnnotationProcessor ap) { + super(ap, ValidationPass.LATE); } /* (non-Javadoc) From 2c9e3d1d398be0e164f081fc90e2439f17e48706 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 25 Jan 2016 16:00:49 +0000 Subject: [PATCH 093/169] ExtraSRGs support in Annotation Processor. Closes #94 --- gradle.properties | 2 +- .../tools/obfuscation/AnnotatedMixins.java | 2 +- .../tools/obfuscation/ObfuscationType.java | 37 ++++++++++++++++--- .../tools/obfuscation/SupportedOptions.java | 5 ++- .../TargetObfuscationEnvironment.java | 32 +++++++++++----- .../asm/launch/MixinBootstrap.java | 2 +- 6 files changed, 60 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index e88e86b9..44adeeac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.15 +buildVersion=0.4.16 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 79c272d4..657dca67 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -151,7 +151,7 @@ class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider, ITyp new TargetValidator(this) ); - this.initTokenCache(this.getOption("tokens")); + this.initTokenCache(this.getOption(SupportedOptions.TOKENS)); } protected TargetMap initTargetMap() { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java index 5df85f3b..17528c5e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java @@ -24,20 +24,27 @@ */ package org.spongepowered.tools.obfuscation; +import java.util.List; + import org.spongepowered.tools.obfuscation.interfaces.IOptionProvider; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList.Builder; + enum ObfuscationType { - SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.OUT_SRG_SRG_FILE), - NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.OUT_NOTCH_SRG_FILE); + SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.REOBF_EXTRA_SRG_FILES, SupportedOptions.OUT_SRG_SRG_FILE), + NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.REOBF_EXTRA_NOTCH_FILES, SupportedOptions.OUT_NOTCH_SRG_FILE); private final String key; private final String srgFileArgName; + private final String extraSrgFilesArgName; private final String outSrgFileArgName; - private ObfuscationType(String displayName, String srgFileArgName, String outSrgFileArgName) { + private ObfuscationType(String displayName, String srgFileArgName, String extraSrgFilesArgName, String outSrgFileArgName) { this.key = displayName; this.srgFileArgName = srgFileArgName; + this.extraSrgFilesArgName = extraSrgFilesArgName; this.outSrgFileArgName = outSrgFileArgName; } @@ -54,6 +61,10 @@ enum ObfuscationType { return this.srgFileArgName; } + public String getExtraSrgFilesOption() { + return this.extraSrgFilesArgName; + } + public String getOutputSrgFileOption() { return this.outSrgFileArgName; } @@ -64,11 +75,25 @@ enum ObfuscationType { } public boolean isSupported(IOptionProvider options) { - return this.getSrgFileName(options) != null; + return this.getSrgFileNames(options).size() > 0; } - public String getSrgFileName(IOptionProvider options) { - return options.getOption(this.srgFileArgName); + public List getSrgFileNames(IOptionProvider options) { + Builder builder = ImmutableList.builder(); + + String srgFile = options.getOption(this.srgFileArgName); + if (srgFile != null) { + builder.add(srgFile); + } + + String extraSrgFiles = options.getOption(this.extraSrgFilesArgName); + if (extraSrgFiles != null) { + for (String extraSrgFile : extraSrgFiles.split(";")) { + builder.add(extraSrgFile.trim()); + } + } + + return builder.build(); } public String getOutputSrgFileName(IOptionProvider options) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index aef3103f..f87d2e66 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -30,8 +30,11 @@ import com.google.common.collect.ImmutableSet; public final class SupportedOptions { + public static final String TOKENS = "tokens"; public static final String REOBF_SRG_FILE = "reobfSrgFile"; + public static final String REOBF_EXTRA_SRG_FILES = "reobfSrgFiles"; public static final String REOBF_NOTCH_FILE = "reobfNotchSrgFile"; + public static final String REOBF_EXTRA_NOTCH_FILES = "reobfNotchSrgFiles"; public static final String OUT_SRG_SRG_FILE = "outSrgFile"; public static final String OUT_NOTCH_SRG_FILE = "outNotchSrgFile"; public static final String OUT_REFMAP_FILE = "outRefMapFile"; @@ -53,7 +56,7 @@ public final class SupportedOptions { SupportedOptions.OVERWRITE_ERROR_LEVEL, SupportedOptions.DEFAULT_OBFUSCATION_ENV ); - + private SupportedOptions() {} } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 80e92554..f16b97d3 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -67,7 +68,7 @@ class TargetObfuscationEnvironment { /** * File containing the reobfd srgs */ - private final String reobfSrgFileName; + private final List reobfSrgFileNames; /** * Reference mapper for reference mapping @@ -90,7 +91,7 @@ class TargetObfuscationEnvironment { this.type = type; this.refMapper = refMapper; - this.reobfSrgFileName = type.getSrgFileName(ap); + this.reobfSrgFileNames = type.getSrgFileNames(ap); this.outSrgFileName = type.getOutputSrgFileName(ap); } @@ -98,19 +99,30 @@ class TargetObfuscationEnvironment { if (!this.initDone) { this.initDone = true; - if (this.reobfSrgFileName == null) { + if (this.reobfSrgFileNames == null) { this.ap.printMessage(Kind.ERROR, "The " + this.type.getSrgFileOption() + " argument was not supplied, obfuscation processing will not occur"); return false; } - try { - File reobfSrgFile = new File(this.reobfSrgFileName); - this.ap.printMessage(Kind.NOTE, "Loading " + this.type + " mappings from " + reobfSrgFile.getAbsolutePath()); - this.srgs = new SrgContainer().readSrg(reobfSrgFile); - } catch (Exception ex) { - ex.printStackTrace(); - this.ap.printMessage(Kind.ERROR, "The specified " + this.type + " SRG file could not be read, processing cannot continue"); + int successCount = 0; + this.srgs = new SrgContainer(); + + for (String srgFileName : this.reobfSrgFileNames) { + File reobfSrgFile = new File(srgFileName); + try { + if (reobfSrgFile.isFile()) { + this.ap.printMessage(Kind.NOTE, "Loading " + this.type + " mappings from " + reobfSrgFile.getAbsolutePath()); + this.srgs.readSrg(reobfSrgFile); + successCount++; + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (successCount < 1) { + this.ap.printMessage(Kind.ERROR, "No valid SRG files for " + this.type + " could be read, processing may not be sucessful."); this.srgs = null; } } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index d210de57..cf3b8cd0 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.15"; + public static final String VERSION = "0.4.16"; /** * Blackboard key where the subsystem version will be stored to indicate From 5afccbd4dd4ce2c6f1007ca6ba21bbcc9e7b4495 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 26 Jan 2016 13:41:16 +0000 Subject: [PATCH 094/169] Obf changes, remove srg2source, add ctors to refmap, fixes #96 fixes #97 --- build.gradle | 16 +--- gradle.properties | 2 +- .../AnnotatedMixinElementHandler.java | 3 +- .../AnnotatedMixinInjectorHandler.java | 3 +- .../AnnotatedMixinOverwriteHandler.java | 6 +- .../AnnotatedMixinShadowHandler.java | 5 +- .../tools/obfuscation/ObfuscationManager.java | 37 ++++++-- .../TargetObfuscationEnvironment.java | 75 ++++++++++++--- .../interfaces/IObfuscationManager.java | 3 +- .../asm/bridge/RemapperAdapter.java | 31 +------ .../asm/launch/MixinBootstrap.java | 2 +- .../mixin/injection/struct/MemberInfo.java | 19 ++-- .../asm/obfuscation/MethodData.java | 84 +++++++++++++++++ .../asm/obfuscation/SrgContainer.java | 88 ++++++++++++++++++ .../asm/util/ObfuscationUtil.java | 93 +++++++++++++++++++ 15 files changed, 382 insertions(+), 85 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/obfuscation/MethodData.java create mode 100644 src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java create mode 100644 src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java diff --git a/build.gradle b/build.gradle index c5643e11..07518b4a 100644 --- a/build.gradle +++ b/build.gradle @@ -43,16 +43,6 @@ targetCompatibility = '1.6' // Project repositories repositories { mavenCentral() - maven { - // for srg2source - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - // because Srg2Source needs an eclipse dependency. - name = "eclipse" - url = "https://repo.eclipse.org/content/groups/eclipse/" - } maven { name = 'minecraft' url = 'https://libraries.minecraft.net/' @@ -142,6 +132,7 @@ dependencies { compile 'com.google.code.gson:gson:2.2.4' compile 'commons-io:commons-io:2.4' compile 'commons-codec:commons-codec:1.9' + apCompile 'com.google.guava:guava:17.0' testCompile 'junit:junit:4.11' testCompile 'org.hamcrest:hamcrest-library:1.3' testCompile 'org.mockito:mockito-core:1.9.0' @@ -149,10 +140,6 @@ dependencies { // maven deployerJars 'org.apache.maven.wagon:wagon-ftp:2.7' - // for annotation processor - compile 'net.minecraftforge.srg2source:Srg2Source:3.2-SNAPSHOT' - apCompile 'net.minecraftforge.srg2source:Srg2Source:3.2-SNAPSHOT' - // remapped ASM compile tasks.renamedASM.outputs.files apCompile tasks.renamedASM.outputs.files @@ -169,6 +156,7 @@ dependencies { agentCompile 'net.minecraft:launchwrapper:1.11' // asm bridge + compile 'org.ow2.asm:asm-commons:5.0.3' bridgeCompile 'org.ow2.asm:asm-commons:5.0.3' bridgeCompile 'org.apache.logging.log4j:log4j-core:2.0-beta9' } diff --git a/gradle.properties b/gradle.properties index 44adeeac..d26d42e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.16 +buildVersion=0.4.17 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java index b2406214..1423685c 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -35,6 +35,7 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.obfuscation.MethodData; import org.spongepowered.asm.util.ConstraintParser; import org.spongepowered.asm.util.ConstraintParser.Constraint; import org.spongepowered.asm.util.ConstraintViolationException; @@ -43,8 +44,6 @@ import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - abstract class AnnotatedMixinElementHandler { /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java index 74823c6d..e18e2e1a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java @@ -36,13 +36,12 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; +import org.spongepowered.asm.obfuscation.MethodData; import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.struct.Message; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - class AnnotatedMixinInjectorHandler extends AnnotatedMixinElementHandler { AnnotatedMixinInjectorHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java index 692e065e..c9a83c79 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java @@ -30,11 +30,10 @@ import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.ExecutableElement; import javax.tools.Diagnostic.Kind; +import org.spongepowered.asm.obfuscation.MethodData; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { AnnotatedMixinOverwriteHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { @@ -73,8 +72,7 @@ class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { for (ObfuscationType type : obfData) { MethodData obfMethod = obfData.get(type); - String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); - this.addMethodMapping(type, mcpName, obfName, mcpSignature, obfMethod.sig); + this.addMethodMapping(type, mcpName, obfMethod.getSimpleName(), mcpSignature, obfMethod.getDesc()); } if (!"true".equalsIgnoreCase(this.ap.getOption(SupportedOptions.DISABLE_OVERWRITE_CHECKER))) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java index aa212c5e..137ece5d 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java @@ -29,11 +29,10 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.VariableElement; import javax.tools.Diagnostic.Kind; +import org.spongepowered.asm.obfuscation.MethodData; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { AnnotatedMixinShadowHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { @@ -85,7 +84,7 @@ class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { for (ObfuscationType type : obfData) { MethodData obfMethod = obfData.get(type); - this.addMethodMapping(type, name.setObfuscatedName(obfMethod.name), mcpSignature, obfMethod.sig); + this.addMethodMapping(type, name.setObfuscatedName(obfMethod.getName()), mcpSignature, obfMethod.getDesc()); } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index a8fe23ff..45e9313d 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -37,11 +37,11 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - public class ObfuscationManager implements IObfuscationManager { /** @@ -215,7 +215,11 @@ public class ObfuscationManager implements IObfuscationManager { } } - return data; + if (!data.isEmpty() || !Constants.INIT.equals(method.name)) { + return data; + } + + return this.remapDescriptor(data, method); } /* (non-Javadoc) @@ -233,6 +237,28 @@ public class ObfuscationManager implements IObfuscationManager { } } + if (!data.isEmpty() || !Constants.INIT.equals(method.getSimpleName())) { + return data; + } + + return this.remapDescriptor(data, new MemberInfo(method)); + } + + /** + * Remap a method owner and descriptor only, used for remapping ctors + * + * @param data Output method data collection + * @param method Method to remap + * @return data + */ + public ObfuscationData remapDescriptor(ObfuscationData data, MemberInfo method) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + MemberInfo obfMethod = targetEnv.remapDescriptor(method); + if (obfMethod != null) { + data.add(targetEnv.getType(), obfMethod.asMethodData()); + } + } + return data; } @@ -301,10 +327,7 @@ public class ObfuscationManager implements IObfuscationManager { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { MethodData obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { - int slashPos = obfMethod.name.lastIndexOf('/'); - String obfName = obfMethod.name.substring(slashPos + 1); - String obfOwner = obfMethod.name.substring(0, slashPos); - MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); + MemberInfo remappedReference = new MemberInfo(obfMethod); targetEnv.addMapping(className, reference, remappedReference.toString()); } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index f16b97d3..2dc73352 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -43,13 +43,41 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgContainer; +import org.spongepowered.asm.util.ObfuscationUtil; +import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; -import net.minecraftforge.srg2source.rangeapplier.MethodData; -import net.minecraftforge.srg2source.rangeapplier.SrgContainer; - class TargetObfuscationEnvironment { + final class RemapperProxy implements IClassRemapper { + + @Override + public String map(String typeName) { + if (TargetObfuscationEnvironment.this.srgs == null) { + return null; + } + return TargetObfuscationEnvironment.this.srgs.getClassMapping(typeName); + } + + @Override + public String unmap(String typeName) { + if (TargetObfuscationEnvironment.this.srgs == null) { + return null; + } + return TargetObfuscationEnvironment.this.srgs.getClassMapping(typeName); + } + + } + + /** + * SRG container for mcp->? mappings + */ + protected SrgContainer srgs; + + private final RemapperProxy remapper = new RemapperProxy(); + /** * Type */ @@ -75,11 +103,6 @@ class TargetObfuscationEnvironment { */ private final ReferenceMapper refMapper; - /** - * SRG container for mcp->? mappings - */ - private SrgContainer srgs; - /** * True once we've tried to initialise the srgs, initially false so that we * can do srg init lazily @@ -175,17 +198,47 @@ class TargetObfuscationEnvironment { */ public MethodData getObfMethod(MethodData method) { if (this.initSrgs()) { - return this.srgs.methodMap.get(method); + return this.srgs.getMethodMapping(method); } return null; } + /** + * Remap only the owner and descriptor of the specified method + * + * @param method method to remap + * @return remapped method or null if no remapping occurred + */ + public MemberInfo remapDescriptor(MemberInfo method) { + boolean transformed = false; + + String owner = method.owner; + if (owner != null) { + String newOwner = this.remapper.map(owner); + if (newOwner != null) { + owner = newOwner; + transformed = true; + } + } + + String desc = method.desc; + if (desc != null) { + String newDesc = ObfuscationUtil.mapDescriptor(method.desc, this.remapper); + if (!newDesc.equals(method.desc)) { + desc = newDesc; + transformed = true; + } + } + + return transformed ? new MemberInfo(method.name, owner, desc, method.matchAll) : null; + } + /** * Get an obfuscation mapping for a field */ public String getObfField(String field) { if (this.initSrgs()) { - return this.srgs.fieldMap.get(field); + return this.srgs.getFieldMapping(field); } return null; } @@ -195,7 +248,7 @@ class TargetObfuscationEnvironment { */ public String getObfClass(String className) { if (this.initSrgs()) { - return this.srgs.classMap.get(className); + return this.srgs.getClassMapping(className); } return null; } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java index 38beeb7d..ee154a5b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java @@ -26,11 +26,10 @@ package org.spongepowered.tools.obfuscation.interfaces; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.obfuscation.MethodData; import org.spongepowered.tools.obfuscation.ObfuscationData; import org.spongepowered.tools.obfuscation.TypeHandle; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - /** * Manages obfuscation things */ diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java index ae12af4f..5d6e9fe8 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java @@ -28,8 +28,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.objectweb.asm.commons.Remapper; import org.spongepowered.asm.mixin.extensibility.IRemapper; +import org.spongepowered.asm.util.ObfuscationUtil; +import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper; -public abstract class RemapperAdapter implements IRemapper { +public abstract class RemapperAdapter implements IRemapper, IClassRemapper { protected final Logger logger = LogManager.getLogger("mixin"); protected final Remapper remapper; @@ -87,32 +89,7 @@ public abstract class RemapperAdapter implements IRemapper { @Override public String unmapDesc(String desc) { - StringBuilder sb = new StringBuilder(); - StringBuilder token = null; - - for (int pos = 0; pos < desc.length(); pos++) { - char c = desc.charAt(pos); - if (token != null) { - if (c == ';') { - sb.append('L').append(this.unmap(token.toString())).append(';'); - token = null; - } else { - token.append(c); - } - continue; - } - if (c == 'L') { - token = new StringBuilder(); - } else { - sb.append(c); - } - } - - if (token != null) { - throw new IllegalArgumentException("Invalid descriptor '" + desc + "', missing ';'"); - } - - return sb.toString(); + return ObfuscationUtil.unmapDescriptor(desc, this); } } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index cf3b8cd0..acad8e63 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.16"; + public static final String VERSION = "0.4.17"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index de22ff2b..e6be12c9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -29,10 +29,9 @@ import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; +import org.spongepowered.asm.obfuscation.MethodData; import org.spongepowered.asm.util.SignaturePrinter; -import net.minecraftforge.srg2source.rangeapplier.MethodData; - /** *

Information bundle about a member (method or field) parsed from a String * token in another annotation, this is used where target members need to be @@ -168,11 +167,10 @@ public class MemberInfo { * * @param methodData MethodData object to copy values from */ - private MemberInfo(MethodData methodData) { - int slashPos = methodData.name.lastIndexOf('/'); - this.owner = methodData.name.substring(0, slashPos); - this.name = methodData.name.substring(slashPos + 1); - this.desc = methodData.sig; + public MemberInfo(MethodData methodData) { + this.owner = methodData.getOwner(); + this.name = methodData.getSimpleName(); + this.desc = methodData.getDesc(); this.matchAll = false; } @@ -182,10 +180,9 @@ public class MemberInfo { * @param methodData MethodData object to copy values from */ private MemberInfo(MemberInfo remapped, MethodData methodData, boolean setOwner) { - int slashPos = methodData.name.lastIndexOf('/'); - this.owner = setOwner ? methodData.name.substring(0, slashPos) : remapped.owner; - this.name = methodData.name.substring(slashPos + 1); - this.desc = methodData.sig; + this.owner = setOwner ? methodData.getOwner() : remapped.owner; + this.name = methodData.getSimpleName(); + this.desc = methodData.getDesc(); this.matchAll = remapped.matchAll; } diff --git a/src/main/java/org/spongepowered/asm/obfuscation/MethodData.java b/src/main/java/org/spongepowered/asm/obfuscation/MethodData.java new file mode 100644 index 00000000..c9e13519 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/obfuscation/MethodData.java @@ -0,0 +1,84 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.obfuscation; + +import com.google.common.base.Objects; + +public final class MethodData { + + private final String name; + private final String desc; + + public MethodData(String name, String sig) { + this.name = name; + this.desc = sig; + } + + public String getName() { + return this.name; + } + + public String getSimpleName() { + if (this.name == null) { + return null; + } + int pos = this.name.lastIndexOf('/'); + return pos > -1 ? this.name.substring(pos + 1) : this.name; + } + + public String getOwner() { + if (this.name == null) { + return null; + } + int pos = this.name.lastIndexOf('/'); + return pos > -1 ? this.name.substring(0, pos) : null; + } + + public String getDesc() { + return this.desc; + } + + @Override + public int hashCode() { + return Objects.hashCode(this.name, this.desc); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof MethodData) { + return Objects.equal(this.name, ((MethodData)obj).name) && Objects.equal(this.desc, ((MethodData)obj).desc); + } + return false; + } + + @Override + public String toString() { + return String.format("%s %s", this.name, this.desc); + } + +} diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java new file mode 100644 index 00000000..4611cce2 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java @@ -0,0 +1,88 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.obfuscation; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import com.google.common.io.Files; + +import joptsimple.internal.Strings; + +/** + * Ported from Srg2Source ( + * + * github.com/MinecraftForge/Srg2Source). + */ +public class SrgContainer { + + private final BiMap classMap = HashBiMap.create(); + private final BiMap fieldMap = HashBiMap.create(); + private final BiMap packageMap = HashBiMap.create(); + private final BiMap methodMap = HashBiMap.create(); + + public void readSrg(File srg) throws IOException { + for (String line : Files.readLines(srg, Charset.defaultCharset())) { + if (Strings.isNullOrEmpty(line) || line.startsWith("#")) { + continue; + } + + String type = line.substring(0, 2); + String[] args = line.substring(4).split(" "); + + if (type.equals("PK")) { + this.packageMap.forcePut(args[0], args[1]); + } else if (type.equals("CL")) { + this.classMap.forcePut(args[0], args[1]); + } else if (type.equals("FD")) { + this.fieldMap.forcePut(args[0], args[1]); + } else if (type.equals("MD")) { + this.methodMap.forcePut(new MethodData(args[0], args[1]), new MethodData(args[2], args[3])); + } else { + throw new RuntimeException("Invalid SRG file: " + srg); + } + } + } + + public MethodData getMethodMapping(MethodData methodName) { + return this.methodMap.get(methodName); + } + + public String getFieldMapping(String fieldName) { + return this.fieldMap.get(fieldName); + } + + public String getClassMapping(String className) { + return this.classMap.get(className); + } + + public String getPackageMapping(String packageName) { + return this.packageMap.get(packageName); + } + +} diff --git a/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java b/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java new file mode 100644 index 00000000..ee990ccd --- /dev/null +++ b/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java @@ -0,0 +1,93 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.util; + +public abstract class ObfuscationUtil { + + public interface IClassRemapper { + + /** + * Map type name to the new name. Subclasses can override. + * + * @param typeName Class name to convert + * @return new name for the class + */ + public abstract String map(String typeName); + + /** + * Convert a mapped type name back to the original obfuscated name + * + * @param typeName Class name to convert + * @return old name for the class + */ + public abstract String unmap(String typeName); + + } + + private ObfuscationUtil() {} + + public static String mapDescriptor(String desc, IClassRemapper remapper) { + return ObfuscationUtil.remapDescriptor(desc, remapper, false); + } + + public static String unmapDescriptor(String desc, IClassRemapper remapper) { + return ObfuscationUtil.remapDescriptor(desc, remapper, true); + } + + private static String remapDescriptor(String desc, IClassRemapper remapper, boolean unmap) { + StringBuilder sb = new StringBuilder(); + StringBuilder token = null; + + for (int pos = 0; pos < desc.length(); pos++) { + char c = desc.charAt(pos); + if (token != null) { + if (c == ';') { + sb.append('L').append(ObfuscationUtil.remap(token.toString(), remapper, unmap)).append(';'); + token = null; + } else { + token.append(c); + } + continue; + } + if (c == 'L') { + token = new StringBuilder(); + } else { + sb.append(c); + } + } + + if (token != null) { + throw new IllegalArgumentException("Invalid descriptor '" + desc + "', missing ';'"); + } + + return sb.toString(); + } + + private static Object remap(String typeName, IClassRemapper remapper, boolean unmap) { + String result = unmap ? remapper.unmap(typeName) : remapper.map(typeName); + return result != null ? result : typeName; + } + +} From 204a10c64d90f24a9167f1797c769ced23d5ed2d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 26 Jan 2016 13:47:35 +0000 Subject: [PATCH 095/169] Rename MethodData to more meaningful SrgMethod --- .../AnnotatedMixinElementHandler.java | 4 +- .../AnnotatedMixinInjectorHandler.java | 4 +- .../AnnotatedMixinOverwriteHandler.java | 6 +-- .../AnnotatedMixinShadowHandler.java | 6 +-- .../tools/obfuscation/ObfuscationManager.java | 38 ++++++++-------- .../TargetObfuscationEnvironment.java | 8 ++-- .../interfaces/IObfuscationManager.java | 12 ++--- .../mixin/injection/struct/MemberInfo.java | 44 +++++++++---------- .../asm/obfuscation/SrgContainer.java | 6 +-- .../{MethodData.java => SrgMethod.java} | 10 ++--- 10 files changed, 69 insertions(+), 69 deletions(-) rename src/main/java/org/spongepowered/asm/obfuscation/{MethodData.java => SrgMethod.java} (89%) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java index 1423685c..5a784d57 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -35,7 +35,7 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.ConstraintParser; import org.spongepowered.asm.util.ConstraintParser.Constraint; import org.spongepowered.asm.util.ConstraintViolationException; @@ -244,7 +244,7 @@ abstract class AnnotatedMixinElementHandler { } this.obf.addFieldMapping(this.classRef, target, targetMember, obfFieldData); } else { - ObfuscationData obfMethodData = this.obf.getObfMethodRecursive(targetMember); + ObfuscationData obfMethodData = this.obf.getObfMethodRecursive(targetMember); if (obfMethodData.isEmpty()) { if (targetMember.owner == null || !targetMember.owner.startsWith("java/lang/")) { this.ap.printMessage(Kind.WARNING, "Cannot find method mapping for @At(" + key + ") '" + target + "'", element, inject); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java index e18e2e1a..da687d8b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java @@ -36,7 +36,7 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -93,7 +93,7 @@ class AnnotatedMixinInjectorHandler extends AnnotatedMixinElementHandler { return null; } - ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + targetMember.name, desc)); + ObfuscationData obfData = this.obf.getObfMethod(new SrgMethod(this.mixin.getPrimaryTargetRef() + "/" + targetMember.name, desc)); if (obfData.isEmpty()) { Kind error = Constants.INIT.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java index c9a83c79..6165d6b2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java @@ -30,7 +30,7 @@ import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.ExecutableElement; import javax.tools.Diagnostic.Kind; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -51,7 +51,7 @@ class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { String mcpName = method.getSimpleName().toString(); String mcpSignature = MirrorUtils.generateSignature(method); - ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + mcpName, mcpSignature)); + ObfuscationData obfData = this.obf.getObfMethod(new SrgMethod(this.mixin.getPrimaryTargetRef() + "/" + mcpName, mcpSignature)); if (obfData.isEmpty()) { Kind error = Kind.ERROR; @@ -71,7 +71,7 @@ class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { } for (ObfuscationType type : obfData) { - MethodData obfMethod = obfData.get(type); + SrgMethod obfMethod = obfData.get(type); this.addMethodMapping(type, mcpName, obfMethod.getSimpleName(), mcpSignature, obfMethod.getDesc()); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java index 137ece5d..561181d9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java @@ -29,7 +29,7 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.VariableElement; import javax.tools.Diagnostic.Kind; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -75,7 +75,7 @@ class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { } String mcpSignature = MirrorUtils.generateSignature(method); - ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + name, mcpSignature)); + ObfuscationData obfData = this.obf.getObfMethod(new SrgMethod(this.mixin.getPrimaryTargetRef() + "/" + name, mcpSignature)); if (obfData.isEmpty()) { this.ap.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow method", method, shadow); @@ -83,7 +83,7 @@ class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { } for (ObfuscationType type : obfData) { - MethodData obfMethod = obfData.get(type); + SrgMethod obfMethod = obfData.get(type); this.addMethodMapping(type, name.setObfuscatedName(obfMethod.getName()), mcpSignature, obfMethod.getDesc()); } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index 45e9313d..27962169 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -37,7 +37,7 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; @@ -164,7 +164,7 @@ public class ObfuscationManager implements IObfuscationManager { if (currentTarget.isField()) { obfData.add(type, (T)MemberInfo.fromSrgField(obfMember.toString(), "").move(obfClass).toSrg()); } else { - obfData.add(type, (T)MemberInfo.fromSrgMethod((MethodData)obfMember).move(obfClass).asMethodData()); + obfData.add(type, (T)MemberInfo.fromSrgMethod((SrgMethod)obfMember).move(obfClass).asSrgMethod()); } } } @@ -186,7 +186,7 @@ public class ObfuscationManager implements IObfuscationManager { if (targetMember.isField()) { return (ObfuscationData)this.getObfField(targetMember.toSrg()); } - return (ObfuscationData)this.getObfMethod(targetMember.asMethodData()); + return (ObfuscationData)this.getObfMethod(targetMember.asSrgMethod()); } /* (non-Javadoc) @@ -195,8 +195,8 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.asm.mixin.injection.struct.MemberInfo) */ @Override - public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { - return this.getObfEntryRecursive(targetMember); + public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { + return this.getObfEntryRecursive(targetMember); } /* (non-Javadoc) @@ -205,11 +205,11 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.asm.mixin.injection.struct.MemberInfo) */ @Override - public ObfuscationData getObfMethod(MemberInfo method) { - ObfuscationData data = new ObfuscationData(); + public ObfuscationData getObfMethod(MemberInfo method) { + ObfuscationData data = new ObfuscationData(); for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = targetEnv.getObfMethod(method); + SrgMethod obfMethod = targetEnv.getObfMethod(method); if (obfMethod != null) { data.add(targetEnv.getType(), obfMethod); } @@ -223,15 +223,15 @@ public class ObfuscationManager implements IObfuscationManager { } /* (non-Javadoc) - * @see org.spongepowered.tools.obfuscation.IObfuscationManager - * #getObfMethod(net.minecraftforge.srg2source.rangeapplier.MethodData) + * @see org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager + * #getObfMethod(org.spongepowered.asm.obfuscation.SrgMethod) */ @Override - public ObfuscationData getObfMethod(MethodData method) { - ObfuscationData data = new ObfuscationData(); + public ObfuscationData getObfMethod(SrgMethod method) { + ObfuscationData data = new ObfuscationData(); for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = targetEnv.getObfMethod(method); + SrgMethod obfMethod = targetEnv.getObfMethod(method); if (obfMethod != null) { data.add(targetEnv.getType(), obfMethod); } @@ -251,11 +251,11 @@ public class ObfuscationManager implements IObfuscationManager { * @param method Method to remap * @return data */ - public ObfuscationData remapDescriptor(ObfuscationData data, MemberInfo method) { + public ObfuscationData remapDescriptor(ObfuscationData data, MemberInfo method) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { MemberInfo obfMethod = targetEnv.remapDescriptor(method); if (obfMethod != null) { - data.add(targetEnv.getType(), obfMethod.asMethodData()); + data.add(targetEnv.getType(), obfMethod.asSrgMethod()); } } @@ -323,9 +323,9 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.tools.obfuscation.ObfuscationData) */ @Override - public void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { + public void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + SrgMethod obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { MemberInfo remappedReference = new MemberInfo(obfMethod); targetEnv.addMapping(className, reference, remappedReference.toString()); @@ -340,9 +340,9 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.tools.obfuscation.ObfuscationData) */ @Override - public void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData) { + public void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + SrgMethod obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { MemberInfo remappedReference = context.remapUsing(obfMethod, true); targetEnv.addMapping(className, reference, remappedReference.toString()); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 2dc73352..7434e65e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -43,7 +43,7 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.obfuscation.SrgContainer; import org.spongepowered.asm.util.ObfuscationUtil; import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper; @@ -170,8 +170,8 @@ class TargetObfuscationEnvironment { /** * Get an obfuscation mapping for a method */ - public MethodData getObfMethod(MemberInfo method) { - MethodData obfd = this.getObfMethod(method.asMethodData()); + public SrgMethod getObfMethod(MemberInfo method) { + SrgMethod obfd = this.getObfMethod(method.asSrgMethod()); if (obfd != null || !method.isFullyQualified()) { return obfd; } @@ -196,7 +196,7 @@ class TargetObfuscationEnvironment { /** * Get an obfuscation mapping for a method */ - public MethodData getObfMethod(MethodData method) { + public SrgMethod getObfMethod(SrgMethod method) { if (this.initSrgs()) { return this.srgs.getMethodMapping(method); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java index ee154a5b..22441445 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java @@ -26,7 +26,7 @@ package org.spongepowered.tools.obfuscation.interfaces; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.obfuscation.ObfuscationData; import org.spongepowered.tools.obfuscation.TypeHandle; @@ -70,17 +70,17 @@ public interface IObfuscationManager { * @return ObfuscationData with remapped owner class corresponding to the * original owner class */ - public abstract ObfuscationData getObfMethodRecursive(MemberInfo method); + public abstract ObfuscationData getObfMethodRecursive(MemberInfo method); /** * Get an obfuscation mapping for a method */ - public abstract ObfuscationData getObfMethod(MemberInfo method); + public abstract ObfuscationData getObfMethod(MemberInfo method); /** * Get an obfuscation mapping for a method */ - public abstract ObfuscationData getObfMethod(MethodData method); + public abstract ObfuscationData getObfMethod(SrgMethod method); /** * Attempts to resolve an obfuscated field by recursively enumerating @@ -116,7 +116,7 @@ public interface IObfuscationManager { * @param reference Original reference, as it appears in the annotation * @param obfMethodData Method data to add for this mapping */ - public abstract void addMethodMapping(String className, String reference, ObfuscationData obfMethodData); + public abstract void addMethodMapping(String className, String reference, ObfuscationData obfMethodData); /** * Adds a method mapping to the internal refmap, generates refmap entries @@ -128,7 +128,7 @@ public interface IObfuscationManager { * supplied obfuscation data * @param obfMethodData Method data to add for this mapping */ - public abstract void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData); + public abstract void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData); /** * Adds a field mapping to the internal refmap, generates refmap entries diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index e6be12c9..11ed80bc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -29,7 +29,7 @@ import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.SignaturePrinter; /** @@ -163,26 +163,26 @@ public class MemberInfo { } /** - * Initialise a MemberInfo using the supplied MethodData object + * Initialise a MemberInfo using the supplied SrgMethod object * - * @param methodData MethodData object to copy values from + * @param srgMethod SrgMethod object to copy values from */ - public MemberInfo(MethodData methodData) { - this.owner = methodData.getOwner(); - this.name = methodData.getSimpleName(); - this.desc = methodData.getDesc(); + public MemberInfo(SrgMethod srgMethod) { + this.owner = srgMethod.getOwner(); + this.name = srgMethod.getSimpleName(); + this.desc = srgMethod.getDesc(); this.matchAll = false; } /** - * Initialise a remapped MemberInfo using the supplied MethodData object + * Initialise a remapped MemberInfo using the supplied SrgMethod object * - * @param methodData MethodData object to copy values from + * @param srgMethod SrgMethod object to copy values from */ - private MemberInfo(MemberInfo remapped, MethodData methodData, boolean setOwner) { - this.owner = setOwner ? methodData.getOwner() : remapped.owner; - this.name = methodData.getSimpleName(); - this.desc = methodData.getDesc(); + private MemberInfo(MemberInfo remapped, SrgMethod srgMethod, boolean setOwner) { + this.owner = setOwner ? srgMethod.getOwner() : remapped.owner; + this.name = srgMethod.getSimpleName(); + this.desc = srgMethod.getDesc(); this.matchAll = remapped.matchAll; } @@ -237,16 +237,16 @@ public class MemberInfo { return new SignaturePrinter(this).setFullyQualified(true).toDescriptor(); } - public MethodData asMethodData() { + public SrgMethod asSrgMethod() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqualified reference to MethodData"); + throw new RuntimeException("Cannot convert unqualified reference to SrgMethod"); } if (this.isField()) { - throw new RuntimeException("Cannot convert a non-method reference to MethodData"); + throw new RuntimeException("Cannot convert a non-method reference to SrgMethod"); } - return new MethodData(this.owner + "/" + this.name, this.desc); + return new SrgMethod(this.owner + "/" + this.name, this.desc); } /** @@ -410,12 +410,12 @@ public class MemberInfo { /** * Create a remapped version of this member using the supplied method data * - * @param methodData Method data to use + * @param srgMethod SRG method data to use * @param setOwner True to set the owner as well as the name * @return New MethodInfo with remapped values */ - public MemberInfo remapUsing(MethodData methodData, boolean setOwner) { - return new MemberInfo(this, methodData, setOwner); + public MemberInfo remapUsing(SrgMethod srgMethod, boolean setOwner) { + return new MemberInfo(this, srgMethod, setOwner); } /** @@ -517,7 +517,7 @@ public class MemberInfo { return new MemberInfo(name, owner, desc, false); } - public static MemberInfo fromSrgMethod(MethodData methodData) { - return new MemberInfo(methodData); + public static MemberInfo fromSrgMethod(SrgMethod srgMethod) { + return new MemberInfo(srgMethod); } } diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java index 4611cce2..24dd72c2 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java @@ -44,7 +44,7 @@ public class SrgContainer { private final BiMap classMap = HashBiMap.create(); private final BiMap fieldMap = HashBiMap.create(); private final BiMap packageMap = HashBiMap.create(); - private final BiMap methodMap = HashBiMap.create(); + private final BiMap methodMap = HashBiMap.create(); public void readSrg(File srg) throws IOException { for (String line : Files.readLines(srg, Charset.defaultCharset())) { @@ -62,14 +62,14 @@ public class SrgContainer { } else if (type.equals("FD")) { this.fieldMap.forcePut(args[0], args[1]); } else if (type.equals("MD")) { - this.methodMap.forcePut(new MethodData(args[0], args[1]), new MethodData(args[2], args[3])); + this.methodMap.forcePut(new SrgMethod(args[0], args[1]), new SrgMethod(args[2], args[3])); } else { throw new RuntimeException("Invalid SRG file: " + srg); } } } - public MethodData getMethodMapping(MethodData methodName) { + public SrgMethod getMethodMapping(SrgMethod methodName) { return this.methodMap.get(methodName); } diff --git a/src/main/java/org/spongepowered/asm/obfuscation/MethodData.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java similarity index 89% rename from src/main/java/org/spongepowered/asm/obfuscation/MethodData.java rename to src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java index c9e13519..d57f28a6 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/MethodData.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java @@ -26,14 +26,14 @@ package org.spongepowered.asm.obfuscation; import com.google.common.base.Objects; -public final class MethodData { +public final class SrgMethod { private final String name; private final String desc; - public MethodData(String name, String sig) { + public SrgMethod(String name, String desc) { this.name = name; - this.desc = sig; + this.desc = desc; } public String getName() { @@ -70,8 +70,8 @@ public final class MethodData { if (this == obj) { return true; } - if (obj instanceof MethodData) { - return Objects.equal(this.name, ((MethodData)obj).name) && Objects.equal(this.desc, ((MethodData)obj).desc); + if (obj instanceof SrgMethod) { + return Objects.equal(this.name, ((SrgMethod)obj).name) && Objects.equal(this.desc, ((SrgMethod)obj).desc); } return false; } From d8e07fcb27cfbd70dc505878a16f6222a725033f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 26 Jan 2016 14:10:38 +0000 Subject: [PATCH 096/169] Add all supported options to SupportedOptions array, fixes #98 --- .../org/spongepowered/tools/obfuscation/SupportedOptions.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index f87d2e66..e8f2ceef 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -45,8 +45,11 @@ public final class SupportedOptions { public static final String DEFAULT_OBFUSCATION_ENV = "defaultObfuscationEnv"; public static final Set all = ImmutableSet.of( + SupportedOptions.TOKENS, SupportedOptions.REOBF_SRG_FILE, + SupportedOptions.REOBF_EXTRA_SRG_FILES, SupportedOptions.REOBF_NOTCH_FILE, + SupportedOptions.REOBF_EXTRA_NOTCH_FILES, SupportedOptions.OUT_SRG_SRG_FILE, SupportedOptions.OUT_NOTCH_SRG_FILE, SupportedOptions.OUT_REFMAP_FILE, From 54fa0f4e768a7d282a1d9eb59d8c06d7c6c44d16 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 26 Jan 2016 17:29:48 +0000 Subject: [PATCH 097/169] Temp fix for downstream SRGs not remapping members, fixes #99 --- .../tools/obfuscation/ObfuscationManager.java | 5 +- .../TargetObfuscationEnvironment.java | 27 +++++- .../asm/obfuscation/SrgContainer.java | 8 +- .../asm/obfuscation/SrgField.java | 86 +++++++++++++++++++ .../asm/obfuscation/SrgMethod.java | 8 ++ 5 files changed, 125 insertions(+), 9 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/obfuscation/SrgField.java diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index 27962169..19f1f9df 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -37,6 +37,7 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.obfuscation.SrgField; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -281,9 +282,9 @@ public class ObfuscationManager implements IObfuscationManager { ObfuscationData data = new ObfuscationData(); for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - String obfField = targetEnv.getObfField(field); + SrgField obfField = targetEnv.getObfField(field); if (obfField != null) { - data.add(targetEnv.getType(), obfField); + data.add(targetEnv.getType(), obfField.toString()); } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 7434e65e..b17d566f 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -45,6 +45,7 @@ import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.obfuscation.SrgContainer; +import org.spongepowered.asm.obfuscation.SrgField; import org.spongepowered.asm.util.ObfuscationUtil; import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -198,7 +199,17 @@ class TargetObfuscationEnvironment { */ public SrgMethod getObfMethod(SrgMethod method) { if (this.initSrgs()) { - return this.srgs.getMethodMapping(method); + SrgMethod originalMethod = method.copy(); + SrgMethod methodMapping = this.srgs.getMethodMapping(method); + // If no obf mapping, we can attempt to remap the owner class + if (methodMapping == null) { + methodMapping = originalMethod; + } + String remappedOwner = this.getObfClass(methodMapping.getOwner()); + if (remappedOwner == null || remappedOwner.equals(method.getOwner()) || remappedOwner.equals(methodMapping.getOwner())) { + return methodMapping != originalMethod ? methodMapping : null; + } + return methodMapping.move(remappedOwner); } return null; } @@ -236,9 +247,19 @@ class TargetObfuscationEnvironment { /** * Get an obfuscation mapping for a field */ - public String getObfField(String field) { + public SrgField getObfField(String field) { if (this.initSrgs()) { - return this.srgs.getFieldMapping(field); + SrgField originalField = new SrgField(field); + SrgField fieldMapping = this.srgs.getFieldMapping(originalField); + // If no obf mapping, we can attempt to remap the owner class + if (fieldMapping == null) { + fieldMapping = originalField; + } + String remappedOwner = this.getObfClass(fieldMapping.getOwner()); + if (remappedOwner == null || remappedOwner.equals(originalField.getOwner()) || remappedOwner.equals(fieldMapping.getOwner())) { + return fieldMapping != originalField ? fieldMapping : null; + } + return fieldMapping.move(remappedOwner); } return null; } diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java index 24dd72c2..c2a9289f 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java @@ -41,9 +41,9 @@ import joptsimple.internal.Strings; */ public class SrgContainer { - private final BiMap classMap = HashBiMap.create(); - private final BiMap fieldMap = HashBiMap.create(); private final BiMap packageMap = HashBiMap.create(); + private final BiMap classMap = HashBiMap.create(); + private final BiMap fieldMap = HashBiMap.create(); private final BiMap methodMap = HashBiMap.create(); public void readSrg(File srg) throws IOException { @@ -60,7 +60,7 @@ public class SrgContainer { } else if (type.equals("CL")) { this.classMap.forcePut(args[0], args[1]); } else if (type.equals("FD")) { - this.fieldMap.forcePut(args[0], args[1]); + this.fieldMap.forcePut(new SrgField(args[0]), new SrgField(args[1])); } else if (type.equals("MD")) { this.methodMap.forcePut(new SrgMethod(args[0], args[1]), new SrgMethod(args[2], args[3])); } else { @@ -73,7 +73,7 @@ public class SrgContainer { return this.methodMap.get(methodName); } - public String getFieldMapping(String fieldName) { + public SrgField getFieldMapping(SrgField fieldName) { return this.fieldMap.get(fieldName); } diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgField.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgField.java new file mode 100644 index 00000000..77b747d9 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgField.java @@ -0,0 +1,86 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.obfuscation; + +import com.google.common.base.Objects; + +public final class SrgField { + + private final String mapping; + + public SrgField(String mapping) { + this.mapping = mapping; + } + + public String getName() { + if (this.mapping == null) { + return null; + } + int pos = this.mapping.lastIndexOf('/'); + return pos > -1 ? this.mapping.substring(pos + 1) : this.mapping; + } + + public String getOwner() { + if (this.mapping == null) { + return null; + } + int pos = this.mapping.lastIndexOf('/'); + return pos > -1 ? this.mapping.substring(0, pos) : null; + } + + public String getMapping() { + return this.mapping; + } + + public SrgField move(String newOwner) { + return new SrgField((newOwner != null ? newOwner + "/" : "") + this.getName()); + } + + public SrgField copy() { + return new SrgField(this.mapping); + } + + @Override + public int hashCode() { + return Objects.hashCode(this.mapping); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof SrgField) { + return Objects.equal(this.mapping, ((SrgField)obj).mapping); + } + return false; + } + + @Override + public String toString() { + return this.mapping; + } + +} \ No newline at end of file diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java index d57f28a6..d1b9c91f 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java @@ -60,6 +60,14 @@ public final class SrgMethod { return this.desc; } + public SrgMethod move(String newOwner) { + return new SrgMethod((newOwner != null ? newOwner + "/" : "") + this.getSimpleName(), this.desc); + } + + public SrgMethod copy() { + return new SrgMethod(this.name, this.desc); + } + @Override public int hashCode() { return Objects.hashCode(this.name, this.desc); From 93dca4fc57b5786e915ddf15e88b109a72a63ab1 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 27 Jan 2016 13:32:14 +0000 Subject: [PATCH 098/169] Fix refmap generation for #97 and #99 --- .../TargetObfuscationEnvironment.java | 31 +++++++++++++++++-- .../asm/obfuscation/SrgMethod.java | 11 ++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index b17d566f..f916003e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -198,18 +198,33 @@ class TargetObfuscationEnvironment { * Get an obfuscation mapping for a method */ public SrgMethod getObfMethod(SrgMethod method) { + return this.getObfMethod(method, true); + } + + /** + * Get an obfuscation mapping for a method + */ + public SrgMethod getObfMethod(SrgMethod method, boolean srgOnly) { if (this.initSrgs()) { + boolean remapped = true; SrgMethod originalMethod = method.copy(); SrgMethod methodMapping = this.srgs.getMethodMapping(method); // If no obf mapping, we can attempt to remap the owner class if (methodMapping == null) { + if (srgOnly) { + return null; + } methodMapping = originalMethod; + remapped = false; } String remappedOwner = this.getObfClass(methodMapping.getOwner()); if (remappedOwner == null || remappedOwner.equals(method.getOwner()) || remappedOwner.equals(methodMapping.getOwner())) { - return methodMapping != originalMethod ? methodMapping : null; + return remapped ? methodMapping : null; } - return methodMapping.move(remappedOwner); + if (remapped) { + return methodMapping.move(remappedOwner); + } + return new SrgMethod(remappedOwner, methodMapping.getSimpleName(), ObfuscationUtil.mapDescriptor(methodMapping.getDesc(), this.remapper)); } return null; } @@ -243,16 +258,26 @@ class TargetObfuscationEnvironment { return transformed ? new MemberInfo(method.name, owner, desc, method.matchAll) : null; } - + /** * Get an obfuscation mapping for a field */ public SrgField getObfField(String field) { + return this.getObfField(field, true); + } + + /** + * Get an obfuscation mapping for a field + */ + public SrgField getObfField(String field, boolean srgOnly) { if (this.initSrgs()) { SrgField originalField = new SrgField(field); SrgField fieldMapping = this.srgs.getFieldMapping(originalField); // If no obf mapping, we can attempt to remap the owner class if (fieldMapping == null) { + if (srgOnly) { + return null; + } fieldMapping = originalField; } String remappedOwner = this.getObfClass(fieldMapping.getOwner()); diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java index d1b9c91f..f214129e 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java @@ -36,6 +36,11 @@ public final class SrgMethod { this.desc = desc; } + public SrgMethod(String owner, String simpleName, String desc) { + this.name = SrgMethod.createName(owner, simpleName); + this.desc = desc; + } + public String getName() { return this.name; } @@ -61,7 +66,7 @@ public final class SrgMethod { } public SrgMethod move(String newOwner) { - return new SrgMethod((newOwner != null ? newOwner + "/" : "") + this.getSimpleName(), this.desc); + return new SrgMethod(newOwner, this.getSimpleName(), this.desc); } public SrgMethod copy() { @@ -89,4 +94,8 @@ public final class SrgMethod { return String.format("%s %s", this.name, this.desc); } + private static String createName(String owner, String simpleName) { + return (owner != null ? owner + "/" : "") + simpleName; + } + } From 529c8ad202dc466227a06f3f3c70dacc1a627d79 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 27 Jan 2016 14:56:53 +0000 Subject: [PATCH 099/169] Allow demoting warnings for decorated Final fields using Mutable, re #99 --- .../org/spongepowered/asm/mixin/Mutable.java | 40 +++++++++++++++++++ .../asm/mixin/transformer/ClassInfo.java | 13 +++++- .../mixin/transformer/MixinPreProcessor.java | 6 ++- .../mixin/transformer/MixinTargetContext.java | 21 ++++++---- 4 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/Mutable.java diff --git a/src/main/java/org/spongepowered/asm/mixin/Mutable.java b/src/main/java/org/spongepowered/asm/mixin/Mutable.java new file mode 100644 index 00000000..0852426c --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/Mutable.java @@ -0,0 +1,40 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Use in conjunction with {@link Final} to indicate that whilst a field is + * final in the target class, mutation within the mixin is intentional. + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Mutable { + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 05b1f95b..fd25c807 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -45,6 +45,7 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.transformer.ClassInfo.Member.Type; import com.google.common.collect.ImmutableList; @@ -197,6 +198,11 @@ public class ClassInfo extends TreeInfo { */ private boolean decoratedFinal; + /** + * True if this member is decorated with {@link Mutable} + */ + private boolean decoratedMutable; + protected Member(Member member) { this(member.type, member.memberName, member.memberDesc, member.modifiers, member.isInjected); this.currentName = member.currentName; @@ -254,9 +260,14 @@ public class ClassInfo extends TreeInfo { public boolean isDecoratedFinal() { return this.decoratedFinal; } + + public boolean isDecoratedMutable() { + return this.decoratedMutable; + } - public void setDecoratedFinal(boolean decoratedFinal) { + public void setDecoratedFinal(boolean decoratedFinal, boolean decoratedMutable) { this.decoratedFinal = decoratedFinal; + this.decoratedMutable = decoratedMutable; } public boolean matchesFlags(int flags) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index ae0dc6ea..d3605845 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -42,10 +42,11 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.RemapperChain; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; @@ -245,6 +246,7 @@ class MixinPreProcessor { FieldNode mixinField = iter.next(); AnnotationNode shadow = ASMHelper.getVisibleAnnotation(mixinField, Shadow.class); boolean isFinal = ASMHelper.getVisibleAnnotation(mixinField, Final.class) != null; + boolean isMutable = ASMHelper.getVisibleAnnotation(mixinField, Mutable.class) != null; if (!this.validateField(context, mixinField, shadow)) { iter.remove(); continue; @@ -288,7 +290,7 @@ class MixinPreProcessor { if (field == null) { throw new InvalidMixinException(this.mixin, "Unable to locate field surrogate: " + mixinField.name + " in " + this.mixin); } - field.setDecoratedFinal(isFinal); + field.setDecoratedFinal(isFinal, isMutable); if (this.verboseLogging && MixinApplicator.hasFlag(target, Opcodes.ACC_FINAL) != isFinal) { String message = isFinal diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 4b12d9db..2ccd9ca7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -394,15 +394,22 @@ public class MixinTargetContext implements IReferenceMapperContext { } for (Entry shadow : this.shadowFields.entrySet()) { - FieldNode shadowField = shadow.getKey(); - if (!shadowField.desc.equals(fieldNode.desc) || !shadowField.name.equals(fieldNode.name)) { + FieldNode shadowFieldNode = shadow.getKey(); + if (!shadowFieldNode.desc.equals(fieldNode.desc) || !shadowFieldNode.name.equals(fieldNode.name)) { continue; } - if (shadow.getValue().isDecoratedFinal()) { - MixinTargetContext.logger.error("Write access detected to @Final field {} in {}::{}", shadow.getValue(), this.mixin, method.name); - if (this.mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERIFY)) { - throw new InvalidMixinException(this.mixin, "Write access detected to @Final field " + shadow.getValue() + " in " + this.mixin - + "::" + method.name); + Field shadowField = shadow.getValue(); + if (shadowField.isDecoratedFinal()) { + if (shadowField.isDecoratedMutable()) { + if (this.mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERBOSE)) { + MixinTargetContext.logger.warn("Write access to @Mutable @Final field {} in {}::{}", shadowField, this.mixin, method.name); + } + } else { + MixinTargetContext.logger.error("Write access detected to @Final field {} in {}::{}", shadowField, this.mixin, method.name); + if (this.mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERIFY)) { + throw new InvalidMixinException(this.mixin, "Write access detected to @Final field " + shadowField + " in " + this.mixin + + "::" + method.name); + } } } return; From 6ad5bc8f76e06a1a3bbd9bbcf1662582d7f98642 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 28 Jan 2016 16:07:56 +0000 Subject: [PATCH 100/169] Allow initial compatibility level to be defined via system property --- .../asm/mixin/MixinEnvironment.java | 19 ++++++++++-- .../asm/mixin/transformer/MixinConfig.java | 4 +++ .../asm/mixin/transformer/MixinInfo.java | 31 ++++++++++++++++--- 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 61686407..05a14686 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -336,7 +336,12 @@ public class MixinEnvironment implements ITokenProvider { /** * Disable refmap when required */ - DISABLE_REFMAP(Option.ENVIRONMENT, "disableRefMap"); + DISABLE_REFMAP(Option.ENVIRONMENT, "disableRefMap"), + + /** + * Default compatibility level to operate at + */ + DEFAULT_COMPATIBILITY_LEVEL(Option.ENVIRONMENT, "compatLevel"); /** * Prefix for mixin options @@ -408,6 +413,16 @@ public class MixinEnvironment implements ITokenProvider { String getStringValue() { return (this.parent == null || this.parent.getBooleanValue()) ? System.getProperty(this.property) : null; } + + @SuppressWarnings("unchecked") + > E getEnumValue(E defaultValue) { + String value = System.getProperty(this.property, defaultValue.name()); + try { + return (E) Enum.valueOf(defaultValue.getClass(), value); + } catch (IllegalArgumentException ex) { + return defaultValue; + } + } } /** @@ -583,7 +598,7 @@ public class MixinEnvironment implements ITokenProvider { /** * Current compatibility level */ - private static CompatibilityLevel compatibility = CompatibilityLevel.JAVA_6; + private static CompatibilityLevel compatibility = Option.DEFAULT_COMPATIBILITY_LEVEL.getEnumValue(CompatibilityLevel.JAVA_6); /** * Show debug header info on first environment construction diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 9a32bfe0..2fd7d029 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -338,6 +338,10 @@ class MixinConfig implements Comparable, IMixinConfig { for (String innerClass : mixin.getSyntheticInnerClasses()) { this.syntheticInnerClasses.add(innerClass.replace('/', '.')); } + } catch (InvalidMixinException ex) { + this.logger.error(ex.getMixin() + ": " + ex.getMessage(), ex); + this.removeMixin(mixin); + iter.remove(); } catch (Exception ex) { this.logger.error(ex.getMessage(), ex); this.removeMixin(mixin); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 1737e0da..6fc868b1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -46,6 +46,7 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; @@ -437,19 +438,39 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param state State to validate */ private void validateMixin(ValidationState state) { + this.validateType(); + this.validateInner(state); + this.validateClassVersion(state); + this.validateRemappables(state); + } + + private void validateType() { if (this.isInterfaceMixin && !MixinEnvironment.getCompatibilityLevel().supportsMethodsInInterfaces()) { throw new InvalidMixinException(this, "Interface mixin not supported in current enviromnment"); } - + } + + private void validateInner(ValidationState state) { // isInner (shouldn't) return true for static inner classes if (!state.classInfo.isProbablyStatic()) { throw new InvalidMixinException(this, "Inner class mixin must be declared static"); } - - if (state.classNode.version > MixinEnvironment.getCompatibilityLevel().classVersion()) { - throw new InvalidMixinException(this, "Unsupported mixin class version " + state.classNode.version); - } + } + private void validateClassVersion(ValidationState state) { + if (state.classNode.version > MixinEnvironment.getCompatibilityLevel().classVersion()) { + String helpText = "."; + for (CompatibilityLevel level : CompatibilityLevel.values()) { + if (level.classVersion() >= state.classNode.version) { + helpText = String.format(". Mixin requires compatibility level %s or above.", level.name()); + } + } + + throw new InvalidMixinException(this, "Unsupported mixin class version " + state.classNode.version + helpText); + } + } + + private void validateRemappables(ValidationState state) { // Can't have remappable fields or methods on a multi-target mixin, because after obfuscation the fields will remap to conflicting names if (this.targetClasses.size() > 1) { for (FieldNode field : state.classNode.fields) { From cd215795d2ca0b16f6fb22bb6d78bee378e7e59d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 1 Feb 2016 15:46:05 +0000 Subject: [PATCH 101/169] Support for modifying local variables in methods --- gradle.properties | 2 +- .../InjectionObfuscationProcessor.java | 2 + .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/injection/Inject.java | 5 +- .../asm/mixin/injection/ModifyArg.java | 5 +- .../asm/mixin/injection/ModifyVariable.java | 187 ++++++++++ .../asm/mixin/injection/Redirect.java | 5 +- .../injection/callback/CallbackInjector.java | 2 + .../asm/mixin/injection/code/Injector.java | 18 +- .../injection/invoke/InvokeInjector.java | 14 +- .../modify/ModifyVariableInjector.java | 331 ++++++++++++++++++ .../struct/CallbackInjectionInfo.java | 1 + .../mixin/injection/struct/InjectionInfo.java | 19 +- .../struct/ModifyArgInjectionInfo.java | 6 + .../struct/ModifyVariableInjectionInfo.java | 65 ++++ .../struct/RedirectInjectionInfo.java | 6 + 16 files changed, 643 insertions(+), 27 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java diff --git a/gradle.properties b/gradle.properties index d26d42e9..08b5a94a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.17 +buildVersion=0.4.18 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java index 2dbd81ac..99861657 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java @@ -39,6 +39,7 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.tools.MirrorUtils; @@ -69,6 +70,7 @@ public class InjectionObfuscationProcessor extends MixinProcessor { this.processInjectors(roundEnv, Inject.class); this.processInjectors(roundEnv, ModifyArg.class); this.processInjectors(roundEnv, Redirect.class); + this.processInjectors(roundEnv, ModifyVariable.class); this.postProcess(roundEnv); return true; diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index acad8e63..4938f14a 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.17"; + public static final String VERSION = "0.4.18"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java index f9096e7e..5f065f74 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java @@ -147,9 +147,10 @@ public @interface Inject { * specified is not achieved then an {@link InjectionError} is thrown at * application time. Use this option with care.

* - * @return Minimum required number of injected callbacks, default 0 + * @return Minimum required number of injected callbacks, default specified + * by the containing config */ - public int require() default 0; + public int require() default -1; /** * Like {@link #require()} but only enabled if the diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java index a18e8e3f..d034db09 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java @@ -106,9 +106,10 @@ public @interface ModifyArg { * specified is not achieved then an {@link InjectionError} is thrown at * application time. Use this option with care.

* - * @return Minimum required number of injected callbacks, default 0 + * @return Minimum required number of injected callbacks, default specified + * by the containing config */ - public int require() default 0; + public int require() default -1; /** * Like {@link #require()} but only enabled if the diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java new file mode 100644 index 00000000..ce4e2290 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java @@ -0,0 +1,187 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.spongepowered.asm.mixin.MixinEnvironment.Option; + +/** + * Specifies that this mixin method should inject a variable modifier callback + * to itself in the target method(s) identified by {@link #method}. + * + *

ModifyVariable callbacks should always take one argument of the + * type to capture and return the same type. For example a ModifyVariable + * for a local of type {@link String} should have the signature:

+ * + * private String methodName(String variable) { ... + * + *

The callback receives the current value of the local variable, and should + * return the new value.

+ * + *

The injector has two operating modes, explicit and implicit + * , and can operate either on the entire LVT or on the method arguments + * only

. + * + *

In explicit mode, the variable to capture can be specified by + * specifying values for the discriminator arguments {@link ordinal}, + * {@link index} and {@link name}. The injector uses the discriminators in order + * to attempt to locate the variable to capture. If no local variable matches + * any discriminators, the capture fails.

+ * + *

If no values for the capture discrimiators are specified, the injector + * operates in implicit mode. If exactly one variable of the capture + * type exists in the target LVT, then capture will succeed. However, if more + * than one variable of the required type is encountered in the LVT then an + * {@link InvalidInjectionException} is thrown.

+ */ +@Target({ ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ModifyVariable { + + /** + * String representation of a + * {@link org.spongepowered.asm.mixin.injection.struct.MemberInfo + * MemberInfo} which identifies the target method. + * + * @return target method + */ + public String method(); + + /** + * An {@link At} annotation which describes the {@link InjectionPoint} in + * the target method. The specified {@link InjectionPoint} must only + * return {@link org.spongepowered.asm.lib.tree.MethodInsnNode} instances + * and an exception will be thrown if this is not the case. + * + * @return {@link At} which identifies the target method invocation + */ + public At at(); + + /** + * When creating a {@link ModifyVariable} callback, you may wish to first + * inspect the local variable table in the target method at the injection + * point. Set this value to true to print the local variable table + * and perform no injection. + * + * @return true to print the LVT to the console + */ + public boolean print() default false; + + /** + * Gets the local variable ordinal by type. For example, if there are 3 + * {@link String} arguments in the local variable table, ordinal 0 specifies + * the first, 1 specifies the second, etc. Use ordinal when the + * index within the LVT is known. Takes precedence over {@link index}. + * + * @return variable ordinal + */ + public int ordinal() default -1; + + /** + * Gets the absolute index of the local variable within the local variable + * table to capture. The local variable at the specified index must be of + * the same type as the capture. Takes precedence over {@link name}. + * + * @return argument index to modify or -1 for automatic + */ + public int index() default -1; + + /** + * Gets the name of the variable to capture. Only used if the variable + * cannot be located via {@link ordinal} or {@link index}. + * + * @return possible names to capture, only useful when the LVT in the target + * method is known to be complete. + */ + public String[] name() default {}; + + /** + * Under normal circumstances the injector will consider all local variables + * including method arguments and all other local variables. This involves + * reading (and possibly generating) the local variable table for the method + * which can have mixed results. Set this value to true to only + * consider method arguments. + * + * @return true if this injector should only consider method arguments and + * not all locals. + */ + public boolean argsOnly() default false; + + /** + * By default, the annotation processor will attempt to locate an + * obfuscation mapping for all {@link ModifyVariable} methods since it is + * anticipated that in general the target of a {@link ModifyVariable} + * annotation will be an obfuscated method in the target class. However + * since it is possible to also apply mixins to non-obfuscated targets (or + * non- obfuscated methods in obfuscated targets, such as methods added by + * Forge) it may be necessary to suppress the compiler error which would + * otherwise be generated. Setting this value to false will cause + * the annotation processor to skip this annotation when attempting to build + * the obfuscation table for the mixin. + * + * @return True to instruct the annotation processor to search for + * obfuscation mappings for this annotation + */ + public boolean remap() default true; + + /** + * In general, injectors are intended to "fail soft" in that a failure to + * locate the injection point in the target method is not considered an + * error condition. Another transformer may have changed the method + * structure or any number of reasons may cause an injection to fail. This + * also makes it possible to define several injections to achieve the same + * task given expected mutation of the target class and the + * injectors which fail are simply ignored. + * + *

However, this behaviour is not always desirable. For example, if your + * application depends on a particular injection succeeding you may wish to + * detect the injection failure as an error condition. This argument is thus + * provided to allow you to stipulate a minimum number of successful + * injections for this callback handler. If the number of injections + * specified is not achieved then an {@link InjectionError} is thrown at + * application time. Use this option with care.

+ * + * @return Minimum required number of injected callbacks, default specified + * by the containing config + */ + public int require() default -1; + + /** + * Like {@link #require()} but only enabled if the + * {@link Option#DEBUG_INJECTORS mixin.debug.countInjections} option is set + * to true and defaults to 1. Use this option during debugging to + * perform simple checking of your injectors. Causes the injector to throw + * a {@link InvalidInjectionException} if the expected number of injections + * is not realised. + * + * @return Minimum number of expected callbacks, default 1 + */ + public int expect() default 1; + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java index 1fc1ac95..4e62a3ff 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java @@ -128,9 +128,10 @@ public @interface Redirect { * specified is not achieved then an {@link InjectionError} is thrown at * application time. Use this option with care.

* - * @return Minimum required number of injected callbacks, default 0 + * @return Minimum required number of injected callbacks, default specified + * by the containing config */ - public int require() default 0; + public int require() default -1; /** * Like {@link #require()} but only enabled if the 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 75b927b8..874a60de 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 @@ -310,6 +310,8 @@ public class CallbackInjector extends Injector { */ @Override protected void sanityCheck(Target target, List injectionPoints) { + super.sanityCheck(target, injectionPoints); + if (ASMHelper.methodIsStatic(target.method) != this.isStatic) { throw new InvalidInjectionException(this.info, "'static' modifier of callback method does not match target in " + this.methodNode.name); } 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 9ddfd250..fafe0188 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 @@ -65,6 +65,16 @@ public abstract class Injector { * Callback method */ protected final MethodNode methodNode; + + /** + * Arguments of the handler method + */ + protected final Type[] methodArgs; + + /** + * Return type of the handler method + */ + protected final Type returnType; /** * True if the callback method is static @@ -90,6 +100,8 @@ public abstract class Injector { private Injector(ClassNode classNode, MethodNode methodNode) { this.classNode = classNode; this.methodNode = methodNode; + this.methodArgs = Type.getArgumentTypes(this.methodNode.desc); + this.returnType = Type.getReturnType(this.methodNode.desc); this.isStatic = ASMHelper.methodIsStatic(this.methodNode); } @@ -126,7 +138,7 @@ public abstract class Injector { for (InjectionPoint injectionPoint : injectionPoints) { nodes.clear(); - if (injectionPoint.find(into.desc, insns, nodes)) { + if (this.findTargetNodes(into, injectionPoint, insns, nodes)) { targetNodes.addAll(nodes); } } @@ -135,6 +147,10 @@ public abstract class Injector { return targetNodes; } + protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, ReadOnlyInsnList insns, Collection nodes) { + return injectionPoint.find(into.desc, insns, nodes); + } + protected void sanityCheck(Target target, List injectionPoints) { // stub for subclasses } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index 7dc20ba6..967bd2d6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -43,16 +43,6 @@ import org.spongepowered.asm.mixin.injection.struct.Target; */ public abstract class InvokeInjector extends Injector { - /** - * Arguments of the handler method - */ - protected final Type[] methodArgs; - - /** - * Return type of the handler method - */ - protected final Type returnType; - protected final String annotationType; /** @@ -61,8 +51,6 @@ public abstract class InvokeInjector extends Injector { */ public InvokeInjector(InjectionInfo info, String annotationType) { super(info); - this.methodArgs = Type.getArgumentTypes(this.methodNode.desc); - this.returnType = Type.getReturnType(this.methodNode.desc); this.annotationType = annotationType; } @@ -73,6 +61,8 @@ public abstract class InvokeInjector extends Injector { */ @Override protected void sanityCheck(Target target, List injectionPoints) { + super.sanityCheck(target, injectionPoints); + if (target.isStatic != this.isStatic) { throw new InvalidInjectionException(this.info, "'static' modifier of callback method does not match target in " + this.methodNode.name); } 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 new file mode 100644 index 00000000..aef5beb4 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/ModifyVariableInjector.java @@ -0,0 +1,331 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.modify; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.LocalVariableNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.mixin.injection.InjectionPoint; +import org.spongepowered.asm.mixin.injection.InvalidInjectionException; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.modify.ModifyVariableInjector.Context.Local; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.util.ASMHelper; +import org.spongepowered.asm.util.Locals; +import org.spongepowered.asm.util.PrettyPrinter; +import org.spongepowered.asm.util.SignaturePrinter; + +/** + * A bytecode injector which allows a single argument of a chosen method call to + * be altered. + */ +public class ModifyVariableInjector extends Injector { + + class Context extends InsnList { + + class Local { + + int ord = 0; + String name; + Type type; + + public Local(String name, Type type) { + this.name = name; + this.type = type; + } + + @Override + public String toString() { + return String.format("Local[ordinal=%d, name=%s, type=%s]", this.ord, this.name, this.type); + } + + } + + final Target target; + final AbstractInsnNode node; + final int baseArgIndex; + final Local[] locals; + + private final ClassNode targetClass; + private final boolean isStaticHandler; + + public Context(ClassNode targetClass, boolean isStaticHandler, Target target, AbstractInsnNode node, boolean argsOnly) { + this.targetClass = targetClass; + this.isStaticHandler = isStaticHandler; + this.target = target; + this.node = node; + this.baseArgIndex = this.isStaticHandler ? 0 : 1; + this.locals = this.initLocals(target, node, argsOnly); + this.initOrdinals(); + } + + private Local[] initLocals(Target target, AbstractInsnNode node, boolean argsOnly) { + if (!argsOnly) { + LocalVariableNode[] locals = Locals.getLocalsAt(this.targetClass, target.method, node); + if (locals != null) { + Local[] lvt = new Local[locals.length]; + for (int l = 0; l < locals.length; l++) { + if (locals[l] != null) { + lvt[l] = new Local(locals[l].name, Type.getType(locals[l].desc)); + } + } + return lvt; + } + } + + Local[] lvt = new Local[this.baseArgIndex + target.arguments.length]; + if (!this.isStaticHandler) { + lvt[0] = new Local("this", Type.getType(this.targetClass.name)); + } + for (int local = this.baseArgIndex; local < lvt.length; local++) { + Type arg = target.arguments[local - this.baseArgIndex]; + lvt[local] = new Local("arg" + local, arg); + } + return lvt; + } + + private void initOrdinals() { + Map ordinalMap = new HashMap(); + for (int l = 0; l < this.locals.length; l++) { + Integer ordinal = Integer.valueOf(0); + if (this.locals[l] != null) { + ordinal = ordinalMap.get(this.locals[l].type); + ordinalMap.put(this.locals[l].type, ordinal = Integer.valueOf(ordinal == null ? 0 : ordinal.intValue() + 1)); + this.locals[l].ord = ordinal.intValue(); + } + } + } + + } + + /** + * Print LVT + */ + private final boolean print; + + /** + * True to consider only method args + */ + private final boolean argsOnly; + + /** + * Ordinal of the target variable or -1 to fail over to {@link index} + */ + private final int ordinal; + + /** + * Ordinal of the target variable or -1 to fail over to {@link names} + */ + private final int index; + + /** + * Candidate names for the local variable, if empty fails over to matching + * single local by type + */ + private final Set names; + + /** + * @param info Injection info + * @param print + * @param argsOnly + * @param ordinal target variable ordinal + * @param index target variable index + * @param names target variable names + */ + public ModifyVariableInjector(InjectionInfo info, boolean print, boolean argsOnly, int ordinal, int index, Set names) { + super(info); + + this.print = print; + this.argsOnly = argsOnly; + this.ordinal = ordinal; + this.index = index; + this.names = names; + } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.injection.callback.BytecodeInjector + * #sanityCheck(org.spongepowered.asm.mixin.injection.callback.Target, + * java.util.List) + */ + @Override + protected void sanityCheck(Target target, List injectionPoints) { + super.sanityCheck(target, injectionPoints); + + if (target.isStatic != this.isStatic) { + throw new InvalidInjectionException(this.info, "'static' of variable modifier method does not match target in " + this.methodNode.name); + } + + if (this.ordinal < -1) { + throw new InvalidInjectionException(this.info, "Invalid ordinal " + this.ordinal + " specified in " + this.methodNode.name); + } + + if (this.index == 0 && !this.isStatic) { + throw new InvalidInjectionException(this.info, "Invalid index 0 specified in non-static variable modifier " + this.methodNode.name); + } + } + + /** + * If the user specifies no values for {@link ordinal}, {@link index} or + * {@link names} then we are considered to be operating in "implicit mode" + * where only a single local variable of the specified type is expected to + * exist. + * + * @param context Target context + * @return true if operating in implicit mode + */ + protected boolean isImplicitMode(final Context context) { + return this.ordinal < 0 && this.index < context.baseArgIndex && this.names.isEmpty(); + } + + /** + * Do the injection + */ + @Override + protected void inject(Target target, AbstractInsnNode node) { + Context context = new Context(this.classNode, this.isStatic, target, node, this.argsOnly); + + if (this.print) { + this.printLocals(context); + } + + int local = this.findLocal(context); + if (local > -1) { + this.inject(context, local); + } + + target.insns.insertBefore(node, context); + target.addToStack(this.isStatic ? 1 : 2); + } + + /** + * Pretty-print local variable information to stderr + */ + private void printLocals(final Context context) { + SignaturePrinter handlerSig = new SignaturePrinter(this.methodNode.name, this.returnType, this.methodArgs, new String[] { "var" }); + handlerSig.setModifiers(this.methodNode); + + PrettyPrinter printer = new PrettyPrinter(); + printer.add("%20s : %s", "Target Class", this.classNode.name.replace('/', '.')); + printer.add("%20s : %s", "Target Method", context.target.method.name); + printer.add("%20s : %s", "Callback Name", this.methodNode.name); + printer.add("%20s : %s", "Capture Type", SignaturePrinter.getTypeName(this.returnType, false)); + printer.add("%20s : %s %s", "Instruction", context.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(context.node.getOpcode())).hr(); + printer.add("%20s : %s", "Match mode", this.isImplicitMode(context) ? "IMPLICIT (match single)" : "EXPLICIT (match by criteria)"); + printer.add("%20s : %s", "Match ordinal", this.ordinal < 0 ? "any" : this.ordinal); + printer.add("%20s : %s", "Match index", this.index < context.baseArgIndex ? "any" : this.index); + printer.add("%20s : %s", "Match name(s)", this.names.isEmpty() ? "any" : this.names); + printer.add("%20s : %s", "Args only", this.argsOnly).hr(); + printer.add("%5s %7s %20s %-50s %s", "INDEX", "ORDINAL", "TYPE", "NAME", "CANDIDATE"); + for (int l = context.baseArgIndex; l < context.locals.length; l++) { + Local local = context.locals[l]; + if (local != null) { + Type localType = local.type; + String localName = local.name; + int ordinal = local.ord; + String candidate = this.returnType.equals(localType) ? "YES" : "-"; + printer.add("[%3d] [%3d] %20s %-50s %s", l, ordinal, SignaturePrinter.getTypeName(localType, false), localName, candidate); + } else if (l > 0) { + Local prevLocal = context.locals[l - 1]; + boolean isTop = prevLocal != null && prevLocal.type != null && prevLocal.type.getSize() > 1; + printer.add("[%3d] %20s", l, isTop ? "" : "-"); + } + } + printer.print(System.err); + } + + private void inject(final Context context, final int local) { + if (!this.isStatic) { + context.add(new VarInsnNode(Opcodes.ALOAD, 0)); + } + + context.add(new VarInsnNode(this.returnType.getOpcode(Opcodes.ILOAD), local)); + this.invokeHandler(context); + context.add(new VarInsnNode(this.returnType.getOpcode(Opcodes.ISTORE), local)); + } + + private int findLocal(Context context) { + if (this.isImplicitMode(context)) { + return this.findImplicitLocal(context); + } + return this.findExplicitLocal(context); + } + + private int findImplicitLocal(final Context context) { + int found = 0; + int count = 0; + for (int index = context.baseArgIndex; index < context.locals.length; index++) { + Local local = context.locals[index]; + if (local == null || !local.type.equals(this.returnType)) { + continue; + } + count++; + found = index; + } + + if (count == 1) { + return found; + } + + throw new InvalidInjectionException(this.info, "Implicit variable modifier injection failed in " + this.methodNode.name + ", found " + + count + " candidate variables but exactly 1 is required."); + } + + private int findExplicitLocal(final Context context) { + for (int index = context.baseArgIndex; index < context.locals.length; index++) { + Local local = context.locals[index]; + if (local == null || !local.type.equals(this.returnType)) { + continue; + } + if (this.ordinal > -1) { + if (this.ordinal == local.ord) { + return index; + } + continue; + } + if (this.index >= context.baseArgIndex) { + if (this.index == index) { + return index; + } + continue; + } + if (this.names.contains(local.name)) { + return index; + } + } + + return -1; + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java index 80149326..313a55f7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java @@ -45,4 +45,5 @@ public class CallbackInjectionInfo extends InjectionInfo { return new CallbackInjector(this, cancellable, locals); } + } 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 2d65e8dd..0c68ba52 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 @@ -42,6 +42,7 @@ import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.transformer.InvalidMixinException; @@ -192,7 +193,7 @@ public abstract class InjectionInfo { } Integer require = ASMHelper.getAnnotationValue(this.annotation, "require"); - if (require != null) { + if (require != null && require.intValue() > -1) { this.requiredCallbackCount = require.intValue(); } else if (this.group.isDefault()) { this.requiredCallbackCount = this.mixin.getDefaultRequiredInjections(); @@ -234,15 +235,19 @@ public abstract class InjectionInfo { if ((MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_INJECTORS) && this.injectedCallbackCount < this.expectedCallbackCount)) { throw new InvalidInjectionException(this, - String.format("Injection validation failed: Callback method %s%s in %s expected %d invocation(s) but %d succeeded", - this.method.name, this.method.desc, this.mixin, this.expectedCallbackCount, this.injectedCallbackCount)); + String.format("Injection validation failed: %s %s%s in %s expected %d invocation(s) but %d succeeded", + this.getDescription(), this.method.name, this.method.desc, this.mixin, this.expectedCallbackCount, this.injectedCallbackCount)); } else if (this.injectedCallbackCount < this.requiredCallbackCount) { throw new InjectionError( - String.format("Critical injection failure: Callback method %s%s in %s failed injection check, (%d/%d) succeeded", - this.method.name, this.method.desc, this.mixin, this.injectedCallbackCount, this.requiredCallbackCount)); + String.format("Critical injection failure: %s %s%s in %s failed injection check, (%d/%d) succeeded", + this.getDescription(), this.method.name, this.method.desc, this.mixin, this.injectedCallbackCount, this.requiredCallbackCount)); } } + protected String getDescription() { + return "Callback method"; + } + @Override public String toString() { return String.format("%s->@%s::%s%s", this.mixin.toString(), this.annotationType, this.method.name, this.method.desc); @@ -356,7 +361,7 @@ public abstract class InjectionInfo { public static InjectionInfo parse(MixinTargetContext mixin, MethodNode method) { AnnotationNode annotation = null; try { - annotation = ASMHelper.getSingleVisibleAnnotation(method, Inject.class, ModifyArg.class, Redirect.class); + annotation = ASMHelper.getSingleVisibleAnnotation(method, Inject.class, ModifyArg.class, Redirect.class, ModifyVariable.class); } catch (IllegalArgumentException ex) { throw new InvalidMixinException(mixin, "Error parsing annotations on " + method.name + " in " + mixin.getClassName() + ": " + ex.getMessage()); @@ -372,6 +377,8 @@ public abstract class InjectionInfo { return new ModifyArgInjectionInfo(mixin, method, annotation); } else if (annotation.desc.endsWith(Redirect.class.getSimpleName() + ";")) { return new RedirectInjectionInfo(mixin, method, annotation); + } else if (annotation.desc.endsWith(ModifyVariable.class.getSimpleName() + ";")) { + return new ModifyVariableInjectionInfo(mixin, method, annotation); } return null; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java index 76031d9d..5b0ab5cd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java @@ -43,4 +43,10 @@ public class ModifyArgInjectionInfo extends InjectionInfo { return new ModifyArgInjector(this, index); } + + @Override + protected String getDescription() { + return "Argument modifier method"; + } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java new file mode 100644 index 00000000..5a0b4d39 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java @@ -0,0 +1,65 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.struct; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.modify.ModifyVariableInjector; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +import org.spongepowered.asm.util.ASMHelper; + +public class ModifyVariableInjectionInfo extends InjectionInfo { + + public ModifyVariableInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { + super(mixin, method, annotation); + } + + @Override + protected Injector initInjector(AnnotationNode injectAnnotation) { + boolean print = ASMHelper.getAnnotationValue(injectAnnotation, "print", Boolean.FALSE).booleanValue(); + boolean argsOnly = ASMHelper.getAnnotationValue(injectAnnotation, "argsOnly", Boolean.FALSE).booleanValue(); + int ordinal = ASMHelper.getAnnotationValue(injectAnnotation, "ordinal", -1); + int index = ASMHelper.getAnnotationValue(injectAnnotation, "index", -1); + + Set names = new HashSet(); + List namesList = ASMHelper.>getAnnotationValue(injectAnnotation, "name", (List)null); + if (namesList != null) { + names.addAll(namesList); + } + + return new ModifyVariableInjector(this, print, argsOnly, ordinal, index, names); + } + + @Override + protected String getDescription() { + return "Variable modifier method"; + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java index fba241ff..e3396041 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java @@ -40,4 +40,10 @@ public class RedirectInjectionInfo extends InjectionInfo { protected Injector initInjector(AnnotationNode injectAnnotation) { return new RedirectInjector(this); } + + @Override + protected String getDescription() { + return "Redirector"; + } + } From 6ad3fce00f0b35a28745a5d6f6887df930a08d1f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 1 Feb 2016 23:48:20 +0000 Subject: [PATCH 102/169] Refactor and extract local var discriminator, add LOAD and STORE points --- .../asm/mixin/injection/InjectionPoint.java | 28 +- .../injection/InvalidInjectionException.java | 1 - .../asm/mixin/injection/code/Injector.java | 2 +- .../injection/modify/AfterStoreLocal.java | 81 +++++ .../injection/modify/BeforeLoadLocal.java | 172 +++++++++++ ...InvalidImplicitDiscriminatorException.java | 39 +++ .../modify/LocalVariableDiscriminator.java | 291 ++++++++++++++++++ .../modify/ModifyVariableInjector.java | 261 ++++------------ .../mixin/injection/struct/InjectionInfo.java | 2 +- .../struct/ModifyVariableInjectionInfo.java | 17 +- .../spongepowered/asm/util/PrettyPrinter.java | 13 + 11 files changed, 681 insertions(+), 226 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/modify/AfterStoreLocal.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/modify/BeforeLoadLocal.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java index ff135a4a..ef5ffcb6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java @@ -31,9 +31,14 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; +import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.modify.AfterStoreLocal; +import org.spongepowered.asm.mixin.injection.modify.BeforeLoadLocal; +import org.spongepowered.asm.mixin.injection.modify.LocalVariableDiscriminator; import org.spongepowered.asm.mixin.injection.points.AfterInvoke; import org.spongepowered.asm.mixin.injection.points.BeforeFieldAccess; import org.spongepowered.asm.mixin.injection.points.BeforeInvoke; @@ -308,12 +313,15 @@ public abstract class InjectionPoint { * * @param mixin Data for the mixin containing the annotation, used to obtain * the refmap, amongst other things + * @param method The annotated handler method + * @param parent The parent annotation which owns this {@link At} annotation * @param at {@link At} annotation to parse information from * @return InjectionPoint parsed from the supplied data or null if parsing * failed */ - public static InjectionPoint parse(MixinTargetContext mixin, At at) { - return InjectionPoint.parse(mixin, at.value(), at.shift(), at.by(), Arrays.asList(at.args()), at.target(), at.ordinal(), at.opcode()); + public static InjectionPoint parse(MixinTargetContext mixin, MethodNode method, AnnotationNode parent, At at) { + List args = Arrays.asList(at.args()); + return InjectionPoint.parse(mixin, method, parent, at.value(), at.shift(), at.by(), args, at.target(), at.ordinal(), at.opcode()); } /** @@ -322,11 +330,13 @@ public abstract class InjectionPoint { * * @param mixin Data for the mixin containing the annotation, used to obtain * the refmap, amongst other things + * @param method The annotated handler method + * @param parent The parent annotation which owns this {@link At} annotation * @param node {@link At} annotation to parse information from * @return InjectionPoint parsed from the supplied data or null if parsing * failed */ - public static InjectionPoint parse(MixinTargetContext mixin, AnnotationNode node) { + public static InjectionPoint parse(MixinTargetContext mixin, MethodNode method, AnnotationNode parent, AnnotationNode node) { String at = ASMHelper.getAnnotationValue(node, "value"); List args = ASMHelper.>getAnnotationValue(node, "args"); String target = ASMHelper.getAnnotationValue(node, "target", ""); @@ -339,7 +349,7 @@ public abstract class InjectionPoint { args = ImmutableList.of(); } - return InjectionPoint.parse(mixin, at, shift, by, args, target, ordinal, opcode); + return InjectionPoint.parse(mixin, method, parent, at, shift, by, args, target, ordinal, opcode); } /** @@ -348,6 +358,8 @@ public abstract class InjectionPoint { * * @param mixin Data for the mixin containing the annotation, used to obtain * the refmap, amongst other things + * @param method The annotated handler method + * @param parent The parent annotation which owns this {@link At} annotation * @param at Injection point specifier * @param shift Shift type to apply * @param by Amount of shift to apply for the BY shift type @@ -358,7 +370,7 @@ public abstract class InjectionPoint { * @return InjectionPoint parsed from the supplied data or null if parsing * failed */ - public static InjectionPoint parse(MixinTargetContext mixin, String at, At.Shift shift, int by, + public static InjectionPoint parse(MixinTargetContext mixin, MethodNode method, AnnotationNode parent, String at, At.Shift shift, int by, List args, String target, int ordinal, int opcode) { InjectionPointData data = new InjectionPointData(mixin, args, target, ordinal, opcode); InjectionPoint point = null; @@ -379,6 +391,12 @@ public abstract class InjectionPoint { point = new MethodHead(data); } else if (AfterInvoke.CODE.equals(at)) { point = new AfterInvoke(data); + } else if (BeforeLoadLocal.CODE.equals(at)) { + LocalVariableDiscriminator discriminator = LocalVariableDiscriminator.parse(parent); + point = new BeforeLoadLocal(mixin, Type.getReturnType(method.desc), discriminator, data); + } else if (AfterStoreLocal.CODE.equals(at)) { + LocalVariableDiscriminator discriminator = LocalVariableDiscriminator.parse(parent); + point = new AfterStoreLocal(mixin, Type.getReturnType(method.desc), discriminator, data); } else if (at.matches("^([A-Za-z_][A-Za-z0-9_]*\\.)+[A-Za-z_][A-Za-z0-9_]*$")) { try { @SuppressWarnings("unchecked") Class cls = (Class) Class.forName(at); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java index 03d551e3..3b896892 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java @@ -28,7 +28,6 @@ import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.InvalidMixinException; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; - public class InvalidInjectionException extends InvalidMixinException { private static final long serialVersionUID = 1L; 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 fafe0188..304f8d5c 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 @@ -147,7 +147,7 @@ public abstract class Injector { return targetNodes; } - protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, ReadOnlyInsnList insns, Collection nodes) { + protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, InsnList insns, Collection nodes) { return injectionPoint.find(into.desc, insns, nodes); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/AfterStoreLocal.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/AfterStoreLocal.java new file mode 100644 index 00000000..2ed1e3e0 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/AfterStoreLocal.java @@ -0,0 +1,81 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.modify; + +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.struct.InjectionPointData; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; + +/** + *

This injection point is a companion for the {@link ModifyVariable} + * injector which searches for STORE operations which match the local variables + * described by the injector's defined discriminators.

+ * + *

This allows you consumers to specify an injection immediately after a + * local variable is written in a method. Specify an ordinal of n + * to match the n + 1th access of the variable in + * question.

+ * + *
+ *
ordinal
+ *
The ordinal position of the STORE opcode for the matching local + * variable to search for, if not specified then the injection point returns + * all opcodes for which the parent annotation's discriminators + * match. The default value is -1 which supresses ordinal checking. + *
+ *
+ * + *

Example:

+ *
+ *   @ModifyVariable(
+ *       method = "md",
+ *       ordinal = 1,
+ *       at = @At(
+ *           value = "STORE",
+ *           ordinal = 0
+ *       )
+ *   )
+ *
+ *

Note that if value is the only parameter specified, it can be + * omitted:

+ *
+ *   @At("STORE")
+ *
+ * + *

Important Note: Unlike other standard injection points, this class + * matches the insn immediately after the matching point.

+ */ +public class AfterStoreLocal extends BeforeLoadLocal { + + @SuppressWarnings("hiding") + public static final String CODE = "STORE"; + + public AfterStoreLocal(MixinTargetContext mixin, Type returnType, LocalVariableDiscriminator local, InjectionPointData data) { + super(mixin, returnType, local, data, Opcodes.ISTORE, true); + } + +} 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 new file mode 100644 index 00000000..cb2d9055 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/BeforeLoadLocal.java @@ -0,0 +1,172 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.modify; + +import java.util.Collection; +import java.util.ListIterator; + +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.modify.ModifyVariableInjector.ContextualInjectionPoint; +import org.spongepowered.asm.mixin.injection.struct.InjectionPointData; +import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; + +/** + *

This injection point is a companion for the {@link ModifyVariable} + * injector which searches for LOAD operations which match the local variables + * described by the injector's defined discriminators.

+ * + *

This allows you consumers to specify an injection immediately before a + * local variable is accessed in a method. Specify an ordinal of n + * to match the n + 1th access of the variable in + * question.

+ * + *
+ *
ordinal
+ *
The ordinal position of the LOAD opcode for the matching local variable + * to search for, if not specified then the injection point returns all + * opcodes for which the parent annotation's discriminators match. The + * default value is -1 which supresses ordinal checking.
+ *
+ * + *

Example:

+ *
+ *   @ModifyVariable(
+ *       method = "md",
+ *       ordinal = 1,
+ *       at = @At(
+ *           value = "LOAD",
+ *           ordinal = 0
+ *       )
+ *   )
+ *
+ *

Note that if value is the only parameter specified, it can be + * omitted:

+ *
+ *   @At("LOAD")
+ *
+ */ +public class BeforeLoadLocal extends ContextualInjectionPoint { + + static class SearchState { + + private final int targetOrdinal; + private int ordinal = 0; + private boolean pendingCheck = false; + private boolean found = false; + private VarInsnNode varNode; + + SearchState(int targetOrdinal) { + this.targetOrdinal = targetOrdinal; + } + + boolean success() { + return this.found; + } + + boolean isPendingCheck() { + return this.pendingCheck; + } + + void setPendingCheck() { + this.pendingCheck = true; + } + + void register(VarInsnNode node) { + this.varNode = node; + } + + void check(Collection nodes, AbstractInsnNode insn, int local) { + this.pendingCheck = false; + if (local != this.varNode.var) { + return; + } + + if (this.targetOrdinal == -1 || this.targetOrdinal == this.ordinal) { + nodes.add(insn); + this.found = true; + } + + this.ordinal++; + this.varNode = null; + } + + } + + public static final String CODE = "LOAD"; + + private final Type returnType; + + private final LocalVariableDiscriminator discriminator; + + private final int opcode; + + private final int ordinal; + + private boolean opcodeAfter; + + public BeforeLoadLocal(MixinTargetContext mixin, Type returnType, LocalVariableDiscriminator discriminator, InjectionPointData data) { + this(mixin, returnType, discriminator, data, Opcodes.ILOAD, false); + } + + protected BeforeLoadLocal(MixinTargetContext mixin, Type returnType, LocalVariableDiscriminator discriminator, InjectionPointData data, + int opcode, boolean opcodeAfter) { + super(mixin); + this.returnType = returnType; + this.discriminator = discriminator; + this.opcode = data.getOpcode(returnType.getOpcode(opcode)); + this.ordinal = data.getOrdinal(); + this.opcodeAfter = opcodeAfter; + } + + @Override + boolean find(Target target, Collection nodes) { + SearchState state = new SearchState(this.ordinal); + + ListIterator iter = target.method.instructions.iterator(); + while (iter.hasNext()) { + AbstractInsnNode insn = iter.next(); + if (state.isPendingCheck()) { + int local = this.discriminator.findLocal(this.mixin, this.returnType, this.discriminator.isArgsOnly(), target, insn); + state.check(nodes, insn, local); + } else if (insn instanceof VarInsnNode && insn.getOpcode() == this.opcode && (this.ordinal == -1 || !state.success())) { + state.register((VarInsnNode)insn); + if (this.opcodeAfter) { + state.setPendingCheck(); + } else { + int local = this.discriminator.findLocal(this.mixin, this.returnType, this.discriminator.isArgsOnly(), target, insn); + state.check(nodes, insn, local); + } + } + } + + return state.success(); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java new file mode 100644 index 00000000..0504cb56 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java @@ -0,0 +1,39 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.modify; + +public class InvalidImplicitDiscriminatorException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public InvalidImplicitDiscriminatorException(String message) { + super(message); + } + + public InvalidImplicitDiscriminatorException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java new file mode 100644 index 00000000..f54bb9f0 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java @@ -0,0 +1,291 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.modify; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.LocalVariableNode; +import org.spongepowered.asm.mixin.injection.modify.LocalVariableDiscriminator.Context.Local; +import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +import org.spongepowered.asm.util.ASMHelper; +import org.spongepowered.asm.util.Locals; +import org.spongepowered.asm.util.PrettyPrinter; +import org.spongepowered.asm.util.PrettyPrinter.IPrettyPrintable; +import org.spongepowered.asm.util.SignaturePrinter; + +public class LocalVariableDiscriminator { + + public static class Context implements IPrettyPrintable { + + public class Local { + + int ord = 0; + String name; + Type type; + + public Local(String name, Type type) { + this.name = name; + this.type = type; + } + + @Override + public String toString() { + return String.format("Local[ordinal=%d, name=%s, type=%s]", this.ord, this.name, this.type); + } + + } + + final Target target; + final Type returnType; + final AbstractInsnNode node; + final int baseArgIndex; + final Local[] locals; + + private final boolean isStatic; + + public Context(MixinTargetContext mixin, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { + this(mixin.getTargetClass(), returnType, argsOnly, target, node); + } + + public Context(ClassNode targetClass, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { + this.isStatic = ASMHelper.methodIsStatic(target.method); + this.returnType = returnType; + this.target = target; + this.node = node; + this.baseArgIndex = this.isStatic ? 0 : 1; + this.locals = this.initLocals(targetClass, target, argsOnly, node); + this.initOrdinals(); + } + + private Local[] initLocals(ClassNode targetClass, Target target, boolean argsOnly, AbstractInsnNode node) { + if (!argsOnly) { + LocalVariableNode[] locals = Locals.getLocalsAt(targetClass, target.method, node); + if (locals != null) { + Local[] lvt = new Local[locals.length]; + for (int l = 0; l < locals.length; l++) { + if (locals[l] != null) { + lvt[l] = new Local(locals[l].name, Type.getType(locals[l].desc)); + } + } + return lvt; + } + } + + Local[] lvt = new Local[this.baseArgIndex + target.arguments.length]; + if (!this.isStatic) { + lvt[0] = new Local("this", Type.getType(targetClass.name)); + } + for (int local = this.baseArgIndex; local < lvt.length; local++) { + Type arg = target.arguments[local - this.baseArgIndex]; + lvt[local] = new Local("arg" + local, arg); + } + return lvt; + } + + private void initOrdinals() { + Map ordinalMap = new HashMap(); + for (int l = 0; l < this.locals.length; l++) { + Integer ordinal = Integer.valueOf(0); + if (this.locals[l] != null) { + ordinal = ordinalMap.get(this.locals[l].type); + ordinalMap.put(this.locals[l].type, ordinal = Integer.valueOf(ordinal == null ? 0 : ordinal.intValue() + 1)); + this.locals[l].ord = ordinal.intValue(); + } + } + } + + @Override + public void print(PrettyPrinter printer) { + printer.add("%5s %7s %20s %-50s %s", "INDEX", "ORDINAL", "TYPE", "NAME", "CANDIDATE"); + for (int l = this.baseArgIndex; l < this.locals.length; l++) { + Local local = this.locals[l]; + if (local != null) { + Type localType = local.type; + String localName = local.name; + int ordinal = local.ord; + String candidate = this.returnType.equals(localType) ? "YES" : "-"; + printer.add("[%3d] [%3d] %20s %-50s %s", l, ordinal, SignaturePrinter.getTypeName(localType, false), localName, candidate); + } else if (l > 0) { + Local prevLocal = this.locals[l - 1]; + boolean isTop = prevLocal != null && prevLocal.type != null && prevLocal.type.getSize() > 1; + printer.add("[%3d] %20s", l, isTop ? "" : "-"); + } + } + } + + } + + /** + * True to consider only method args + */ + private final boolean argsOnly; + + /** + * Ordinal of the target variable or -1 to fail over to {@link index} + */ + private final int ordinal; + + /** + * Ordinal of the target variable or -1 to fail over to {@link names} + */ + private final int index; + + /** + * Candidate names for the local variable, if empty fails over to matching + * single local by type + */ + private final Set names; + + /** + * @param argsOnly + * @param ordinal target variable ordinal + * @param index target variable index + * @param names target variable names + */ + public LocalVariableDiscriminator(boolean argsOnly, int ordinal, int index, Set names) { + this.argsOnly = argsOnly; + this.ordinal = ordinal; + this.index = index; + this.names = Collections.unmodifiableSet(names); + } + + public boolean isArgsOnly() { + return this.argsOnly; + } + + public int getOrdinal() { + return this.ordinal; + } + + public int getIndex() { + return this.index; + } + + public Set getNames() { + return this.names; + } + + public boolean hasNames() { + return !this.names.isEmpty(); + } + + /** + * If the user specifies no values for {@link ordinal}, {@link index} or + * {@link names} then we are considered to be operating in "implicit mode" + * where only a single local variable of the specified type is expected to + * exist. + * + * @param context Target context + * @return true if operating in implicit mode + */ + protected boolean isImplicit(final Context context) { + return this.ordinal < 0 && this.index < context.baseArgIndex && this.names.isEmpty(); + } + + public int findLocal(MixinTargetContext mixin, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { + try { + return this.findLocal(new Context(mixin, returnType, argsOnly, target, node)); + } catch (InvalidImplicitDiscriminatorException ex) { + return -1; + } + } + + public int findLocal(Context context) { + if (this.isImplicit(context)) { + return this.findImplicitLocal(context); + } + return this.findExplicitLocal(context); + } + + private int findImplicitLocal(final Context context) { + int found = 0; + int count = 0; + for (int index = context.baseArgIndex; index < context.locals.length; index++) { + Local local = context.locals[index]; + if (local == null || !local.type.equals(context.returnType)) { + continue; + } + count++; + found = index; + } + + if (count == 1) { + return found; + } + + throw new InvalidImplicitDiscriminatorException("Found " + count + " candidate variables but exactly 1 is required."); + } + + private int findExplicitLocal(final Context context) { + for (int index = context.baseArgIndex; index < context.locals.length; index++) { + Local local = context.locals[index]; + if (local == null || !local.type.equals(context.returnType)) { + continue; + } + if (this.ordinal > -1) { + if (this.ordinal == local.ord) { + return index; + } + continue; + } + if (this.index >= context.baseArgIndex) { + if (this.index == index) { + return index; + } + continue; + } + if (this.names.contains(local.name)) { + return index; + } + } + + return -1; + } + + public static LocalVariableDiscriminator parse(AnnotationNode annotation) { + boolean argsOnly = ASMHelper.getAnnotationValue(annotation, "argsOnly", Boolean.FALSE).booleanValue(); + int ordinal = ASMHelper.getAnnotationValue(annotation, "ordinal", -1); + int index = ASMHelper.getAnnotationValue(annotation, "index", -1); + + Set names = new HashSet(); + List namesList = ASMHelper.>getAnnotationValue(annotation, "name", (List)null); + if (namesList != null) { + names.addAll(namesList); + } + + return new LocalVariableDiscriminator(argsOnly, ordinal, index, names); + } + +} 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 aef5beb4..7868baae 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 @@ -24,26 +24,23 @@ */ package org.spongepowered.asm.mixin.injection.modify; -import java.util.HashMap; +import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.Set; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.InsnList; -import org.spongepowered.asm.lib.tree.LocalVariableNode; +import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.code.Injector; -import org.spongepowered.asm.mixin.injection.modify.ModifyVariableInjector.Context.Local; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; -import org.spongepowered.asm.util.Locals; import org.spongepowered.asm.util.PrettyPrinter; import org.spongepowered.asm.util.SignaturePrinter; @@ -52,84 +49,33 @@ import org.spongepowered.asm.util.SignaturePrinter; * be altered. */ public class ModifyVariableInjector extends Injector { - - class Context extends InsnList { - class Local { - - int ord = 0; - String name; - Type type; + static class Context extends LocalVariableDiscriminator.Context { + final InsnList insns = new InsnList(); - public Local(String name, Type type) { - this.name = name; - this.type = type; - } - - @Override - public String toString() { - return String.format("Local[ordinal=%d, name=%s, type=%s]", this.ord, this.name, this.type); - } - + public Context(ClassNode targetClass, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { + super(targetClass, returnType, argsOnly, target, node); } - final Target target; - final AbstractInsnNode node; - final int baseArgIndex; - final Local[] locals; - - private final ClassNode targetClass; - private final boolean isStaticHandler; - - public Context(ClassNode targetClass, boolean isStaticHandler, Target target, AbstractInsnNode node, boolean argsOnly) { - this.targetClass = targetClass; - this.isStaticHandler = isStaticHandler; - this.target = target; - this.node = node; - this.baseArgIndex = this.isStaticHandler ? 0 : 1; - this.locals = this.initLocals(target, node, argsOnly); - this.initOrdinals(); - } - - private Local[] initLocals(Target target, AbstractInsnNode node, boolean argsOnly) { - if (!argsOnly) { - LocalVariableNode[] locals = Locals.getLocalsAt(this.targetClass, target.method, node); - if (locals != null) { - Local[] lvt = new Local[locals.length]; - for (int l = 0; l < locals.length; l++) { - if (locals[l] != null) { - lvt[l] = new Local(locals[l].name, Type.getType(locals[l].desc)); - } - } - return lvt; - } - } - - Local[] lvt = new Local[this.baseArgIndex + target.arguments.length]; - if (!this.isStaticHandler) { - lvt[0] = new Local("this", Type.getType(this.targetClass.name)); - } - for (int local = this.baseArgIndex; local < lvt.length; local++) { - Type arg = target.arguments[local - this.baseArgIndex]; - lvt[local] = new Local("arg" + local, arg); - } - return lvt; - } - - private void initOrdinals() { - Map ordinalMap = new HashMap(); - for (int l = 0; l < this.locals.length; l++) { - Integer ordinal = Integer.valueOf(0); - if (this.locals[l] != null) { - ordinal = ordinalMap.get(this.locals[l].type); - ordinalMap.put(this.locals[l].type, ordinal = Integer.valueOf(ordinal == null ? 0 : ordinal.intValue() + 1)); - this.locals[l].ord = ordinal.intValue(); - } - } - } - } + + abstract static class ContextualInjectionPoint extends InjectionPoint { + + protected final MixinTargetContext mixin; + ContextualInjectionPoint(MixinTargetContext mixin) { + this.mixin = mixin; + } + + @Override + public boolean find(String desc, InsnList insns, Collection nodes) { + throw new InvalidInjectionException(this.mixin, "STORE injection point must be used in conjunction with @ModifyVariable"); + } + + abstract boolean find(Target target, Collection nodes); + + } + /** * Print LVT */ @@ -138,40 +84,24 @@ public class ModifyVariableInjector extends Injector { /** * True to consider only method args */ - private final boolean argsOnly; - - /** - * Ordinal of the target variable or -1 to fail over to {@link index} - */ - private final int ordinal; - - /** - * Ordinal of the target variable or -1 to fail over to {@link names} - */ - private final int index; - - /** - * Candidate names for the local variable, if empty fails over to matching - * single local by type - */ - private final Set names; + private final LocalVariableDiscriminator discriminator; /** * @param info Injection info * @param print - * @param argsOnly - * @param ordinal target variable ordinal - * @param index target variable index - * @param names target variable names */ - public ModifyVariableInjector(InjectionInfo info, boolean print, boolean argsOnly, int ordinal, int index, Set names) { + public ModifyVariableInjector(InjectionInfo info, boolean print, LocalVariableDiscriminator discriminator) { super(info); - this.print = print; - this.argsOnly = argsOnly; - this.ordinal = ordinal; - this.index = index; - this.names = names; + this.discriminator = discriminator; + } + + @Override + protected boolean findTargetNodes(MethodNode into, InjectionPoint injectionPoint, InsnList insns, Collection nodes) { + if (injectionPoint instanceof ContextualInjectionPoint) { + return ((ContextualInjectionPoint)injectionPoint).find(this.info.getContext().getTargetMethod(into), nodes); + } + return injectionPoint.find(into.desc, insns, nodes); } /* (non-Javadoc) @@ -187,45 +117,37 @@ public class ModifyVariableInjector extends Injector { throw new InvalidInjectionException(this.info, "'static' of variable modifier method does not match target in " + this.methodNode.name); } - if (this.ordinal < -1) { - throw new InvalidInjectionException(this.info, "Invalid ordinal " + this.ordinal + " specified in " + this.methodNode.name); + int ordinal = this.discriminator.getOrdinal(); + if (ordinal < -1) { + throw new InvalidInjectionException(this.info, "Invalid ordinal " + ordinal + " specified in " + this.methodNode.name); } - if (this.index == 0 && !this.isStatic) { + if (this.discriminator.getIndex() == 0 && !this.isStatic) { throw new InvalidInjectionException(this.info, "Invalid index 0 specified in non-static variable modifier " + this.methodNode.name); } } - /** - * If the user specifies no values for {@link ordinal}, {@link index} or - * {@link names} then we are considered to be operating in "implicit mode" - * where only a single local variable of the specified type is expected to - * exist. - * - * @param context Target context - * @return true if operating in implicit mode - */ - protected boolean isImplicitMode(final Context context) { - return this.ordinal < 0 && this.index < context.baseArgIndex && this.names.isEmpty(); - } - /** * Do the injection */ @Override protected void inject(Target target, AbstractInsnNode node) { - Context context = new Context(this.classNode, this.isStatic, target, node, this.argsOnly); + Context context = new Context(this.classNode, this.returnType, this.discriminator.isArgsOnly(), target, node); if (this.print) { this.printLocals(context); } - int local = this.findLocal(context); - if (local > -1) { - this.inject(context, local); + try { + int local = this.discriminator.findLocal(context); + if (local > -1) { + this.inject(context, local); + } + } catch (InvalidImplicitDiscriminatorException ex) { + throw new InvalidInjectionException(this.info, "Implicit variable modifier injection failed in " + this.methodNode.name, ex); } - target.insns.insertBefore(node, context); + target.insns.insertBefore(node, context.insns); target.addToStack(this.isStatic ? 1 : 2); } @@ -242,90 +164,23 @@ public class ModifyVariableInjector extends Injector { printer.add("%20s : %s", "Callback Name", this.methodNode.name); printer.add("%20s : %s", "Capture Type", SignaturePrinter.getTypeName(this.returnType, false)); printer.add("%20s : %s %s", "Instruction", context.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(context.node.getOpcode())).hr(); - printer.add("%20s : %s", "Match mode", this.isImplicitMode(context) ? "IMPLICIT (match single)" : "EXPLICIT (match by criteria)"); - printer.add("%20s : %s", "Match ordinal", this.ordinal < 0 ? "any" : this.ordinal); - printer.add("%20s : %s", "Match index", this.index < context.baseArgIndex ? "any" : this.index); - printer.add("%20s : %s", "Match name(s)", this.names.isEmpty() ? "any" : this.names); - printer.add("%20s : %s", "Args only", this.argsOnly).hr(); - printer.add("%5s %7s %20s %-50s %s", "INDEX", "ORDINAL", "TYPE", "NAME", "CANDIDATE"); - for (int l = context.baseArgIndex; l < context.locals.length; l++) { - Local local = context.locals[l]; - if (local != null) { - Type localType = local.type; - String localName = local.name; - int ordinal = local.ord; - String candidate = this.returnType.equals(localType) ? "YES" : "-"; - printer.add("[%3d] [%3d] %20s %-50s %s", l, ordinal, SignaturePrinter.getTypeName(localType, false), localName, candidate); - } else if (l > 0) { - Local prevLocal = context.locals[l - 1]; - boolean isTop = prevLocal != null && prevLocal.type != null && prevLocal.type.getSize() > 1; - printer.add("[%3d] %20s", l, isTop ? "" : "-"); - } - } + printer.add("%20s : %s", "Match mode", this.discriminator.isImplicit(context) ? "IMPLICIT (match single)" : "EXPLICIT (match by criteria)"); + printer.add("%20s : %s", "Match ordinal", this.discriminator.getOrdinal() < 0 ? "any" : this.discriminator.getOrdinal()); + printer.add("%20s : %s", "Match index", this.discriminator.getIndex() < context.baseArgIndex ? "any" : this.discriminator.getIndex()); + printer.add("%20s : %s", "Match name(s)", this.discriminator.hasNames() ? this.discriminator.getNames() : "any"); + printer.add("%20s : %s", "Args only", this.discriminator.isArgsOnly()).hr(); + printer.add(context); printer.print(System.err); } private void inject(final Context context, final int local) { if (!this.isStatic) { - context.add(new VarInsnNode(Opcodes.ALOAD, 0)); + context.insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); } - context.add(new VarInsnNode(this.returnType.getOpcode(Opcodes.ILOAD), local)); - this.invokeHandler(context); - context.add(new VarInsnNode(this.returnType.getOpcode(Opcodes.ISTORE), local)); - } - - private int findLocal(Context context) { - if (this.isImplicitMode(context)) { - return this.findImplicitLocal(context); - } - return this.findExplicitLocal(context); - } - - private int findImplicitLocal(final Context context) { - int found = 0; - int count = 0; - for (int index = context.baseArgIndex; index < context.locals.length; index++) { - Local local = context.locals[index]; - if (local == null || !local.type.equals(this.returnType)) { - continue; - } - count++; - found = index; - } - - if (count == 1) { - return found; - } - - throw new InvalidInjectionException(this.info, "Implicit variable modifier injection failed in " + this.methodNode.name + ", found " - + count + " candidate variables but exactly 1 is required."); - } - - private int findExplicitLocal(final Context context) { - for (int index = context.baseArgIndex; index < context.locals.length; index++) { - Local local = context.locals[index]; - if (local == null || !local.type.equals(this.returnType)) { - continue; - } - if (this.ordinal > -1) { - if (this.ordinal == local.ord) { - return index; - } - continue; - } - if (this.index >= context.baseArgIndex) { - if (this.index == index) { - return index; - } - continue; - } - if (this.names.contains(local.name)) { - return index; - } - } - - return -1; + context.insns.add(new VarInsnNode(this.returnType.getOpcode(Opcodes.ILOAD), local)); + this.invokeHandler(context.insns); + context.insns.add(new VarInsnNode(this.returnType.getOpcode(Opcodes.ISTORE), local)); } } 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 0c68ba52..6874e714 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 @@ -179,7 +179,7 @@ public abstract class InjectionInfo { } for (AnnotationNode at : ats) { - InjectionPoint injectionPoint = InjectionPoint.parse(this.mixin, at); + InjectionPoint injectionPoint = InjectionPoint.parse(this.mixin, this.method, this.annotation, at); if (injectionPoint != null) { this.injectionPoints.add(injectionPoint); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java index 5a0b4d39..cd841cd0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java @@ -24,13 +24,10 @@ */ package org.spongepowered.asm.mixin.injection.struct; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.modify.LocalVariableDiscriminator; import org.spongepowered.asm.mixin.injection.modify.ModifyVariableInjector; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; @@ -44,17 +41,7 @@ public class ModifyVariableInjectionInfo extends InjectionInfo { @Override protected Injector initInjector(AnnotationNode injectAnnotation) { boolean print = ASMHelper.getAnnotationValue(injectAnnotation, "print", Boolean.FALSE).booleanValue(); - boolean argsOnly = ASMHelper.getAnnotationValue(injectAnnotation, "argsOnly", Boolean.FALSE).booleanValue(); - int ordinal = ASMHelper.getAnnotationValue(injectAnnotation, "ordinal", -1); - int index = ASMHelper.getAnnotationValue(injectAnnotation, "index", -1); - - Set names = new HashSet(); - List namesList = ASMHelper.>getAnnotationValue(injectAnnotation, "name", (List)null); - if (namesList != null) { - names.addAll(namesList); - } - - return new ModifyVariableInjector(this, print, argsOnly, ordinal, index, names); + return new ModifyVariableInjector(this, print, LocalVariableDiscriminator.parse(injectAnnotation)); } @Override diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 2f15285f..de2c5432 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -40,6 +40,12 @@ import com.google.common.base.Strings; */ public class PrettyPrinter { + public interface IPrettyPrintable { + + public abstract void print(PrettyPrinter printer); + + } + /** * "Horizontal rule" marker */ @@ -131,6 +137,13 @@ public class PrettyPrinter { return this; } + + public PrettyPrinter add(IPrettyPrintable printable) { + if (printable != null) { + printable.print(this); + } + return this; + } public PrettyPrinter addWrapped(String format, Object... args) { return this.addWrapped(this.wrapWidth, format, args); From 0fad775ff01b5251a505c9d78f72b7ee35378a15 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 2 Feb 2016 00:21:08 +0000 Subject: [PATCH 103/169] Flesh out some javadoc for new classes --- .../injection/modify/BeforeLoadLocal.java | 40 ++++++++++++ .../modify/LocalVariableDiscriminator.java | 64 +++++++++++++++++++ .../modify/ModifyVariableInjector.java | 22 ++++++- 3 files changed, 124 insertions(+), 2 deletions(-) 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 cb2d9055..d9cb436e 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 @@ -74,12 +74,35 @@ import org.spongepowered.asm.mixin.transformer.MixinTargetContext; */ public class BeforeLoadLocal extends ContextualInjectionPoint { + /** + * Keeps track of state within {@link #find} + */ static class SearchState { + /** + * The target ordinal from the injection point + */ private final int targetOrdinal; + + /** + * The current ordinal + */ private int ordinal = 0; + + /** + * Flag to defer a {@link check} to the next opcode, to honour the after + * semantics of {@link AfterStoreLocal}. + */ private boolean pendingCheck = false; + + /** + * True if one or more opcodes was matched + */ private boolean found = false; + + /** + * Var node, captured for when deferring processing to the next opcode + */ private VarInsnNode varNode; SearchState(int targetOrdinal) { @@ -121,14 +144,31 @@ public class BeforeLoadLocal extends ContextualInjectionPoint { public static final String CODE = "LOAD"; + /** + * Return type of the handler, also the type of the local variable we're + * interested in + */ private final Type returnType; + /** + * Discriminator, parsed from parent annotation + */ private final LocalVariableDiscriminator discriminator; + /** + * Target opcode, inflected from return type + */ private final int opcode; + /** + * Target ordinal + */ private final int ordinal; + /** + * True if this injection point should capture the opcode after a matching + * opcode, used by {@link AfterStoreLocal}. + */ private boolean opcodeAfter; public BeforeLoadLocal(MixinTargetContext mixin, Type returnType, LocalVariableDiscriminator discriminator, InjectionPointData data) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java index f54bb9f0..6d08083d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java @@ -45,14 +45,38 @@ import org.spongepowered.asm.util.PrettyPrinter; import org.spongepowered.asm.util.PrettyPrinter.IPrettyPrintable; import org.spongepowered.asm.util.SignaturePrinter; +/** + * Encapsulates logic for identifying a local variable in a target method using + * 3 criteria: ordinal, index and name. This is used + * by the {@link ModifyVariableInjector} and its associated injection points. + */ public class LocalVariableDiscriminator { + /** + * Discriminator context information, wraps all relevant information about + * a target location for use when performing discrimination + */ public static class Context implements IPrettyPrintable { + /** + * Information about a local variable in the LVT, used during + * discrimination + */ public class Local { + /** + * Ordinal value of this local variable type + */ int ord = 0; + + /** + * Local variable name + */ String name; + + /** + * Local variable type + */ Type type; public Local(String name, Type type) { @@ -67,12 +91,36 @@ public class LocalVariableDiscriminator { } + /** + * Target method for this context + */ final Target target; + + /** + * The return type of the handler in question, also the type of the + * local variable that we care about + */ final Type returnType; + + /** + * Injection point + */ final AbstractInsnNode node; + + /** + * Base argument index, for static methods this is 0, for instance + * methods this is 1 + */ final int baseArgIndex; + + /** + * Enumerated locals in this context + */ final Local[] locals; + /** + * True if the handler (and target) are static + */ private final boolean isStatic; public Context(MixinTargetContext mixin, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { @@ -181,22 +229,38 @@ public class LocalVariableDiscriminator { this.names = Collections.unmodifiableSet(names); } + /** + * True if this discriminator will examine only the target method args and + * won't consider the rest of the LVT at the target location + */ public boolean isArgsOnly() { return this.argsOnly; } + /** + * Get the local variable ordinal (nth variable of type) + */ public int getOrdinal() { return this.ordinal; } + /** + * Get the local variable absolute index + */ public int getIndex() { return this.index; } + /** + * Get valid names for consideration + */ public Set getNames() { return this.names; } + /** + * Returns true if names is not empty + */ public boolean hasNames() { return !this.names.isEmpty(); } 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 7868baae..0a2d60bc 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 @@ -36,6 +36,7 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; +import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; @@ -45,12 +46,20 @@ import org.spongepowered.asm.util.PrettyPrinter; import org.spongepowered.asm.util.SignaturePrinter; /** - * A bytecode injector which allows a single argument of a chosen method call to - * be altered. + * A bytecode injector which allows a single local variable in the target method + * to be captured and altered. See also {@link LocalVariableDiscriminator} and + * {@link ModifyVariable}. */ public class ModifyVariableInjector extends Injector { + /** + * Target context information + */ static class Context extends LocalVariableDiscriminator.Context { + + /** + * Instructions to inject + */ final InsnList insns = new InsnList(); public Context(ClassNode targetClass, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { @@ -59,6 +68,9 @@ public class ModifyVariableInjector extends Injector { } + /** + * Specialised injection point which uses a target-aware search pattern + */ abstract static class ContextualInjectionPoint extends InjectionPoint { protected final MixinTargetContext mixin; @@ -173,6 +185,12 @@ public class ModifyVariableInjector extends Injector { printer.print(System.err); } + /** + * Perform the injection + * + * @param context target context + * @param local local variable to capture + */ private void inject(final Context context, final int local) { if (!this.isStatic) { context.insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); From 8763ed6b850f19c883623ba05e52bae5fac43596 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 2 Feb 2016 00:24:50 +0000 Subject: [PATCH 104/169] Fix javadoc warnings --- .../tools/obfuscation/MixinValidator.java | 4 +--- .../asm/mixin/injection/ModifyVariable.java | 14 +++++++------- .../asm/mixin/transformer/TargetClassContext.java | 2 -- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java index 244e944a..3dbab5c1 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinValidator.java @@ -67,9 +67,7 @@ public abstract class MixinValidator implements IMixinValidator { /** * ctor * - * @param processingEnv Processing environment - * @param messager Messager to use - * @param options Option provider + * @param ap Processing environment * @param pass Validation pass being performed */ public MixinValidator(IMixinAnnotationProcessor ap, ValidationPass pass) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java index ce4e2290..6dfbafa0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java @@ -49,10 +49,10 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Option; * only

. * *

In explicit mode, the variable to capture can be specified by - * specifying values for the discriminator arguments {@link ordinal}, - * {@link index} and {@link name}. The injector uses the discriminators in order - * to attempt to locate the variable to capture. If no local variable matches - * any discriminators, the capture fails.

+ * specifying values for the discriminator arguments {@link #ordinal}, + * {@link #index} and {@link #name}. The injector uses the discriminators in + * order to attempt to locate the variable to capture. If no local variable + * matches any discriminators, the capture fails.

* *

If no values for the capture discrimiators are specified, the injector * operates in implicit mode. If exactly one variable of the capture @@ -97,7 +97,7 @@ public @interface ModifyVariable { * Gets the local variable ordinal by type. For example, if there are 3 * {@link String} arguments in the local variable table, ordinal 0 specifies * the first, 1 specifies the second, etc. Use ordinal when the - * index within the LVT is known. Takes precedence over {@link index}. + * index within the LVT is known. Takes precedence over {@link #index}. * * @return variable ordinal */ @@ -106,7 +106,7 @@ public @interface ModifyVariable { /** * Gets the absolute index of the local variable within the local variable * table to capture. The local variable at the specified index must be of - * the same type as the capture. Takes precedence over {@link name}. + * the same type as the capture. Takes precedence over {@link #name}. * * @return argument index to modify or -1 for automatic */ @@ -114,7 +114,7 @@ public @interface ModifyVariable { /** * Gets the name of the variable to capture. Only used if the variable - * cannot be located via {@link ordinal} or {@link index}. + * cannot be located via {@link #ordinal} or {@link #index}. * * @return possible names to capture, only useful when the LVT in the target * method is known to be complete. diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index 58585486..8c43fc83 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -108,8 +108,6 @@ class TargetClassContext { /** * Apply mixins to this class - * - * @param sessionId */ public void applyMixins() { if (this.applied) { From 1e7f351115056b9aadac2fda96d4999b5cbe439f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 2 Feb 2016 01:33:30 +0000 Subject: [PATCH 105/169] Fix compile for jenkins --- .../mixin/injection/modify/LocalVariableDiscriminator.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java index 6d08083d..580dcc5c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java @@ -42,7 +42,6 @@ import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Locals; import org.spongepowered.asm.util.PrettyPrinter; -import org.spongepowered.asm.util.PrettyPrinter.IPrettyPrintable; import org.spongepowered.asm.util.SignaturePrinter; /** @@ -56,7 +55,7 @@ public class LocalVariableDiscriminator { * Discriminator context information, wraps all relevant information about * a target location for use when performing discrimination */ - public static class Context implements IPrettyPrintable { + public static class Context implements org.spongepowered.asm.util.PrettyPrinter.IPrettyPrintable { /** * Information about a local variable in the LVT, used during @@ -266,8 +265,8 @@ public class LocalVariableDiscriminator { } /** - * If the user specifies no values for {@link ordinal}, {@link index} or - * {@link names} then we are considered to be operating in "implicit mode" + * If the user specifies no values for {@link #ordinal}, {@link #index} or + * {@link #names} then we are considered to be operating in "implicit mode" * where only a single local variable of the specified type is expected to * exist. * From 19272e1170bb31cec4b57b766a11dbc5722ddef0 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 2 Feb 2016 13:21:02 +0000 Subject: [PATCH 106/169] Housekeeping --- .../tools/agent/MixinAgentClassLoader.java | 5 +-- .../AnnotatedMixinInjectorHandler.java | 4 +-- .../tools/obfuscation/ObfuscationManager.java | 4 +-- .../asm/launch/MixinInitialisationError.java | 1 - .../asm/mixin/MixinEnvironment.java | 4 +-- .../asm/mixin/injection/InjectionPoint.java | 2 +- .../injection/callback/CallbackInjector.java | 34 +++++-------------- .../asm/mixin/injection/code/Injector.java | 29 ++++++++++++++-- .../injection/invoke/InvokeInjector.java | 4 +-- .../injection/invoke/ModifyArgInjector.java | 13 ++++--- .../injection/modify/BeforeLoadLocal.java | 4 +-- ...InvalidImplicitDiscriminatorException.java | 4 ++- .../modify/LocalVariableDiscriminator.java | 20 ++++------- .../modify/ModifyVariableInjector.java | 15 ++++---- .../InvalidMemberDescriptorException.java | 4 ++- .../mixin/injection/struct/MemberInfo.java | 7 ++-- .../asm/mixin/injection/struct/Target.java | 8 +++-- .../transformer/InvalidMixinException.java | 4 ++- .../mixin/transformer/MixinApplicator.java | 8 ++--- .../asm/mixin/transformer/MixinInfo.java | 3 +- .../mixin/transformer/MixinPreProcessor.java | 2 +- .../transformer/MixinReloadException.java | 4 ++- .../mixin/transformer/MixinTargetContext.java | 6 ++-- .../mixin/transformer/MixinTransformer.java | 7 ++-- .../MixinTransformerModuleCheckClass.java | 3 +- .../asm/obfuscation/SrgContainer.java | 4 ++- .../org/spongepowered/asm/util/Constants.java | 2 +- .../org/spongepowered/asm/util/Locals.java | 15 ++++++-- 28 files changed, 123 insertions(+), 97 deletions(-) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java index af84e57a..3decd055 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgentClassLoader.java @@ -34,6 +34,7 @@ import org.spongepowered.asm.lib.MethodVisitor; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.util.Constants; /** * Class loader that is used to load fake mixin classes so that they can be @@ -115,10 +116,10 @@ class MixinAgentClassLoader extends ClassLoader { Type.getInternalName(Object.class), null); // create init method - MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "", "()V", null, null); + MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, Constants.CTOR, "()V", null, null); mv.visitCode(); mv.visitVarInsn(Opcodes.ALOAD, 0); - mv.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getInternalName(Object.class), "", "()V", false); + mv.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getInternalName(Object.class), Constants.CTOR, "()V", false); mv.visitInsn(Opcodes.RETURN); mv.visitMaxs(1, 1); mv.visitEnd(); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java index da687d8b..96fa77c6 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java @@ -87,7 +87,7 @@ class AnnotatedMixinInjectorHandler extends AnnotatedMixinElementHandler { if (this.mixin.getPrimaryTarget().isImaginary()) { this.ap.printMessage(Kind.WARNING, type + " target requires method signature because enclosing type information is unavailable", method, inject); - } else if (!Constants.INIT.equals(targetMember.name)) { + } else if (!Constants.CTOR.equals(targetMember.name)) { this.ap.printMessage(Kind.WARNING, "Unable to determine signature for " + type + " target method", method, inject); } return null; @@ -95,7 +95,7 @@ class AnnotatedMixinInjectorHandler extends AnnotatedMixinElementHandler { ObfuscationData obfData = this.obf.getObfMethod(new SrgMethod(this.mixin.getPrimaryTargetRef() + "/" + targetMember.name, desc)); if (obfData.isEmpty()) { - Kind error = Constants.INIT.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; + Kind error = Constants.CTOR.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index 19f1f9df..49289b58 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -216,7 +216,7 @@ public class ObfuscationManager implements IObfuscationManager { } } - if (!data.isEmpty() || !Constants.INIT.equals(method.name)) { + if (!data.isEmpty() || !Constants.CTOR.equals(method.name)) { return data; } @@ -238,7 +238,7 @@ public class ObfuscationManager implements IObfuscationManager { } } - if (!data.isEmpty() || !Constants.INIT.equals(method.getSimpleName())) { + if (!data.isEmpty() || !Constants.CTOR.equals(method.getSimpleName())) { return data; } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java b/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java index 8a46ae01..bc7ca989 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java @@ -24,7 +24,6 @@ */ package org.spongepowered.asm.launch; - public class MixinInitialisationError extends Error { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 05a14686..44e09374 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -680,12 +680,12 @@ public class MixinEnvironment implements ITokenProvider { // Sanity check Object version = this.getVersion(); if (version == null || !MixinBootstrap.VERSION.equals(version)) { - throw new RuntimeException("Environment conflict, mismatched versions or you didn't call MixinBootstrap.init()"); + throw new MixinException("Environment conflict, mismatched versions or you didn't call MixinBootstrap.init()"); } // Also sanity check if (this.getClass().getClassLoader() != Launch.class.getClassLoader()) { - throw new RuntimeException("Attempted to init the mixin environment in the wrong classloader"); + throw new MixinException("Attempted to init the mixin environment in the wrong classloader"); } this.options = new boolean[Option.values().length]; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java index ef5ffcb6..84f67f18 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java @@ -152,7 +152,7 @@ public abstract class InjectionPoint { public boolean find(String desc, InsnList insns, Collection nodes) { boolean found = false; - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings("unchecked") ArrayList[] allNodes = new ArrayList[this.components.length]; for (int i = 0; i < this.components.length; i++) { 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 874a60de..ae89da2e 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 @@ -260,7 +260,7 @@ public class CallbackInjector extends Injector { return false; // No @Coerce specified, types must match } - boolean canCoerce = CallbackInjector.canCoerce(inTypes[arg], myTypes[arg]); + boolean canCoerce = Injector.canCoerce(inTypes[arg], myTypes[arg]); if (!canCoerce) { return false; // Can't coerce source type to local type, give up } @@ -313,14 +313,14 @@ public class CallbackInjector extends Injector { super.sanityCheck(target, injectionPoints); if (ASMHelper.methodIsStatic(target.method) != this.isStatic) { - throw new InvalidInjectionException(this.info, "'static' modifier of callback method does not match target in " + this.methodNode.name); + throw new InvalidInjectionException(this.info, "'static' modifier of callback method does not match target in " + this); } - if (Injector.CTOR.equals(target.method.name)) { + if (Constants.CTOR.equals(target.method.name)) { for (InjectionPoint injectionPoint : injectionPoints) { if (!injectionPoint.getClass().equals(BeforeReturn.class)) { throw new InvalidInjectionException(this.info, "Found injection point type " + injectionPoint.getClass().getSimpleName() - + " targetting a ctor in " + this.classNode.name + ". Only RETURN allowed for a ctor target"); + + " targetting a ctor in " + this + ". Only RETURN allowed for a ctor target"); } } } @@ -434,8 +434,8 @@ public class CallbackInjector extends Injector { 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.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); + String message = String.format("LVT in %s has incompatible changes at opcode %d in callback %s.\nExpected: %s\n Found: %s", + callback.target, position, this, expected, found); return message; } @@ -455,7 +455,7 @@ public class CallbackInjector extends Injector { insns.add(new TypeInsnNode(Opcodes.NEW, errorClass)); insns.add(new InsnNode(Opcodes.DUP)); insns.add(new LdcInsnNode(message)); - insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, errorClass, Constants.INIT, "(Ljava/lang/String;)V", false)); + insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, errorClass, Constants.CTOR, "(Ljava/lang/String;)V", false)); insns.add(new InsnNode(Opcodes.ATHROW)); return method; } @@ -552,10 +552,10 @@ public class CallbackInjector extends Injector { if (callback.isAtReturn) { callback.add(new VarInsnNode(callback.target.returnType.getOpcode(Opcodes.ILOAD), callback.marshallVar), true, !store); callback.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, - callback.target.callbackInfoClass, Injector.CTOR, CallbackInfo.getConstructorDescriptor(callback.target.returnType), false)); + callback.target.callbackInfoClass, Constants.CTOR, CallbackInfo.getConstructorDescriptor(callback.target.returnType), false)); } else { callback.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, - callback.target.callbackInfoClass, Injector.CTOR, CallbackInfo.getConstructorDescriptor(), false)); + callback.target.callbackInfoClass, Constants.CTOR, CallbackInfo.getConstructorDescriptor(), false)); } } @@ -656,21 +656,5 @@ public class CallbackInjector extends Injector { } return list; } - - public static boolean canCoerce(Type from, Type to) { - return CallbackInjector.canCoerce(from.getDescriptor(), to.getDescriptor()); - } - - public static boolean canCoerce(String from, String to) { - if (from.length() > 1 || to.length() > 1) { - return false; - } - - return CallbackInjector.canCoerce(from.charAt(0), to.charAt(0)); - } - - public static boolean canCoerce(char from, char to) { - return to == 'I' && "IBSCZ".indexOf(from) > -1; - } } 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 304f8d5c..c52d789e 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 @@ -38,6 +38,7 @@ import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; +import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.util.ASMHelper; @@ -48,8 +49,6 @@ import com.google.common.base.Joiner; * Base class for bytecode injectors */ public abstract class Injector { - - protected static final String CTOR = ""; /** * Injection info @@ -104,6 +103,11 @@ public abstract class Injector { this.returnType = Type.getReturnType(this.methodNode.desc); this.isStatic = ASMHelper.methodIsStatic(this.methodNode); } + + @Override + public String toString() { + return String.format("%s::%s", this.classNode.name, this.methodNode.name); + } /** * Inject into the specified method at the specified injection points @@ -152,7 +156,9 @@ public abstract class Injector { } protected void sanityCheck(Target target, List injectionPoints) { - // stub for subclasses + if (target.classNode != this.classNode) { + throw new InvalidInjectionException(this.info, "Target class does not match injector class in " + this); + } } protected abstract void inject(Target target, AbstractInsnNode node); @@ -183,4 +189,21 @@ public abstract class Injector { protected static String printArgs(Type[] args) { return "(" + Joiner.on("").join(args) + ")"; } + + public static boolean canCoerce(Type from, Type to) { + return Injector.canCoerce(from.getDescriptor(), to.getDescriptor()); + } + + public static boolean canCoerce(String from, String to) { + if (from.length() > 1 || to.length() > 1) { + return false; + } + + return Injector.canCoerce(from.charAt(0), to.charAt(0)); + } + + public static boolean canCoerce(char from, char to) { + return to == 'I' && "IBSCZ".indexOf(from) > -1; + } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index 967bd2d6..65722dfd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -64,7 +64,7 @@ public abstract class InvokeInjector extends Injector { super.sanityCheck(target, injectionPoints); if (target.isStatic != this.isStatic) { - throw new InvalidInjectionException(this.info, "'static' modifier of callback method does not match target in " + this.methodNode.name); + throw new InvalidInjectionException(this.info, "'static' modifier of callback method does not match target in " + this); } } @@ -77,7 +77,7 @@ public abstract class InvokeInjector extends Injector { protected void inject(Target target, AbstractInsnNode node) { if (!(node instanceof MethodInsnNode)) { throw new InvalidInjectionException(this.info, this.annotationType + " annotation on is targetting a non-method insn in " + target - + " in " + this.classNode.name + "/" + this.methodNode.name); + + " in " + this); } this.inject(target, (MethodInsnNode)node); 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 0ae600b4..45fad1a4 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 @@ -76,7 +76,7 @@ public class ModifyArgInjector extends InvokeInjector { if (this.singleArgMode) { if (!this.methodArgs[0].equals(this.returnType)) { - throw new InvalidInjectionException(this.info, "@ModifyArg return type on " + this.methodNode.name + " must match the parameter type." + throw new InvalidInjectionException(this.info, "@ModifyArg return type on " + this + " must match the parameter type." + " ARG=" + this.methodArgs[0] + " RETURN=" + this.returnType); } } @@ -118,8 +118,8 @@ public class ModifyArgInjector extends InvokeInjector { */ private int injectMultiArgHandler(Target target, Type[] args, int argIndex, InsnList insns) { if (!Arrays.equals(args, this.methodArgs)) { - throw new InvalidInjectionException(this.info, "@ModifyArg method " + this.methodNode.name + " targets a method with an invalid" - + " signature " + Injector.printArgs(args) + ", expected " + Injector.printArgs(this.methodArgs)); + throw new InvalidInjectionException(this.info, "@ModifyArg method " + this + " targets a method with an invalid signature " + + Injector.printArgs(args) + ", expected " + Injector.printArgs(this.methodArgs)); } int[] argMap = this.storeArgs(target, args, insns, 0); @@ -133,7 +133,7 @@ public class ModifyArgInjector extends InvokeInjector { if (this.index > -1) { if (this.index >= args.length || !args[this.index].equals(this.returnType)) { throw new InvalidInjectionException(this.info, "Specified index " + this.index + " for @ModifyArg is invalid for args " - + Injector.printArgs(args) + ", expected " + this.returnType + " on " + this.methodNode.name); + + Injector.printArgs(args) + ", expected " + this.returnType + " on " + this); } return this.index; } @@ -147,8 +147,7 @@ public class ModifyArgInjector extends InvokeInjector { if (argIndex != -1) { throw new InvalidInjectionException(this.info, "Found duplicate args with index [" + argIndex + ", " + arg + "] matching type " - + this.returnType + " for @ModifyArg target " + target + " in " + this.classNode.name + "/" + this.methodNode.name - + ". Please specify index of desired arg."); + + this.returnType + " for @ModifyArg target " + target + " in " + this + ". Please specify index of desired arg."); } argIndex = arg; @@ -156,7 +155,7 @@ public class ModifyArgInjector extends InvokeInjector { if (argIndex == -1) { throw new InvalidInjectionException(this.info, "Could not find arg matching type " + this.returnType + " for @ModifyArg target " - + target + " in " + this.classNode.name + "/" + this.methodNode.name); + + target + " in " + this); } return argIndex; 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 d9cb436e..b00c0e6f 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 @@ -193,14 +193,14 @@ public class BeforeLoadLocal extends ContextualInjectionPoint { while (iter.hasNext()) { AbstractInsnNode insn = iter.next(); if (state.isPendingCheck()) { - int local = this.discriminator.findLocal(this.mixin, this.returnType, this.discriminator.isArgsOnly(), target, insn); + int local = this.discriminator.findLocal(this.returnType, this.discriminator.isArgsOnly(), target, insn); state.check(nodes, insn, local); } else if (insn instanceof VarInsnNode && insn.getOpcode() == this.opcode && (this.ordinal == -1 || !state.success())) { state.register((VarInsnNode)insn); if (this.opcodeAfter) { state.setPendingCheck(); } else { - int local = this.discriminator.findLocal(this.mixin, this.returnType, this.discriminator.isArgsOnly(), target, insn); + int local = this.discriminator.findLocal(this.returnType, this.discriminator.isArgsOnly(), target, insn); state.check(nodes, insn, local); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java index 0504cb56..733103ff 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java @@ -24,7 +24,9 @@ */ package org.spongepowered.asm.mixin.injection.modify; -public class InvalidImplicitDiscriminatorException extends RuntimeException { +import org.spongepowered.asm.mixin.MixinException; + +public class InvalidImplicitDiscriminatorException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java index 580dcc5c..50ad557a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java @@ -34,11 +34,9 @@ import java.util.Set; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.LocalVariableNode; import org.spongepowered.asm.mixin.injection.modify.LocalVariableDiscriminator.Context.Local; import org.spongepowered.asm.mixin.injection.struct.Target; -import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Locals; import org.spongepowered.asm.util.PrettyPrinter; @@ -122,23 +120,19 @@ public class LocalVariableDiscriminator { */ private final boolean isStatic; - public Context(MixinTargetContext mixin, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { - this(mixin.getTargetClass(), returnType, argsOnly, target, node); - } - - public Context(ClassNode targetClass, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { + public Context(Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { this.isStatic = ASMHelper.methodIsStatic(target.method); this.returnType = returnType; this.target = target; this.node = node; this.baseArgIndex = this.isStatic ? 0 : 1; - this.locals = this.initLocals(targetClass, target, argsOnly, node); + this.locals = this.initLocals(target, argsOnly, node); this.initOrdinals(); } - private Local[] initLocals(ClassNode targetClass, Target target, boolean argsOnly, AbstractInsnNode node) { + private Local[] initLocals(Target target, boolean argsOnly, AbstractInsnNode node) { if (!argsOnly) { - LocalVariableNode[] locals = Locals.getLocalsAt(targetClass, target.method, node); + LocalVariableNode[] locals = Locals.getLocalsAt(target.classNode, target.method, node); if (locals != null) { Local[] lvt = new Local[locals.length]; for (int l = 0; l < locals.length; l++) { @@ -152,7 +146,7 @@ public class LocalVariableDiscriminator { Local[] lvt = new Local[this.baseArgIndex + target.arguments.length]; if (!this.isStatic) { - lvt[0] = new Local("this", Type.getType(targetClass.name)); + lvt[0] = new Local("this", Type.getType(target.classNode.name)); } for (int local = this.baseArgIndex; local < lvt.length; local++) { Type arg = target.arguments[local - this.baseArgIndex]; @@ -277,9 +271,9 @@ public class LocalVariableDiscriminator { return this.ordinal < 0 && this.index < context.baseArgIndex && this.names.isEmpty(); } - public int findLocal(MixinTargetContext mixin, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { + public int findLocal(Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { try { - return this.findLocal(new Context(mixin, returnType, argsOnly, target, node)); + return this.findLocal(new Context(returnType, argsOnly, target, node)); } catch (InvalidImplicitDiscriminatorException ex) { return -1; } 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 0a2d60bc..20c6b6be 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 @@ -30,7 +30,6 @@ import java.util.List; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; -import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.lib.tree.VarInsnNode; @@ -62,8 +61,8 @@ public class ModifyVariableInjector extends Injector { */ final InsnList insns = new InsnList(); - public Context(ClassNode targetClass, Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { - super(targetClass, returnType, argsOnly, target, node); + public Context(Type returnType, boolean argsOnly, Target target, AbstractInsnNode node) { + super(returnType, argsOnly, target, node); } } @@ -126,16 +125,16 @@ public class ModifyVariableInjector extends Injector { super.sanityCheck(target, injectionPoints); if (target.isStatic != this.isStatic) { - throw new InvalidInjectionException(this.info, "'static' of variable modifier method does not match target in " + this.methodNode.name); + throw new InvalidInjectionException(this.info, "'static' of variable modifier method does not match target in " + this); } int ordinal = this.discriminator.getOrdinal(); if (ordinal < -1) { - throw new InvalidInjectionException(this.info, "Invalid ordinal " + ordinal + " specified in " + this.methodNode.name); + throw new InvalidInjectionException(this.info, "Invalid ordinal " + ordinal + " specified in " + this); } if (this.discriminator.getIndex() == 0 && !this.isStatic) { - throw new InvalidInjectionException(this.info, "Invalid index 0 specified in non-static variable modifier " + this.methodNode.name); + throw new InvalidInjectionException(this.info, "Invalid index 0 specified in non-static variable modifier " + this); } } @@ -144,7 +143,7 @@ public class ModifyVariableInjector extends Injector { */ @Override protected void inject(Target target, AbstractInsnNode node) { - Context context = new Context(this.classNode, this.returnType, this.discriminator.isArgsOnly(), target, node); + Context context = new Context(this.returnType, this.discriminator.isArgsOnly(), target, node); if (this.print) { this.printLocals(context); @@ -156,7 +155,7 @@ public class ModifyVariableInjector extends Injector { this.inject(context, local); } } catch (InvalidImplicitDiscriminatorException ex) { - throw new InvalidInjectionException(this.info, "Implicit variable modifier injection failed in " + this.methodNode.name, ex); + throw new InvalidInjectionException(this.info, "Implicit variable modifier injection failed in " + this, ex); } target.insns.insertBefore(node, context.insns); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java index 3b01deb4..44bff320 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java @@ -24,7 +24,9 @@ */ package org.spongepowered.asm.mixin.injection.struct; -public class InvalidMemberDescriptorException extends RuntimeException { +import org.spongepowered.asm.mixin.MixinException; + +public class InvalidMemberDescriptorException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 11ed80bc..4a2ce096 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -28,6 +28,7 @@ import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.mixin.MixinException; import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.SignaturePrinter; @@ -219,7 +220,7 @@ public class MemberInfo { */ public String toSrg() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqualified reference to SRG mapping"); + throw new MixinException("Cannot convert unqualified reference to SRG mapping"); } if (this.desc.startsWith("(")) { @@ -239,11 +240,11 @@ public class MemberInfo { public SrgMethod asSrgMethod() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqualified reference to SrgMethod"); + throw new MixinException("Cannot convert unqualified reference to SrgMethod"); } if (this.isField()) { - throw new RuntimeException("Cannot convert a non-method reference to SrgMethod"); + throw new MixinException("Cannot convert a non-method reference to SrgMethod"); } return new SrgMethod(this.owner + "/" + this.name, this.desc); 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 5c986faf..f387b8cf 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 @@ -25,6 +25,7 @@ package org.spongepowered.asm.mixin.injection.struct; import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -36,6 +37,8 @@ import org.spongepowered.asm.util.ASMHelper; */ public class Target { + public final ClassNode classNode; + /** * Target method */ @@ -91,7 +94,8 @@ public class Target { * * @param method target method */ - public Target(MethodNode method) { + public Target(ClassNode classNode, MethodNode method) { + this.classNode = classNode; this.method = method; this.insns = method.instructions; this.isStatic = ASMHelper.methodIsStatic(method); @@ -266,6 +270,6 @@ public class Target { @Override public String toString() { - return this.method.name + this.method.desc; + return String.format("%s::%s%s", this.classNode.name, this.method.name, this.method.desc); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java index 27a51454..c726fc63 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java @@ -24,7 +24,9 @@ */ package org.spongepowered.asm.mixin.transformer; -public class InvalidMixinException extends RuntimeException { +import org.spongepowered.asm.mixin.MixinException; + +public class InvalidMixinException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 6a49c70b..739e21b4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -520,7 +520,7 @@ public class MixinApplicator { // Patch the initialiser into the target class ctors for (MethodNode method : this.targetClass.methods) { - if (Constants.INIT.equals(method.name)) { + if (Constants.CTOR.equals(method.name)) { method.maxStack = Math.max(method.maxStack, ctor.maxStack); this.injectInitialiser(mixin, method, initialiser); } @@ -537,7 +537,7 @@ public class MixinApplicator { MethodNode ctor = null; for (MethodNode mixinMethod : mixin.getMethods()) { - if (Constants.INIT.equals(mixinMethod.name) && MixinApplicator.hasLineNumbers(mixinMethod)) { + if (Constants.CTOR.equals(mixinMethod.name) && MixinApplicator.hasLineNumbers(mixinMethod)) { if (ctor == null) { ctor = mixinMethod; } else { @@ -569,7 +569,7 @@ public class MixinApplicator { line = ((LineNumberNode)insn).line; lineNumberIsValid = true; } else if (insn instanceof MethodInsnNode) { - if (insn.getOpcode() == Opcodes.INVOKESPECIAL && Constants.INIT.equals(((MethodInsnNode)insn).name) && superIndex == -1) { + if (insn.getOpcode() == Opcodes.INVOKESPECIAL && Constants.CTOR.equals(((MethodInsnNode)insn).name) && superIndex == -1) { superIndex = ctor.instructions.indexOf(insn); start = line; } @@ -681,7 +681,7 @@ public class MixinApplicator { for (Iterator iter = ctor.instructions.iterator(0); iter.hasNext();) { AbstractInsnNode insn = iter.next(); - if (insn.getOpcode() == Opcodes.INVOKESPECIAL && Constants.INIT.equals(((MethodInsnNode)insn).name)) { + if (insn.getOpcode() == Opcodes.INVOKESPECIAL && Constants.CTOR.equals(((MethodInsnNode)insn).name)) { for (AbstractInsnNode node : initialiser) { if (node instanceof LabelNode) { continue; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 6fc868b1..954025ae 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -48,6 +48,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import org.spongepowered.asm.mixin.MixinException; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; @@ -358,7 +359,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { private void checkTarget(String targetClassName, ClassInfo targetInfo, boolean checkPublic) throws InvalidMixinException { if (targetInfo == null) { - throw new RuntimeException("@Mixin target " + targetClassName + " was not found " + this); + throw new MixinException("@Mixin target " + targetClassName + " was not found " + this); } boolean targetIsInterface = targetInfo.isInterface(); if (targetIsInterface != this.isInterfaceMixin) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index d3605845..95364409 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -225,7 +225,7 @@ class MixinPreProcessor { method.renameTo(target.name); } - if (Constants.INIT.equals(target.name)) { + if (Constants.CTOR.equals(target.name)) { throw new InvalidMixinException(this.mixin, "Nice try! Cannot alias a constructor!"); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java index c9ad46f6..b9f45b33 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java @@ -24,11 +24,13 @@ */ package org.spongepowered.asm.mixin.transformer; +import org.spongepowered.asm.mixin.MixinException; + /** * An exception that occurs when a mixin reloads and does something it is * normally allowed to do but isn't due to reloading restrictions. */ -public class MixinReloadException extends RuntimeException { +public class MixinReloadException extends MixinException { private static final long serialVersionUID = 1L; private final MixinInfo mixinInfo; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 2ccd9ca7..f5cfe672 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -524,7 +524,7 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private void processImaginarySuper(MethodNode method, FieldInsnNode fieldInsn) { if (fieldInsn.getOpcode() != Opcodes.GETFIELD) { - if (Constants.INIT.equals(method.name)) { + if (Constants.CTOR.equals(method.name)) { throw new InvalidMixinException(this, "Illegal imaginary super declaration: field " + fieldInsn.name + " must not specify an initialiser"); } @@ -581,7 +581,7 @@ public class MixinTargetContext implements IReferenceMapperContext { } private void updateBinding(MethodNode method, MemberRef methodRef, Traversal traversal) { - if (Constants.INIT.equals(method.name) || methodRef.getOwner().equals(this.targetClass.name) || this.targetClass.name.startsWith("<")) { + if (Constants.CTOR.equals(method.name) || methodRef.getOwner().equals(this.targetClass.name) || this.targetClass.name.startsWith("<")) { return; } @@ -713,7 +713,7 @@ public class MixinTargetContext implements IReferenceMapperContext { String targetName = method.name + method.desc; Target target = this.targetMethods.get(targetName); if (target == null) { - target = new Target(method); + target = new Target(this.targetClass, method); this.targetMethods.put(targetName, target); } return target; 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 ca19c0f9..7e1b9ae8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -49,6 +49,7 @@ import org.spongepowered.asm.mixin.MixinApplyError; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import org.spongepowered.asm.mixin.MixinException; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler.ErrorAction; @@ -293,7 +294,7 @@ public class MixinTransformer extends TreeTransformer { Object globalMixinTransformer = environment.getActiveTransformer(); if (globalMixinTransformer instanceof IClassTransformer) { - throw new RuntimeException("Terminating MixinTransformer instance " + this); + throw new MixinException("Terminating MixinTransformer instance " + this); } // I am a leaf on the wind @@ -391,7 +392,7 @@ public class MixinTransformer extends TreeTransformer { this.init(environment); } catch (Exception ex) { this.lock.pop(); - throw new RuntimeException(ex); + throw new MixinException(ex); } } @@ -425,7 +426,7 @@ public class MixinTransformer extends TreeTransformer { if (mixins != null) { // Re-entrance is "safe" as long as we don't need to apply any mixins, if there are mixins then we need to panic now if (locked) { - this.logger.warn("Re-entrance detected, this will cause serious problems.", new RuntimeException()); + this.logger.warn("Re-entrance detected, this will cause serious problems.", new MixinException()); throw new MixinApplyError("Re-entrance error."); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java index ac9029fb..bd9cf76a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java @@ -26,6 +26,7 @@ package org.spongepowered.asm.mixin.transformer; import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.util.CheckClassAdapter; +import org.spongepowered.asm.mixin.MixinException; /** * Mixin transformer module which runs CheckClassAdapter on the post-mixin @@ -33,7 +34,7 @@ import org.spongepowered.asm.lib.util.CheckClassAdapter; */ public class MixinTransformerModuleCheckClass implements IMixinTransformerModule { - public static class ValidationFailedException extends RuntimeException { + public static class ValidationFailedException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java index c2a9289f..a8ba90b8 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java @@ -28,6 +28,8 @@ import java.io.File; import java.io.IOException; import java.nio.charset.Charset; +import org.spongepowered.asm.mixin.MixinException; + import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.io.Files; @@ -64,7 +66,7 @@ public class SrgContainer { } else if (type.equals("MD")) { this.methodMap.forcePut(new SrgMethod(args[0], args[1]), new SrgMethod(args[2], args[3])); } else { - throw new RuntimeException("Invalid SRG file: " + srg); + throw new MixinException("Invalid SRG file: " + srg); } } } diff --git a/src/main/java/org/spongepowered/asm/util/Constants.java b/src/main/java/org/spongepowered/asm/util/Constants.java index fe96a6b8..45c69f42 100644 --- a/src/main/java/org/spongepowered/asm/util/Constants.java +++ b/src/main/java/org/spongepowered/asm/util/Constants.java @@ -31,7 +31,7 @@ import org.spongepowered.asm.mixin.Mixin; */ public abstract class Constants { - public static final String INIT = ""; + public static final String CTOR = ""; public static final String CLINIT = ""; public static final String IMAGINARY_SUPER = "super$"; public static final String DEBUG_OUTPUT_PATH = ".mixin.out"; diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index 4ff784b0..1bb3aa92 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -47,6 +47,7 @@ import org.spongepowered.asm.lib.tree.analysis.BasicValue; import org.spongepowered.asm.lib.tree.analysis.Frame; import org.spongepowered.asm.mixin.transformer.ClassInfo; import org.spongepowered.asm.mixin.transformer.ClassInfo.FrameData; +import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.MixinVerifier; /** @@ -125,7 +126,15 @@ public class Locals { node = Locals.nextNode(method.instructions, node); } - List frames = ClassInfo.forName(classNode.name).findMethod(method).getFrames(); + ClassInfo classInfo = ClassInfo.forName(classNode.name); + if (classInfo == null) { + throw new LVTGeneratorException("Could not load class metadata for " + classNode.name + " generating LVT for " + method.name); + } + Method methodInfo = classInfo.findMethod(method); + if (methodInfo == null) { + throw new LVTGeneratorException("Could not locate method metadata for " + method.name + " generating LVT in " + classNode.name); + } + List frames = methodInfo.getFrames(); LocalVariableNode[] frame = new LocalVariableNode[method.maxLocals]; int local = 0, index = 0; @@ -176,7 +185,7 @@ public class Locals { frame[framePos] = null; // TOP } } else { - throw new RuntimeException("Unrecognised locals opcode " + localType + " in locals array at position " + localPos + throw new LVTGeneratorException("Unrecognised locals opcode " + localType + " in locals array at position " + localPos + " in " + classNode.name + "." + method.name + method.desc); } } else if (localType == null) { @@ -184,7 +193,7 @@ public class Locals { frame[framePos] = null; } } else { - throw new RuntimeException("Invalid value " + localType + " in locals array at position " + localPos + throw new LVTGeneratorException("Invalid value " + localType + " in locals array at position " + localPos + " in " + classNode.name + "." + method.name + method.desc); } } From 5a79cacc1467b053418a4cc00ea443f6eea25587 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 2 Feb 2016 18:30:23 +0000 Subject: [PATCH 107/169] Allow Redirect annotations to work on fields as well --- .../asm/mixin/MixinException.java | 46 ++++++ .../asm/mixin/injection/Redirect.java | 38 ++++- .../injection/invoke/InvokeInjector.java | 4 +- .../injection/invoke/ModifyArgInjector.java | 2 +- .../injection/invoke/RedirectInjector.java | 134 ++++++++++++++++-- .../org/spongepowered/asm/util/ASMHelper.java | 45 ++++++ .../asm/util/LVTGeneratorException.java | 41 ++++++ 7 files changed, 295 insertions(+), 15 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/MixinException.java create mode 100644 src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinException.java b/src/main/java/org/spongepowered/asm/mixin/MixinException.java new file mode 100644 index 00000000..ef71da5d --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/MixinException.java @@ -0,0 +1,46 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +public class MixinException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public MixinException() { + } + + public MixinException(String message) { + super(message); + } + + public MixinException(Throwable cause) { + super(cause); + } + + public MixinException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java index 4e62a3ff..8fa55f71 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java @@ -33,7 +33,9 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Option; /** *

Specifies that this mixin method should redirect the specified - * {@link #method} call to the method decorated with this annotation.

+ * method call or field access to the method decorated with this annotation.

+ * + *

Method Redirect Mode

* *

The handler method signature must match the hooked method precisely * but prepended with an arg of the owning object's type to accept the @@ -70,6 +72,40 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Option; *

public boolean barProxy(Foo someObject, int abc, int def,
  *   int someInt, String someString)
* + * + *

Field Access Redirect Mode

+ * + *

The handler method signature varies depending on whether the redirector is + * handling a field write (PUTFIELD, PUTSTATIC) or a + * field read (GETFIELD, GETSTATIC).

+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
Operation (OPCODE)Handler signature
Read static field (GETSTATIC)private FieldType getFieldValue()
Read instance field (GETFIELD)private FieldType getFieldValue(OwnerType + * owner)
Write static field (PUTSTATIC)private void setFieldValue(FieldType value)
Write instance field (PUTFIELD)private void getFieldValue(OwnerType + * owner, FieldType value)
+ * + *

Field redirectors do not support capture of enclosing method arguments. + *

*/ @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index 65722dfd..e28d3785 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -80,7 +80,7 @@ public abstract class InvokeInjector extends Injector { + " in " + this); } - this.inject(target, (MethodInsnNode)node); + this.injectAtInvoke(target, (MethodInsnNode)node); } /** @@ -89,7 +89,7 @@ public abstract class InvokeInjector extends Injector { * @param target Target to inject into * @param node Discovered instruction node */ - protected abstract void inject(Target target, MethodInsnNode node); + protected abstract void injectAtInvoke(Target target, MethodInsnNode node); /** * @param args handler arguments 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 45fad1a4..b67b2afa 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 @@ -86,7 +86,7 @@ public class ModifyArgInjector extends InvokeInjector { * Do the injection */ @Override - protected void inject(Target target, MethodInsnNode node) { + protected void injectAtInvoke(Target target, MethodInsnNode node) { Type[] args = Type.getArgumentTypes(node.desc); int argIndex = this.findArgIndex(target, args); InsnList insns = new InsnList(); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index 91ec7da1..e253961a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -26,8 +26,12 @@ package org.spongepowered.asm.mixin.injection.invoke; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.InsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; @@ -38,11 +42,12 @@ import com.google.common.collect.ObjectArrays; import com.google.common.primitives.Ints; /** - *

A bytecode injector which allows a method call to be redirected to the - * annotated handler method. The handler method signature must match the hooked - * method precisely but prepended with an arg of the owning object's type - * to accept the object instance the method was going to be invoked on. For - * example when hooking the following call:

+ *

A bytecode injector which allows a method call or field access to be + * redirected to the annotated handler method. For method redirects, the handler + * method signature must match the hooked method precisely but prepended + * with an arg of the owning object's type to accept the object instance the + * method was going to be invoked on. For example when hooking the following + * call:

* *
  *   int abc = 0;
@@ -62,6 +67,9 @@ import com.google.common.primitives.Ints;
  * 

For obvious reasons this does not apply for static methods, for static * methods it is sufficient that the signature simply match the hooked method. *

+ * + *

For field redirections, see the details in {@link Redirect} for the + * required signature of the handler method.

*/ public class RedirectInjector extends InvokeInjector { @@ -71,12 +79,33 @@ public class RedirectInjector extends InvokeInjector { public RedirectInjector(InjectionInfo info) { super(info, "@Redirect"); } - - /** - * Do the injection + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.injection.callback.BytecodeInjector + * #inject(org.spongepowered.asm.mixin.injection.callback.Target, + * org.objectweb.asm.tree.AbstractInsnNode) */ @Override - protected void inject(Target target, MethodInsnNode node) { + protected void inject(Target target, AbstractInsnNode node) { + if (node instanceof MethodInsnNode) { + this.injectAtInvoke(target, (MethodInsnNode)node); + return; + } + + if (node instanceof FieldInsnNode) { + this.injectAtFieldAccess(target, (FieldInsnNode)node); + return; + } + + throw new InvalidInjectionException(this.info, this.annotationType + " annotation on is targetting an invalid insn in " + + target + " in " + this); + } + + /** + * Redirect a method invocation + */ + @Override + protected void injectAtInvoke(Target target, MethodInsnNode node) { boolean injectTargetParams = false; boolean targetIsStatic = node.getOpcode() == Opcodes.INVOKESTATIC; Type ownerType = Type.getType("L" + node.owner + ";"); @@ -90,8 +119,8 @@ public class RedirectInjector extends InvokeInjector { if (alternateDesc.equals(this.methodNode.desc)) { injectTargetParams = true; } else { - throw new InvalidInjectionException(this.info, "@Redirect handler method " + this.methodNode.name + " has an invalid signature " - + ", expected " + desc + " found " + this.methodNode.desc); + throw new InvalidInjectionException(this.info, this.annotationType + " handler method " + this + + " has an invalid signature, expected " + desc + " found " + this.methodNode.desc); } } @@ -112,4 +141,87 @@ public class RedirectInjector extends InvokeInjector { target.addToLocals(extraLocals); target.addToStack(extraStack); } + + /** + * Redirect a field get or set operation + */ + private void injectAtFieldAccess(Target target, FieldInsnNode node) { + boolean staticField = node.getOpcode() == Opcodes.GETSTATIC || node.getOpcode() == Opcodes.PUTSTATIC; + Type ownerType = Type.getType("L" + node.owner + ";"); + Type fieldType = Type.getType(node.desc); + + InsnList insns = new InsnList(); + int extraStack = 0; + if (node.getOpcode() == Opcodes.GETSTATIC || node.getOpcode() == Opcodes.GETFIELD) { + extraStack = this.injectAtGetField(insns, target, node, staticField, ownerType, fieldType); + } else if (node.getOpcode() == Opcodes.PUTSTATIC || node.getOpcode() == Opcodes.PUTFIELD) { + extraStack = this.injectAtPutField(insns, target, node, staticField, ownerType, fieldType); + } else { + throw new InvalidInjectionException(this.info, "Unspported opcode " + node.getOpcode() + " on FieldInsnNode for " + this.info); + } + + target.insns.insertBefore(node, insns); + target.insns.remove(node); + target.addToStack(extraStack); + } + + /** + * Inject opcodes to redirect a field getter. The injection will vary based + * on the staticness of the field and the handler thus there are four + * possible scenarios based on the possible combinations of static on the + * handler and the field itself. + */ + private int injectAtGetField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { + String handlerDesc = staticField ? ASMHelper.generateDescriptor(fieldType) : ASMHelper.generateDescriptor(fieldType, owner); + this.checkDescriptor(handlerDesc, "getter"); + + if (!this.isStatic) { + insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); + if (!staticField) { + insns.add(new InsnNode(Opcodes.SWAP)); + } + } + + this.invokeHandler(insns); + return this.isStatic ? 0 : 1; + } + + /** + * Inject opcodes to redirect a field setter. The injection will vary based + * on the staticness of the field and the handler thus there are four + * possible scenarios based on the possible combinations of static on the + * handler and the field itself. + */ + private int injectAtPutField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { + String handlerDesc = staticField ? ASMHelper.generateDescriptor(null, fieldType) : ASMHelper.generateDescriptor(null, owner, fieldType); + this.checkDescriptor(handlerDesc, "setter"); + + if (!this.isStatic) { + if (staticField) { + insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); + insns.add(new InsnNode(Opcodes.SWAP)); + } else { + int marshallVar = target.allocateLocals(fieldType.getSize()); + insns.add(new VarInsnNode(fieldType.getOpcode(Opcodes.ISTORE), marshallVar)); + insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); + insns.add(new InsnNode(Opcodes.SWAP)); + insns.add(new VarInsnNode(fieldType.getOpcode(Opcodes.ILOAD), marshallVar)); + } + } + + this.invokeHandler(insns); + return !this.isStatic && !staticField ? 1 : 0; + } + + /** + * Check that the handler descriptor matches the calculated descriptor for + * the field access being redirected. + */ + private void checkDescriptor(String handlerDesc, String type) { + if (!this.methodNode.desc.equals(handlerDesc)) { + throw new InvalidInjectionException(this.info, this.annotationType + " field " + type + " " + this + + " has an invalid signature. Expected " + handlerDesc + " but found " + this.methodNode.desc); + } + } + } diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index b22d18b3..0e6f10aa 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -898,4 +898,49 @@ public class ASMHelper { return labels; } + + /** + * @param obfType + * @param returnType + * @param args + */ + public static String generateDescriptor(/*int obfType, */Object returnType, Object... args) + { + StringBuilder sb = new StringBuilder().append('('); + + for (Object arg : args) + { + sb.append(ASMHelper.toDescriptor(/*obfType, */arg)); + } + + return sb.append(')').append(returnType != null ? ASMHelper.toDescriptor(/*obfType, */returnType) : "V").toString(); + } + + /** + * @param obfType + * @param arg + */ + private static String toDescriptor(/*int obfType, */Object arg) + { +// if (arg instanceof Obf) +// { +// return ((Obf)arg).getDescriptor(obfType); +// } +// else + if (arg instanceof String) + { + return (String)arg; + } + else if (arg instanceof Type) + { + return arg.toString(); + } + else if (arg instanceof Class) + { + return Type.getDescriptor((Class)arg).toString(); + } + + return arg == null ? "" : arg.toString(); + } + } diff --git a/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java b/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java new file mode 100644 index 00000000..f6ba9af5 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java @@ -0,0 +1,41 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.util; + +import org.spongepowered.asm.mixin.MixinException; + +public class LVTGeneratorException extends MixinException { + + private static final long serialVersionUID = 1L; + + public LVTGeneratorException(String message) { + super(message); + } + + public LVTGeneratorException(String message, Throwable cause) { + super(message, cause); + } + +} From b2d35963f80f862b7fe906de6140db12e8422c5f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 2 Feb 2016 18:31:30 +0000 Subject: [PATCH 108/169] Tidy up code stolen from BytecodeUtilities --- .../org/spongepowered/asm/util/ASMHelper.java | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 0e6f10aa..917e4600 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -900,46 +900,30 @@ public class ASMHelper { } /** - * @param obfType * @param returnType * @param args */ - public static String generateDescriptor(/*int obfType, */Object returnType, Object... args) - { + public static String generateDescriptor(Object returnType, Object... args) { StringBuilder sb = new StringBuilder().append('('); - for (Object arg : args) - { + for (Object arg : args) { sb.append(ASMHelper.toDescriptor(/*obfType, */arg)); } - return sb.append(')').append(returnType != null ? ASMHelper.toDescriptor(/*obfType, */returnType) : "V").toString(); + return sb.append(')').append(returnType != null ? ASMHelper.toDescriptor(returnType) : "V").toString(); } /** - * @param obfType * @param arg */ - private static String toDescriptor(/*int obfType, */Object arg) - { -// if (arg instanceof Obf) -// { -// return ((Obf)arg).getDescriptor(obfType); -// } -// else - if (arg instanceof String) - { + private static String toDescriptor(Object arg) { + if (arg instanceof String) { return (String)arg; - } - else if (arg instanceof Type) - { + } else if (arg instanceof Type) { return arg.toString(); - } - else if (arg instanceof Class) - { + } else if (arg instanceof Class) { return Type.getDescriptor((Class)arg).toString(); } - return arg == null ? "" : arg.toString(); } From aa47a402ed69550174ccc31764336dfb1ea23065 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 2 Feb 2016 18:36:27 +0000 Subject: [PATCH 109/169] Add missing exceptions from housekeeping --- .../asm/mixin/MixinException.java | 46 +++++++++++++++++++ .../asm/util/LVTGeneratorException.java | 41 +++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 src/main/java/org/spongepowered/asm/mixin/MixinException.java create mode 100644 src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinException.java b/src/main/java/org/spongepowered/asm/mixin/MixinException.java new file mode 100644 index 00000000..ef71da5d --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/MixinException.java @@ -0,0 +1,46 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +public class MixinException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public MixinException() { + } + + public MixinException(String message) { + super(message); + } + + public MixinException(Throwable cause) { + super(cause); + } + + public MixinException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java b/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java new file mode 100644 index 00000000..f6ba9af5 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java @@ -0,0 +1,41 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.util; + +import org.spongepowered.asm.mixin.MixinException; + +public class LVTGeneratorException extends MixinException { + + private static final long serialVersionUID = 1L; + + public LVTGeneratorException(String message) { + super(message); + } + + public LVTGeneratorException(String message, Throwable cause) { + super(message, cause); + } + +} From 27bd5c99116d4c19146c3e93e68edd4da4d4d0d4 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 3 Feb 2016 00:22:14 +0000 Subject: [PATCH 110/169] Allow capture of containing method args --- .../asm/mixin/injection/Redirect.java | 6 ++- .../injection/invoke/RedirectInjector.java | 48 +++++++++++++------ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java index 8fa55f71..5bd3b6c6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java @@ -104,8 +104,10 @@ import org.spongepowered.asm.mixin.MixinEnvironment.Option; * * * - *

Field redirectors do not support capture of enclosing method arguments. - *

+ *

It is also possible to capture the arguments of the target method in + * addition to the arguments being passed to the method call (for example in + * the code above this would be the someInt and someString + * arguments) by appending the arguments to the method signature.

*/ @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index e253961a..40882861 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -33,11 +33,13 @@ import org.spongepowered.asm.lib.tree.InsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; +import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.util.ASMHelper; +import com.google.common.base.Joiner; import com.google.common.collect.ObjectArrays; import com.google.common.primitives.Ints; @@ -151,18 +153,16 @@ public class RedirectInjector extends InvokeInjector { Type fieldType = Type.getType(node.desc); InsnList insns = new InsnList(); - int extraStack = 0; if (node.getOpcode() == Opcodes.GETSTATIC || node.getOpcode() == Opcodes.GETFIELD) { - extraStack = this.injectAtGetField(insns, target, node, staticField, ownerType, fieldType); + this.injectAtGetField(insns, target, node, staticField, ownerType, fieldType); } else if (node.getOpcode() == Opcodes.PUTSTATIC || node.getOpcode() == Opcodes.PUTFIELD) { - extraStack = this.injectAtPutField(insns, target, node, staticField, ownerType, fieldType); + this.injectAtPutField(insns, target, node, staticField, ownerType, fieldType); } else { throw new InvalidInjectionException(this.info, "Unspported opcode " + node.getOpcode() + " on FieldInsnNode for " + this.info); } target.insns.insertBefore(node, insns); target.insns.remove(node); - target.addToStack(extraStack); } /** @@ -171,9 +171,9 @@ public class RedirectInjector extends InvokeInjector { * possible scenarios based on the possible combinations of static on the * handler and the field itself. */ - private int injectAtGetField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { + private void injectAtGetField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { String handlerDesc = staticField ? ASMHelper.generateDescriptor(fieldType) : ASMHelper.generateDescriptor(fieldType, owner); - this.checkDescriptor(handlerDesc, "getter"); + boolean withArgs = this.checkDescriptor(handlerDesc, target, "getter"); if (!this.isStatic) { insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); @@ -182,8 +182,13 @@ public class RedirectInjector extends InvokeInjector { } } + if (withArgs) { + this.pushArgs(target.arguments, insns, target.argIndices, 0, target.arguments.length); + target.addToStack(ASMHelper.getArgsSize(target.arguments)); + } + this.invokeHandler(insns); - return this.isStatic ? 0 : 1; + target.addToStack(this.isStatic ? 0 : 1); } /** @@ -192,9 +197,9 @@ public class RedirectInjector extends InvokeInjector { * possible scenarios based on the possible combinations of static on the * handler and the field itself. */ - private int injectAtPutField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { + private void injectAtPutField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { String handlerDesc = staticField ? ASMHelper.generateDescriptor(null, fieldType) : ASMHelper.generateDescriptor(null, owner, fieldType); - this.checkDescriptor(handlerDesc, "setter"); + boolean withArgs = this.checkDescriptor(handlerDesc, target, "setter"); if (!this.isStatic) { if (staticField) { @@ -209,19 +214,34 @@ public class RedirectInjector extends InvokeInjector { } } + if (withArgs) { + this.pushArgs(target.arguments, insns, target.argIndices, 0, target.arguments.length); + target.addToStack(ASMHelper.getArgsSize(target.arguments)); + } + this.invokeHandler(insns); - return !this.isStatic && !staticField ? 1 : 0; + target.addToStack(!this.isStatic && !staticField ? 1 : 0); } /** * Check that the handler descriptor matches the calculated descriptor for * the field access being redirected. */ - private void checkDescriptor(String handlerDesc, String type) { - if (!this.methodNode.desc.equals(handlerDesc)) { - throw new InvalidInjectionException(this.info, this.annotationType + " field " + type + " " + this - + " has an invalid signature. Expected " + handlerDesc + " but found " + this.methodNode.desc); + private boolean checkDescriptor(String desc, Target target, String type) { + if (this.methodNode.desc.equals(desc)) { + return false; } + + int pos = desc.indexOf(')'); + String alternateDesc = String.format("%s%s%s", desc.substring(0, pos), Joiner.on("").join(target.arguments), desc.substring(pos)); + if (this.methodNode.desc.equals(alternateDesc)) { + return true; + } + + System.err.printf("%s\n", alternateDesc); + + throw new InvalidInjectionException(this.info, this.annotationType + " field " + type + " " + this + + " has an invalid signature. Expected " + desc + " but found " + this.methodNode.desc); } } From be6c749de0c3d756073a2f39e29ddd6c5d3cbdb3 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 3 Feb 2016 00:23:55 +0000 Subject: [PATCH 111/169] Version bump 0.4.19 --- gradle.properties | 2 +- src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 08b5a94a..6ebb165b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.18 +buildVersion=0.4.19 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 4938f14a..42c9ba98 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.18"; + public static final String VERSION = "0.4.19"; /** * Blackboard key where the subsystem version will be stored to indicate From 5bdb10884d1815dcde164c3f7cec3f0b498238c2 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 4 Feb 2016 00:43:41 +0000 Subject: [PATCH 112/169] Allow @Final on target class methods as well. --- .../spongepowered/asm/mixin/transformer/MixinApplicator.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 739e21b4..bcd33795 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -375,6 +375,10 @@ public class MixinApplicator { protected boolean isAlreadyMerged(MixinTargetContext mixin, MethodNode method, boolean isOverwrite, MethodNode target) { AnnotationNode merged = ASMHelper.getVisibleAnnotation(target, MixinMerged.class); if (merged == null) { + if (ASMHelper.getVisibleAnnotation(target, Final.class) != null) { + this.logger.warn("Overwrite prohibited for @Final method {} in {}. Skipping method.", method.name, mixin); + return true; + } return false; } From 56d910ea8f5e7c3c40caedc488da8cd8c1408dfb Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 4 Feb 2016 23:51:49 +0000 Subject: [PATCH 113/169] Injector update, injectors are now more predictable, bump to 0.5 --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/injection/InjectionNodes.java | 142 ++++++++++++++++++ .../injection/callback/CallbackInjector.java | 27 ++-- .../asm/mixin/injection/code/Injector.java | 47 +++++- .../injection/invoke/InvokeInjector.java | 17 ++- .../injection/invoke/ModifyArgInjector.java | 8 +- .../injection/invoke/RedirectInjector.java | 118 ++++++++++----- .../modify/ModifyVariableInjector.java | 11 +- .../mixin/injection/struct/InjectionInfo.java | 24 ++- .../asm/mixin/injection/struct/Target.java | 88 +++++++++-- .../mixin/transformer/MixinApplicator.java | 12 +- .../mixin/transformer/MixinTargetContext.java | 9 ++ .../org/spongepowered/asm/util/ASMHelper.java | 52 ++++--- 14 files changed, 447 insertions(+), 112 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java diff --git a/gradle.properties b/gradle.properties index 6ebb165b..912e9531 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.19 +buildVersion=0.5 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 42c9ba98..66921579 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.19"; + public static final String VERSION = "0.5"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java new file mode 100644 index 00000000..53229645 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java @@ -0,0 +1,142 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.util.ASMHelper; + +public class InjectionNodes extends ArrayList { + + private static final long serialVersionUID = 1L; + + public static class InjectionNode implements Comparable { + + private final AbstractInsnNode originalTarget; + + private AbstractInsnNode currentTarget; + + private Map decorations; + + public InjectionNode(AbstractInsnNode target) { + this.currentTarget = this.originalTarget = target; + } + + public AbstractInsnNode getOriginalTarget() { + return this.originalTarget; + } + + public AbstractInsnNode getCurrentTarget() { + return this.currentTarget; + } + + public void replace(AbstractInsnNode currentTarget) { + this.currentTarget = currentTarget; + } + + public void remove() { + this.currentTarget = null; + } + + public boolean matches(AbstractInsnNode node) { + return this.originalTarget == node || this.currentTarget == node; + } + + public boolean isReplaced() { + return this.originalTarget != this.currentTarget; + } + + public boolean isRemoved() { + return this.currentTarget == null; + } + + public void decorate(K key, V value) { + if (this.decorations == null) { + this.decorations = new HashMap(); + } + this.decorations.put(key, value); + } + + public boolean hasDecoration(K key) { + return this.decorations != null && this.decorations.get(key) != null; + } + + @SuppressWarnings("unchecked") + public V getDecoration(K key) { + return (V) (this.decorations == null ? null : this.decorations.get(key)); + } + + @Override + public int compareTo(InjectionNode other) { + return other == null ? Integer.MAX_VALUE : this.hashCode() - other.hashCode(); + } + + @Override + public String toString() { + return String.format("InjectionNode[%s]", ASMHelper.getNodeDescriptionForDebug(this.currentTarget)); + } + + } + + public InjectionNode add(AbstractInsnNode node) { + InjectionNode injectionNode = this.get(node); + if (injectionNode == null) { + injectionNode = new InjectionNode(node); + this.add(injectionNode); + } + return injectionNode; + } + + public InjectionNode get(AbstractInsnNode node) { + for (InjectionNode injectionNode : this) { + if (injectionNode.matches(node)) { + return injectionNode; + } + } + return null; + } + + public boolean contains(AbstractInsnNode node) { + return this.get(node) != null; + } + + public void replace(AbstractInsnNode oldNode, AbstractInsnNode newNode) { + InjectionNode injectionNode = this.get(oldNode); + if (injectionNode != null) { + injectionNode.replace(newNode); + } + } + + public void remove(AbstractInsnNode oldNode) { + InjectionNode injectionNode = this.get(oldNode); + if (injectionNode != null) { + injectionNode.remove(); + } + } + +} 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 ae89da2e..2a71e7cc 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 @@ -27,13 +27,12 @@ package org.spongepowered.asm.mixin.injection.callback; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.injection.Coerce; import org.spongepowered.asm.mixin.injection.InjectionError; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.Surrogate; @@ -148,10 +147,10 @@ public class CallbackInjector extends Injector { */ private boolean captureArgs = true; - Callback(MethodNode handler, Target target, final AbstractInsnNode node, final LocalVariableNode[] locals, boolean captureLocals) { + Callback(MethodNode handler, Target target, final InjectionNode node, final LocalVariableNode[] locals, boolean captureLocals) { this.handler = handler; this.target = target; - this.node = node; + this.node = node.getCurrentTarget(); this.locals = locals; this.localTypes = locals != null ? new Type[locals.length] : null; this.frameSize = ASMHelper.getFirstNonArgLocalIndex(target.arguments, !CallbackInjector.this.isStatic()); @@ -277,8 +276,6 @@ public class CallbackInjector extends Injector { } } - private final Logger logger = LogManager.getLogger("mixin"); - /** * True if cancellable */ @@ -332,11 +329,19 @@ public class CallbackInjector extends Injector { * org.objectweb.asm.tree.AbstractInsnNode) */ @Override - protected void inject(Target target, AbstractInsnNode node) { + protected void inject(Target target, InjectionNode node) { LocalVariableNode[] locals = null; + if (node.isReplaced()) { + System.err.printf("Injector target was replaced!!!\n"); + System.err.printf("ORIGINAL: "); + ASMHelper.printNode(node.getOriginalTarget()); + System.err.printf(" CURRENT: "); + ASMHelper.printNode(node.getCurrentTarget()); + } + if (this.localCapture.isCaptureLocals() || this.localCapture.isPrintLocals()) { - locals = Locals.getLocalsAt(this.classNode, target.method, node); + locals = Locals.getLocalsAt(this.classNode, target.method, node.getCurrentTarget()); } this.inject(new Callback(this.methodNode, target, node, locals, this.localCapture.isCaptureLocals())); @@ -379,14 +384,14 @@ public class CallbackInjector extends Injector { switch (this.localCapture) { case CAPTURE_FAILEXCEPTION: - this.logger.error("Injection error: {}", message); + Injector.logger.error("Injection error: {}", message); callbackMethod = this.generateErrorMethod(callback, "org/spongepowered/asm/mixin/injection/InjectionError", message); break; case CAPTURE_FAILSOFT: - this.logger.warn("Injection warning: {}", message); + Injector.logger.warn("Injection warning: {}", message); return; default: - this.logger.error("Critical injection failure: {}", message); + Injector.logger.error("Critical injection failure: {}", message); throw new InjectionError(message); } } 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 c52d789e..27933b4c 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 @@ -30,6 +30,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; @@ -37,6 +39,8 @@ import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; @@ -50,6 +54,11 @@ import com.google.common.base.Joiner; */ public abstract class Injector { + /** + * Log more things + */ + protected static final Logger logger = LogManager.getLogger("mixin"); + /** * Injection info */ @@ -110,16 +119,35 @@ public abstract class Injector { } /** - * Inject into the specified method at the specified injection points + * ... * * @param target Target method to inject into * @param injectionPoints InjectionPoint instances which will identify * target insns in the target method + * @return discovered injection points */ - public final void injectInto(Target target, List injectionPoints) { + public final List find(Target target, List injectionPoints) { this.sanityCheck(target, injectionPoints); - + + List myNodes = new ArrayList(); for (AbstractInsnNode node : this.findTargetNodes(target.method, injectionPoints)) { + this.addTargetNode(target, myNodes, node); + } + return myNodes; + } + + protected void addTargetNode(Target target, List myNodes, AbstractInsnNode node) { + myNodes.add(target.injectionNodes.add(node)); + } + + public final void inject(Target target, List nodes) { + for (InjectionNode node : nodes) { + if (node.isRemoved()) { + if (this.info.getContext().getEnvironment().getOption(Option.DEBUG_VERBOSE)) { + Injector.logger.warn("Target node for {} was removed by a previous injector in {}", this.info, target); + } + continue; + } this.inject(target, node); } } @@ -161,15 +189,15 @@ public abstract class Injector { } } - protected abstract void inject(Target target, AbstractInsnNode node); + protected abstract void inject(Target target, InjectionNode node); /** * Invoke the handler method * * @param insns Instruction list to inject into */ - protected void invokeHandler(InsnList insns) { - this.invokeHandler(insns, this.methodNode); + protected AbstractInsnNode invokeHandler(InsnList insns) { + return this.invokeHandler(insns, this.methodNode); } /** @@ -178,12 +206,15 @@ public abstract class Injector { * @param insns Instruction list to inject into * @param handler Actual method to invoke (may be different if using a * surrogate) + * @return */ - protected void invokeHandler(InsnList insns, MethodNode handler) { + protected AbstractInsnNode invokeHandler(InsnList insns, MethodNode handler) { boolean isPrivate = (handler.access & Opcodes.ACC_PRIVATE) != 0; int invokeOpcode = this.isStatic ? Opcodes.INVOKESTATIC : isPrivate ? Opcodes.INVOKESPECIAL : Opcodes.INVOKEVIRTUAL; - insns.add(new MethodInsnNode(invokeOpcode, this.classNode.name, handler.name, handler.desc, false)); + MethodInsnNode insn = new MethodInsnNode(invokeOpcode, this.classNode.name, handler.name, handler.desc, false); + insns.add(insn); this.info.addCallbackInvocation(handler); + return insn; } protected static String printArgs(Type[] args) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index e28d3785..6281003d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -32,6 +32,7 @@ import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.code.Injector; @@ -74,13 +75,13 @@ public abstract class InvokeInjector extends Injector { * org.objectweb.asm.tree.AbstractInsnNode) */ @Override - protected void inject(Target target, AbstractInsnNode node) { - if (!(node instanceof MethodInsnNode)) { + protected void inject(Target target, InjectionNode node) { + if (!(node.getCurrentTarget() instanceof MethodInsnNode)) { throw new InvalidInjectionException(this.info, this.annotationType + " annotation on is targetting a non-method insn in " + target + " in " + this); } - this.injectAtInvoke(target, (MethodInsnNode)node); + this.injectAtInvoke(target, node); } /** @@ -89,15 +90,15 @@ public abstract class InvokeInjector extends Injector { * @param target Target to inject into * @param node Discovered instruction node */ - protected abstract void injectAtInvoke(Target target, MethodInsnNode node); + protected abstract void injectAtInvoke(Target target, InjectionNode node); /** * @param args handler arguments * @param insns InsnList to inject insns into * @param argMap Mapping of args to local variables */ - protected void invokeHandlerWithArgs(Type[] args, InsnList insns, int[] argMap) { - this.invokeHandlerWithArgs(args, insns, argMap, 0, args.length); + protected AbstractInsnNode invokeHandlerWithArgs(Type[] args, InsnList insns, int[] argMap) { + return this.invokeHandlerWithArgs(args, insns, argMap, 0, args.length); } /** @@ -107,12 +108,12 @@ public abstract class InvokeInjector extends Injector { * @param startArg Starting arg to consume * @param endArg Ending arg to consume */ - protected void invokeHandlerWithArgs(Type[] args, InsnList insns, int[] argMap, int startArg, int endArg) { + protected AbstractInsnNode invokeHandlerWithArgs(Type[] args, InsnList insns, int[] argMap, int startArg, int endArg) { if (!this.isStatic) { insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); } this.pushArgs(args, insns, argMap, startArg, endArg); - this.invokeHandler(insns); + return this.invokeHandler(insns); } /** 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 b67b2afa..419b9b72 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 @@ -32,6 +32,7 @@ import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; @@ -86,8 +87,9 @@ public class ModifyArgInjector extends InvokeInjector { * Do the injection */ @Override - protected void injectAtInvoke(Target target, MethodInsnNode node) { - Type[] args = Type.getArgumentTypes(node.desc); + protected void injectAtInvoke(Target target, InjectionNode node) { + MethodInsnNode methodNode = (MethodInsnNode)node.getCurrentTarget(); + Type[] args = Type.getArgumentTypes(methodNode.desc); int argIndex = this.findArgIndex(target, args); InsnList insns = new InsnList(); int extraLocals = 0; @@ -98,7 +100,7 @@ public class ModifyArgInjector extends InvokeInjector { extraLocals = this.injectMultiArgHandler(target, args, argIndex, insns); } - target.insns.insertBefore(node, insns); + target.insns.insertBefore(methodNode, insns); target.addToLocals(extraLocals); target.addToStack(2 - (extraLocals - 1)); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index 40882861..1114b912 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -24,6 +24,8 @@ */ package org.spongepowered.asm.mixin.injection.invoke; +import java.util.List; + import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; @@ -32,6 +34,8 @@ import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.InsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.code.Injector; @@ -75,44 +79,89 @@ import com.google.common.primitives.Ints; */ public class RedirectInjector extends InvokeInjector { + private final int priority; + + private final boolean isFinal; + /** * @param info Injection info */ public RedirectInjector(InjectionInfo info) { super(info, "@Redirect"); + this.priority = info.getContext().getPriority(); + this.isFinal = ASMHelper.getVisibleAnnotation(this.methodNode, Final.class) != null; + } + + @Override + protected void addTargetNode(Target target, List myNodes, AbstractInsnNode insn) { + InjectionNode node = target.injectionNodes.get(insn); + + if (node != null ) { + boolean isRedirect = node.getDecoration("redir:ect") == Boolean.TRUE; + RedirectInjector redirector = node.getDecoration("redir:owner"); + Boolean isFinal = node.getDecoration("redir:final"); + Integer priority = node.getDecoration("redir:priority"); + + if (isRedirect && redirector != this) { + if (priority >= this.priority) { + Injector.logger.warn("{} conflict. Skipping {} with priority {}, already redirected by {} with priority {}", + this.annotationType, this.info, this.priority, node.getDecoration("redir:name"), node.getDecoration("redir:priority")); + return; + } else if (isFinal != null && isFinal.booleanValue()) { + throw new InvalidInjectionException(this.info, this.annotationType + " conflict: " + this + + " failed because target was already remapped by " + node.getDecoration("redir:name")); + } + } + } + + node = target.injectionNodes.add(insn); + node.decorate("redir:ect", Boolean.TRUE); + node.decorate("redir:owner", this); + node.decorate("redir:priority", Integer.valueOf(this.priority)); + node.decorate("redir:final", Boolean.valueOf(this.isFinal)); + node.decorate("redir:name", this.info.toString()); + node.decorate("redir:desc", this.methodNode.desc); + + myNodes.add(node); } - /* (non-Javadoc) - * @see org.spongepowered.asm.mixin.injection.callback.BytecodeInjector - * #inject(org.spongepowered.asm.mixin.injection.callback.Target, - * org.objectweb.asm.tree.AbstractInsnNode) - */ @Override - protected void inject(Target target, AbstractInsnNode node) { - if (node instanceof MethodInsnNode) { - this.injectAtInvoke(target, (MethodInsnNode)node); + protected void inject(Target target, InjectionNode node) { + if (node.getDecoration("redir:owner") != this) { + Injector.logger.warn("{} conflict. Skipping {} with priority {}, already redirected by {} with priority {}", + this.annotationType, this.info, this.priority, node.getDecoration("redir:name"), node.getDecoration("redir:priority")); + return; + } + + if (node.isReplaced()) { + throw new UnsupportedOperationException("Redirector target failure for " + this.info); + } + + if (node.getCurrentTarget() instanceof MethodInsnNode) { + this.injectAtInvoke(target, node); return; } - if (node instanceof FieldInsnNode) { - this.injectAtFieldAccess(target, (FieldInsnNode)node); + if (node.getCurrentTarget() instanceof FieldInsnNode) { + this.injectAtFieldAccess(target, node); return; } throw new InvalidInjectionException(this.info, this.annotationType + " annotation on is targetting an invalid insn in " + target + " in " + this); } - + /** * Redirect a method invocation */ @Override - protected void injectAtInvoke(Target target, MethodInsnNode node) { + protected void injectAtInvoke(Target target, InjectionNode node) { + MethodInsnNode methodNode = (MethodInsnNode)node.getCurrentTarget(); boolean injectTargetParams = false; - boolean targetIsStatic = node.getOpcode() == Opcodes.INVOKESTATIC; - Type ownerType = Type.getType("L" + node.owner + ";"); - Type returnType = Type.getReturnType(node.desc); - Type[] args = Type.getArgumentTypes(node.desc); + boolean targetIsStatic = methodNode.getOpcode() == Opcodes.INVOKESTATIC; + Type ownerType = Type.getType("L" + methodNode.owner + ";"); + Type returnType = Type.getReturnType(methodNode.desc); + Type[] args = Type.getArgumentTypes(methodNode.desc); Type[] stackVars = targetIsStatic ? args : ObjectArrays.concat(ownerType, args); String desc = Injector.printArgs(stackVars) + returnType; @@ -136,10 +185,8 @@ public class RedirectInjector extends InvokeInjector { extraStack += argSize; argMap = Ints.concat(argMap, target.argIndices); } - this.invokeHandlerWithArgs(this.methodArgs, insns, argMap); - - target.insns.insertBefore(node, insns); - target.insns.remove(node); + AbstractInsnNode insn = this.invokeHandlerWithArgs(this.methodArgs, insns, argMap); + target.replaceNode(methodNode, insn, insns); target.addToLocals(extraLocals); target.addToStack(extraStack); } @@ -147,22 +194,23 @@ public class RedirectInjector extends InvokeInjector { /** * Redirect a field get or set operation */ - private void injectAtFieldAccess(Target target, FieldInsnNode node) { - boolean staticField = node.getOpcode() == Opcodes.GETSTATIC || node.getOpcode() == Opcodes.PUTSTATIC; - Type ownerType = Type.getType("L" + node.owner + ";"); - Type fieldType = Type.getType(node.desc); + private void injectAtFieldAccess(Target target, InjectionNode node) { + FieldInsnNode fieldNode = (FieldInsnNode)node.getCurrentTarget(); + boolean staticField = fieldNode.getOpcode() == Opcodes.GETSTATIC || fieldNode.getOpcode() == Opcodes.PUTSTATIC; + Type ownerType = Type.getType("L" + fieldNode.owner + ";"); + Type fieldType = Type.getType(fieldNode.desc); + AbstractInsnNode invoke = null; InsnList insns = new InsnList(); - if (node.getOpcode() == Opcodes.GETSTATIC || node.getOpcode() == Opcodes.GETFIELD) { - this.injectAtGetField(insns, target, node, staticField, ownerType, fieldType); - } else if (node.getOpcode() == Opcodes.PUTSTATIC || node.getOpcode() == Opcodes.PUTFIELD) { - this.injectAtPutField(insns, target, node, staticField, ownerType, fieldType); + if (fieldNode.getOpcode() == Opcodes.GETSTATIC || fieldNode.getOpcode() == Opcodes.GETFIELD) { + invoke = this.injectAtGetField(insns, target, fieldNode, staticField, ownerType, fieldType); + } else if (fieldNode.getOpcode() == Opcodes.PUTSTATIC || fieldNode.getOpcode() == Opcodes.PUTFIELD) { + invoke = this.injectAtPutField(insns, target, fieldNode, staticField, ownerType, fieldType); } else { - throw new InvalidInjectionException(this.info, "Unspported opcode " + node.getOpcode() + " on FieldInsnNode for " + this.info); + throw new InvalidInjectionException(this.info, "Unspported opcode " + fieldNode.getOpcode() + " on FieldInsnNode for " + this.info); } - target.insns.insertBefore(node, insns); - target.insns.remove(node); + target.replaceNode(fieldNode, invoke, insns); } /** @@ -171,7 +219,7 @@ public class RedirectInjector extends InvokeInjector { * possible scenarios based on the possible combinations of static on the * handler and the field itself. */ - private void injectAtGetField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { + private AbstractInsnNode injectAtGetField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { String handlerDesc = staticField ? ASMHelper.generateDescriptor(fieldType) : ASMHelper.generateDescriptor(fieldType, owner); boolean withArgs = this.checkDescriptor(handlerDesc, target, "getter"); @@ -187,8 +235,8 @@ public class RedirectInjector extends InvokeInjector { target.addToStack(ASMHelper.getArgsSize(target.arguments)); } - this.invokeHandler(insns); target.addToStack(this.isStatic ? 0 : 1); + return this.invokeHandler(insns); } /** @@ -197,7 +245,7 @@ public class RedirectInjector extends InvokeInjector { * possible scenarios based on the possible combinations of static on the * handler and the field itself. */ - private void injectAtPutField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { + private AbstractInsnNode injectAtPutField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { String handlerDesc = staticField ? ASMHelper.generateDescriptor(null, fieldType) : ASMHelper.generateDescriptor(null, owner, fieldType); boolean withArgs = this.checkDescriptor(handlerDesc, target, "setter"); @@ -219,8 +267,8 @@ public class RedirectInjector extends InvokeInjector { target.addToStack(ASMHelper.getArgsSize(target.arguments)); } - this.invokeHandler(insns); target.addToStack(!this.isStatic && !staticField ? 1 : 0); + return this.invokeHandler(insns); } /** 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 20c6b6be..743c98fe 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 @@ -33,6 +33,7 @@ import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.ModifyVariable; @@ -142,8 +143,12 @@ public class ModifyVariableInjector extends Injector { * Do the injection */ @Override - protected void inject(Target target, AbstractInsnNode node) { - Context context = new Context(this.returnType, this.discriminator.isArgsOnly(), target, node); + protected void inject(Target target, InjectionNode node) { + if (node.isReplaced()) { + throw new InvalidInjectionException(this.info, "Variable modifier target for " + this + " was removed by another injector"); + } + + Context context = new Context(this.returnType, this.discriminator.isArgsOnly(), target, node.getCurrentTarget()); if (this.print) { this.printLocals(context); @@ -158,7 +163,7 @@ public class ModifyVariableInjector extends Injector { throw new InvalidInjectionException(this.info, "Implicit variable modifier injection failed in " + this, ex); } - target.insns.insertBefore(node, context.insns); + target.insns.insertBefore(context.node, context.insns); target.addToStack(this.isStatic ? 1 : 2); } 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 6874e714..8ed5a2b1 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 @@ -28,7 +28,10 @@ import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; import java.util.Deque; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AnnotationNode; @@ -38,6 +41,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.InjectionError; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; @@ -91,6 +95,11 @@ public abstract class InjectionInfo { */ protected final List injectionPoints = new ArrayList(); + /** + * Map of lists of nodes enumerated by calling {@link #prepare} + */ + protected final Map> targetNodes = new LinkedHashMap>(); + /** * Bytecode injector */ @@ -216,12 +225,21 @@ public abstract class InjectionInfo { } /** - * Perform the injection + * Discover injection points */ - public void inject() { + public void prepare() { while (this.targets.size() > 0) { Target target = this.mixin.getTargetMethod(this.targets.removeFirst()); - this.injector.injectInto(target, this.injectionPoints); + this.targetNodes.put(target, this.injector.find(target, this.injectionPoints)); + } + } + + /** + * Perform injections + */ + public void inject() { + for (Entry> entry : this.targetNodes.entrySet()) { + this.injector.inject(entry.getKey(), entry.getValue()); } } 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 f387b8cf..88a9c429 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 @@ -25,9 +25,11 @@ package org.spongepowered.asm.mixin.injection.struct; import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.InjectionNodes; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.util.ASMHelper; @@ -35,7 +37,7 @@ import org.spongepowered.asm.util.ASMHelper; * Information about the current injection target, mainly just convenience * rather than passing a bunch of values around. */ -public class Target { +public class Target implements Comparable { public final ClassNode classNode; @@ -69,16 +71,6 @@ public class Target { */ public final Type returnType; - /** - * Method's (original) MAXS - */ - private final int maxStack; - - /** - * Method's original max locals - */ - private final int maxLocals; - /** * Callback method descriptor based on this target */ @@ -88,6 +80,21 @@ public class Target { * Callback info class */ public final String callbackInfoClass; + + /** + * Nodes targetted by injectors + */ + public final InjectionNodes injectionNodes = new InjectionNodes(); + + /** + * Method's (original) MAXS + */ + private final int maxStack; + + /** + * Method's original max locals + */ + private final int maxLocals; /** * Make a new Target for the supplied method @@ -272,4 +279,63 @@ public class Target { public String toString() { return String.format("%s::%s%s", this.classNode.name, this.method.name, this.method.desc); } + + @Override + public int compareTo(Target o) { + if (o == null) { + return Integer.MAX_VALUE; + } + return this.toString().compareTo(o.toString()); + } + + /** + * Replace an instruction in this target with the specified instruction and + * mark the node as replaced for other injectors + * + * @param location Instruction to replace + * @param insn Instruction to replace with + */ + public void replaceNode(AbstractInsnNode location, AbstractInsnNode insn) { + this.insns.insertBefore(location, insn); + this.insns.remove(location); + this.injectionNodes.replace(location, insn); + } + + /** + * Replace an instruction in this target with the specified instructions and + * mark the node as replaced with the specified champion node from the list. + * + * @param location Instruction to replace + * @param champion Instruction which notionally replaces the original insn + * @param insns Instructions to actually insert (must contain champion) + */ + public void replaceNode(AbstractInsnNode location, AbstractInsnNode champion, InsnList insns) { + this.insns.insertBefore(location, insns); + this.insns.remove(location); + this.injectionNodes.replace(location, champion); + } + + /** + * Replace an instruction in this target with the specified instructions and + * mark the original node as removed + * + * @param location Instruction to replace + * @param insns Instructions to replace with + */ + public void replaceNode(AbstractInsnNode location, InsnList insns) { + this.insns.insertBefore(location, insns); + this.removeNode(location); + } + + /** + * Remove the specified instruction from the target and mark it as removed + * for injections + * + * @param insn instruction to remove + */ + public void removeNode(AbstractInsnNode insn) { + this.insns.remove(insn); + this.injectionNodes.remove(insn); + } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index bcd33795..f46fb8d8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -710,7 +710,7 @@ public class MixinApplicator { * @param mixin */ protected void applyInjections(MixinTargetContext mixin) { - List injected = new ArrayList(); + List injectors = new ArrayList(); for (MethodNode method : this.targetClass.methods) { InjectionInfo injectInfo = InjectionInfo.parse(mixin, method); @@ -719,14 +719,18 @@ public class MixinApplicator { } if (injectInfo.isValid()) { - injectInfo.inject(); - injected.add(injectInfo); + injectInfo.prepare(); + injectors.add(injectInfo); } method.visibleAnnotations.remove(injectInfo.getAnnotation()); } - for (InjectionInfo injectInfo : injected) { + for (InjectionInfo injectInfo : injectors) { + injectInfo.inject(); + } + + for (InjectionInfo injectInfo : injectors) { injectInfo.postInject(); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index f5cfe672..4531c885 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -166,6 +166,15 @@ public class MixinTargetContext implements IReferenceMapperContext { public String toString() { return this.mixin.toString(); } + + /** + * Get the environment of the owning mixin config + * + * @return mixin parent environment + */ + public MixinEnvironment getEnvironment() { + return this.mixin.getParent().getEnvironment(); + } /** * Get the mixin tree diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 917e4600..7d08b138 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -362,32 +362,36 @@ public class ASMHelper { * @param node Node to print */ public static void printNode(AbstractInsnNode node) { - System.err.printf("%-14s ", node.getClass().getSimpleName().replace("Node", "")); - if (node instanceof LabelNode) { - System.err.printf("[%s]", ((LabelNode)node).getLabel()); - } else if (node instanceof JumpInsnNode) { - System.err.printf("[%s] [%s]", ASMHelper.getOpcodeName(node), ((JumpInsnNode)node).label.getLabel()); - } else if (node instanceof VarInsnNode) { - System.err.printf("[%s] %d", ASMHelper.getOpcodeName(node), ((VarInsnNode)node).var); - } else if (node instanceof MethodInsnNode) { - MethodInsnNode mth = (MethodInsnNode)node; - System.err.printf("[%s] %s %s %s", ASMHelper.getOpcodeName(node), mth.owner, mth.name, mth.desc); - } else if (node instanceof FieldInsnNode) { - FieldInsnNode fld = (FieldInsnNode)node; - System.err.printf("[%s] %s %s %s", ASMHelper.getOpcodeName(node), fld.owner, fld.name, fld.desc); - } else if (node instanceof LineNumberNode) { - LineNumberNode ln = (LineNumberNode)node; - System.err.printf("LINE=%d LABEL=[%s]", ln.line, ln.start.getLabel()); - } else if (node instanceof LdcInsnNode) { - System.err.print(((LdcInsnNode)node).cst); - } else if (node instanceof IntInsnNode) { - System.err.print(((IntInsnNode)node).operand); - } else { - System.err.printf("[%s] ", ASMHelper.getOpcodeName(node)); - } - System.err.print("\n"); + System.err.printf("%s\n", ASMHelper.getNodeDescriptionForDebug(node)); } + public static String getNodeDescriptionForDebug(AbstractInsnNode node) { + String out = String.format("%-14s ", node.getClass().getSimpleName().replace("Node", "")); + if (node instanceof LabelNode) { + out += String.format("[%s]", ((LabelNode)node).getLabel()); + } else if (node instanceof JumpInsnNode) { + out += String.format("[%s] [%s]", ASMHelper.getOpcodeName(node), ((JumpInsnNode)node).label.getLabel()); + } else if (node instanceof VarInsnNode) { + out += String.format("[%s] %d", ASMHelper.getOpcodeName(node), ((VarInsnNode)node).var); + } else if (node instanceof MethodInsnNode) { + MethodInsnNode mth = (MethodInsnNode)node; + out += String.format("[%s] %s %s %s", ASMHelper.getOpcodeName(node), mth.owner, mth.name, mth.desc); + } else if (node instanceof FieldInsnNode) { + FieldInsnNode fld = (FieldInsnNode)node; + out += String.format("[%s] %s %s %s", ASMHelper.getOpcodeName(node), fld.owner, fld.name, fld.desc); + } else if (node instanceof LineNumberNode) { + LineNumberNode ln = (LineNumberNode)node; + out += String.format("LINE=%d LABEL=[%s]", ln.line, ln.start.getLabel()); + } else if (node instanceof LdcInsnNode) { + out += (((LdcInsnNode)node).cst); + } else if (node instanceof IntInsnNode) { + out += (((IntInsnNode)node).operand); + } else { + out += String.format("[%s] ", ASMHelper.getOpcodeName(node)); + } + return out; + } + /** * Uses reflection to find an approximate constant name match for the * supplied node's opcode From 83a9f4fb0293e99c952f5739904748605b9de44e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 5 Feb 2016 01:08:45 +0000 Subject: [PATCH 114/169] Nothing to see here, move along --- .../asm/mixin/injection/callback/CallbackInjector.java | 8 -------- 1 file changed, 8 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 2a71e7cc..c9ed07b0 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 @@ -332,14 +332,6 @@ public class CallbackInjector extends Injector { protected void inject(Target target, InjectionNode node) { LocalVariableNode[] locals = null; - if (node.isReplaced()) { - System.err.printf("Injector target was replaced!!!\n"); - System.err.printf("ORIGINAL: "); - ASMHelper.printNode(node.getOriginalTarget()); - System.err.printf(" CURRENT: "); - ASMHelper.printNode(node.getCurrentTarget()); - } - if (this.localCapture.isCaptureLocals() || this.localCapture.isPrintLocals()) { locals = Locals.getLocalsAt(this.classNode, target.method, node.getCurrentTarget()); } From 9cd453cd634aa5cd840d32ad206283dded53acd9 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 5 Feb 2016 13:06:00 +0000 Subject: [PATCH 115/169] Add all missing class javadoc --- checkstyle.xml | 3 + .../AnnotatedMixinElementHandler.java | 4 + .../AnnotatedMixinInjectorHandler.java | 3 + .../AnnotatedMixinOverwriteHandler.java | 3 + .../AnnotatedMixinShadowHandler.java | 3 + .../tools/obfuscation/AnnotatedMixins.java | 4 + .../tools/obfuscation/MixinProcessor.java | 3 + .../tools/obfuscation/ObfuscationData.java | 17 +++ .../tools/obfuscation/ObfuscationManager.java | 3 + .../tools/obfuscation/ObfuscationType.java | 29 ++++ .../tools/obfuscation/SupportedOptions.java | 4 + .../TargetObfuscationEnvironment.java | 10 ++ .../interfaces/IMixinValidator.java | 3 + .../tools/obfuscation/struct/Message.java | 4 + .../asm/bridge/RemapperAdapter.java | 3 + .../asm/bridge/RemapperAdapterFML.java | 3 + .../asm/launch/MixinInitialisationError.java | 3 + .../asm/mixin/MixinEnvironment.java | 7 +- .../asm/mixin/MixinException.java | 3 + .../asm/mixin/RemapperChain.java | 4 + .../asm/mixin/extensibility/IMixinInfo.java | 3 + .../asm/mixin/injection/InjectionNodes.java | 129 +++++++++++++++++- .../asm/mixin/injection/InjectionPoint.java | 5 +- .../InjectionValidationException.java | 3 + .../injection/InvalidInjectionException.java | 4 + .../callback/CancellationException.java | 4 + ...InvalidImplicitDiscriminatorException.java | 4 + .../struct/CallbackInjectionInfo.java | 4 + .../InvalidMemberDescriptorException.java | 3 + .../struct/ModifyArgInjectionInfo.java | 4 + .../struct/ModifyVariableInjectionInfo.java | 4 + .../struct/RedirectInjectionInfo.java | 3 + .../injection/struct/ReferenceMapper.java | 102 +++++++++++++- .../asm/mixin/transformer/ClassInfo.java | 3 + .../transformer/InvalidMixinException.java | 3 + .../MixinTransformerModuleCheckClass.java | 3 + .../asm/obfuscation/SrgField.java | 3 + .../asm/obfuscation/SrgMethod.java | 3 + .../org/spongepowered/asm/util/ASMHelper.java | 3 + .../asm/util/LVTGeneratorException.java | 4 + .../asm/util/ObfuscationUtil.java | 6 + .../spongepowered/asm/util/PrettyPrinter.java | 8 ++ 42 files changed, 413 insertions(+), 11 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 3e06aaf5..538b210c 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -92,6 +92,9 @@ + + + diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java index 5a784d57..bacec1f3 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -44,6 +44,10 @@ import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; +/** + * Base class for module for {@link AnnotatedMixin} which handle different + * aspects of mixin target classes + */ abstract class AnnotatedMixinElementHandler { /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java index 96fa77c6..075c34e0 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java @@ -42,6 +42,9 @@ import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.struct.Message; +/** + * A module for {@link AnnotatedMixin} whic handles injectors + */ class AnnotatedMixinInjectorHandler extends AnnotatedMixinElementHandler { AnnotatedMixinInjectorHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java index 6165d6b2..1c3ebf5e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java @@ -34,6 +34,9 @@ import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +/** + * A module for {@link AnnotatedMixin} which handles method overwrites + */ class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { AnnotatedMixinOverwriteHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java index 561181d9..e470d299 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java @@ -33,6 +33,9 @@ import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +/** + * A module for {@link AnnotatedMixin} which handles shadowed fields and methods + */ class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { AnnotatedMixinShadowHandler(IMixinAnnotationProcessor ap, AnnotatedMixin mixin) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 657dca67..443b20e9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -75,6 +75,10 @@ class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider, ITyp private static final String MAPID_SYSTEM_PROPERTY = "mixin.target.mapid"; + /** + * Detected compiler argument, specifies the behaviour of some operations + * for compatibility purposes. + */ static enum CompilerEnvironment { /** * Default environment diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java index 6c585c48..028eec49 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java @@ -37,6 +37,9 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.Mixin; +/** + * Base class for mixin annotation processor modules + */ public abstract class MixinProcessor extends AbstractProcessor { /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java index 9f062fe2..31f4891e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java @@ -28,6 +28,23 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.spongepowered.asm.obfuscation.SrgMethod; + +/** + * Return value struct for various obfuscation queries performed by the mixin + * annotation processor. + * + *

When obfuscation queries are performed by the AP, the returned data are + * encapsulated in an ObfuscationData object which contains a mapping + * of the different obfuscation types to the respective remapped value of the + * original entry for that environment.

+ * + *

The returned data are iterable over the keys, consumers should call + * {@link #get} to retrieve the remapped entries for each key.

+ * + * @param Contained type of the data, usually {@link String} for field + * and type obfuscations, and {@link SrgMethod} for methods. + */ public class ObfuscationData implements Iterable { private final Map data = new HashMap(); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index 49289b58..94fcb917 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -43,6 +43,9 @@ import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; +/** + * Obfuscation Manager for mixin Annotation Processor + */ public class ObfuscationManager implements IObfuscationManager { /** diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java index 17528c5e..679a122b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java @@ -31,14 +31,43 @@ import org.spongepowered.tools.obfuscation.interfaces.IOptionProvider; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; +/** + * Obfuscation types supported by the annotation processor + */ enum ObfuscationType { + /** + * "SEARGE" mappings, these are unique mappings used by MCP and derived + * projects + */ SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.REOBF_EXTRA_SRG_FILES, SupportedOptions.OUT_SRG_SRG_FILE), + + /** + * "NOTCH" mappings, internal to minecraft only + */ NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.REOBF_EXTRA_NOTCH_FILES, SupportedOptions.OUT_NOTCH_SRG_FILE); + /** + * Refmap key for this mapping type + */ private final String key; + + /** + * The name of the Annotation Processor argument which contains the file + * name to read the SRGs for this obfuscation type from + */ private final String srgFileArgName; + + /** + * The name of the Annotation Processor argument which contains the file + * name to read the extra SRGs for this obfuscation type from + */ private final String extraSrgFilesArgName; + + /** + * The name of the Annotation Processor argument which contains the file + * name to write generated SRG mappings to + */ private final String outSrgFileArgName; private ObfuscationType(String displayName, String srgFileArgName, String extraSrgFilesArgName, String outSrgFileArgName) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index e8f2ceef..e278faf7 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -28,6 +28,10 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; +/** + * Supported options for the annotation processor. Not an enum mainly so that + * the string tokens can be inlined. + */ public final class SupportedOptions { public static final String TOKENS = "tokens"; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index f916003e..5d420a74 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -50,8 +50,18 @@ import org.spongepowered.asm.util.ObfuscationUtil; import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; +/** + * Stores information relevant to a particular target obfuscation environment. + * + *

We classify different types of possible obfuscation (eg. "searge", "notch" + * ) as obfuscation environments and store related information such as + * the input SRG mappings, generated refmap, generated SRGs, here.

+ */ class TargetObfuscationEnvironment { + /** + * Remapping proxy for remapping descriptors + */ final class RemapperProxy implements IClassRemapper { @Override diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinValidator.java index 9f43e6b9..3b5488df 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IMixinValidator.java @@ -37,6 +37,9 @@ import org.spongepowered.tools.obfuscation.TypeHandle; */ public interface IMixinValidator { + /** + * Validation pass + */ public enum ValidationPass { EARLY, LATE diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java b/src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java index 4c67ce92..c18cb8fc 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/struct/Message.java @@ -30,6 +30,10 @@ import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; import javax.tools.Diagnostic; +/** + * Wrapper for Annotation Processor messages, used to enable messages to be + * easily queued and manipulated + */ public class Message { private Diagnostic.Kind kind; diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java index 5d6e9fe8..11eae88f 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapter.java @@ -31,6 +31,9 @@ import org.spongepowered.asm.mixin.extensibility.IRemapper; import org.spongepowered.asm.util.ObfuscationUtil; import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper; +/** + * Base impl of remapper + */ public abstract class RemapperAdapter implements IRemapper, IClassRemapper { protected final Logger logger = LogManager.getLogger("mixin"); diff --git a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java index 165966cd..97750e1a 100644 --- a/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java +++ b/src/bridge/java/org/spongepowered/asm/bridge/RemapperAdapterFML.java @@ -30,6 +30,9 @@ import java.lang.reflect.Method; import org.objectweb.asm.commons.Remapper; import org.spongepowered.asm.mixin.extensibility.IRemapper; +/** + * Remapper adapter which remaps using FML's deobfuscating remapper + */ public class RemapperAdapterFML extends RemapperAdapter { private final Method mdUnmap; diff --git a/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java b/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java index bc7ca989..8d32df36 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinInitialisationError.java @@ -24,6 +24,9 @@ */ package org.spongepowered.asm.launch; +/** + * Error raised when mixin subsystem initialisation fails + */ public class MixinInitialisationError extends Error { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 44e09374..a15760de 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -545,6 +545,9 @@ public class MixinEnvironment implements ITokenProvider { } + /** + * Temporary + */ static class MixinLogger { static MixinAppender appender = new MixinAppender("MixinLogger", null, null); @@ -555,11 +558,13 @@ public class MixinEnvironment implements ITokenProvider { log.addAppender(appender); } + /** + * Temporary + */ static class MixinAppender extends AbstractAppender { protected MixinAppender(String name, Filter filter, Layout layout) { super(name, filter, layout); - // TODO Auto-generated constructor stub } @Override diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinException.java b/src/main/java/org/spongepowered/asm/mixin/MixinException.java index ef71da5d..059723c0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinException.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinException.java @@ -24,6 +24,9 @@ */ package org.spongepowered.asm.mixin; +/** + * Base class for all mixin processor exceptions + */ public class MixinException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java b/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java index 117eed0b..b0aed8c0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java +++ b/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java @@ -29,6 +29,10 @@ import java.util.List; import org.spongepowered.asm.mixin.extensibility.IRemapper; +/** + * Mixin environment remapper chain. Contains all remappers for the current + * environment to facilitate remapping via all registered remappers. + */ public class RemapperChain implements IRemapper { private final List remappers = new ArrayList(); diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java index 696417c2..58005a42 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java @@ -29,6 +29,9 @@ import java.util.List; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +/** + * Interface for MixinInfo, used in extensibility API + */ public interface IMixinInfo { /** diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java index 53229645..96fbdb1d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java @@ -29,52 +29,119 @@ import java.util.HashMap; import java.util.Map; import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.util.ASMHelper; +/** + * Used to keep track of instruction nodes in a {@link Target} method which are + * targetted by various types of injector. This collection is populated during + * the first injector pass and allows injectors to keep track of their targets + * even when the target method is being manipulated by other injectors. + */ public class InjectionNodes extends ArrayList { + /** + * Never gonna give you up + */ private static final long serialVersionUID = 1L; + /** + * A node targetted by one or more injectors. Using this wrapper allows + * injectors to be aware of when their target node is removed or replace by + * another injector. It also allows injectors to decorate certain nodes with + * custom metadata to allow arbitration between injectors to take place. + */ public static class InjectionNode implements Comparable { + /** + * The original node targetted + */ private final AbstractInsnNode originalTarget; + /** + * Initially set to the {@link #originalTarget}, if an injector removes + * or replaces this node then points to the current target. Can be null + * if the node is removed. + */ private AbstractInsnNode currentTarget; + /** + * Injector decorations on this node + */ private Map decorations; - public InjectionNode(AbstractInsnNode target) { - this.currentTarget = this.originalTarget = target; + /** + * Create a new node wrapper for the specified target node + * + * @param node target node + */ + public InjectionNode(AbstractInsnNode node) { + this.currentTarget = this.originalTarget = node; } + /** + * Get the original target of this node + */ public AbstractInsnNode getOriginalTarget() { return this.originalTarget; } + /** + * Get the current target of this node, can be null if the node was + * replaced + */ public AbstractInsnNode getCurrentTarget() { return this.currentTarget; } - public void replace(AbstractInsnNode currentTarget) { - this.currentTarget = currentTarget; + /** + * Replace this node with the specified target + * + * @param target new node + */ + public void replace(AbstractInsnNode target) { + this.currentTarget = target; } + /** + * Remove the node + */ public void remove() { this.currentTarget = null; } + /** + * Checks whether the original or current target of this node match the + * specified node + * + * @param node node to check + * @return true if the supplied node matches either of this node's + * internal identities + */ public boolean matches(AbstractInsnNode node) { return this.originalTarget == node || this.currentTarget == node; } + /** + * Get whether this node has been replaced + */ public boolean isReplaced() { return this.originalTarget != this.currentTarget; } + /** + * Get whether this node has been removed + */ public boolean isRemoved() { return this.currentTarget == null; } + /** + * Decorate this node with arbitrary metadata for injector arbitration + * + * @param key meta key + * @param value meta value + */ public void decorate(K key, V value) { if (this.decorations == null) { this.decorations = new HashMap(); @@ -82,20 +149,38 @@ public class InjectionNodes extends ArrayList { this.decorations.put(key, value); } + /** + * Get whether this node is decorated with the specified key + * + * @param key meta key + * @return true if the specified decoration exists + */ public boolean hasDecoration(K key) { return this.decorations != null && this.decorations.get(key) != null; } + /** + * Get the specified decoration + * + * @param key meta key + * @return decoration value or null if absent + */ @SuppressWarnings("unchecked") public V getDecoration(K key) { return (V) (this.decorations == null ? null : this.decorations.get(key)); } + /* (non-Javadoc) + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ @Override public int compareTo(InjectionNode other) { return other == null ? Integer.MAX_VALUE : this.hashCode() - other.hashCode(); } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ @Override public String toString() { return String.format("InjectionNode[%s]", ASMHelper.getNodeDescriptionForDebug(this.currentTarget)); @@ -103,6 +188,12 @@ public class InjectionNodes extends ArrayList { } + /** + * Add a tracked node to this collection if it does not already exist + * + * @param node Instruction node to add + * @return wrapper for the specified node + */ public InjectionNode add(AbstractInsnNode node) { InjectionNode injectionNode = this.get(node); if (injectionNode == null) { @@ -112,6 +203,13 @@ public class InjectionNodes extends ArrayList { return injectionNode; } + /** + * Get a tracked node from this collection if it already exists, returns + * null if the node is not tracked + * + * @param node instruction node + * @return wrapper node or null if not tracked + */ public InjectionNode get(AbstractInsnNode node) { for (InjectionNode injectionNode : this) { if (injectionNode.matches(node)) { @@ -121,10 +219,23 @@ public class InjectionNodes extends ArrayList { return null; } + /** + * Get whether this collection contains a mapping for the specified insn + * + * @param node instruction node to check + * @return true if a wrapper exists for the node + */ public boolean contains(AbstractInsnNode node) { return this.get(node) != null; } + /** + * Replace the specified node with the new node, does not update the wrapper + * if no wrapper exists for oldNode + * + * @param oldNode node being replaced + * @param newNode node to replace with + */ public void replace(AbstractInsnNode oldNode, AbstractInsnNode newNode) { InjectionNode injectionNode = this.get(oldNode); if (injectionNode != null) { @@ -132,8 +243,14 @@ public class InjectionNodes extends ArrayList { } } - public void remove(AbstractInsnNode oldNode) { - InjectionNode injectionNode = this.get(oldNode); + /** + * Mark the specified node as removed, does not update the wrapper if no + * wrapper exists + * + * @param node node being removed + */ + public void remove(AbstractInsnNode node) { + InjectionNode injectionNode = this.get(node); if (injectionNode != null) { injectionNode.remove(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java index 84f67f18..b16c8bf4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java @@ -24,6 +24,7 @@ */ package org.spongepowered.asm.mixin.injection; +import java.lang.reflect.Array; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Arrays; @@ -148,12 +149,12 @@ public abstract class InjectionPoint { super(points); } + @SuppressWarnings("unchecked") @Override public boolean find(String desc, InsnList insns, Collection nodes) { boolean found = false; - @SuppressWarnings("unchecked") - ArrayList[] allNodes = new ArrayList[this.components.length]; + ArrayList[] allNodes = (ArrayList[]) Array.newInstance(ArrayList.class, this.components.length); for (int i = 0; i < this.components.length; i++) { allNodes[i] = new ArrayList(); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java index 19a61b3e..8efcbd2e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java @@ -24,6 +24,9 @@ */ package org.spongepowered.asm.mixin.injection; +/** + * Thrown when an injector group fails an injection check + */ public class InjectionValidationException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java index 3b896892..bd0517ca 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java @@ -28,6 +28,10 @@ import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.InvalidMixinException; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +/** + * Thrown when an injector fails a state check, for example if an injector + * handler signature is invalid, an invalid opcode is targetted, etc. + */ public class InvalidInjectionException extends InvalidMixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CancellationException.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CancellationException.java index d9fdcb10..c2c27639 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CancellationException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CancellationException.java @@ -24,6 +24,10 @@ */ package org.spongepowered.asm.mixin.injection.callback; +/** + * Exception thrown when a consumer attemtps to call cancel() on a + * callback not marked as cancellable. + */ public class CancellationException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java index 733103ff..8a0a7ac4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java @@ -26,6 +26,10 @@ package org.spongepowered.asm.mixin.injection.modify; import org.spongepowered.asm.mixin.MixinException; +/** + * Thrown when an implicit discriminator (no args) fails to identify + * a unique candidate. + */ public class InvalidImplicitDiscriminatorException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java index 313a55f7..4e671147 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java @@ -26,12 +26,16 @@ package org.spongepowered.asm.mixin.injection.struct; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInjector; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; +/** + * Information about a callback to inject, usually specified by {@link Inject} + */ public class CallbackInjectionInfo extends InjectionInfo { protected CallbackInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java index 44bff320..899eecb0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java @@ -26,6 +26,9 @@ package org.spongepowered.asm.mixin.injection.struct; import org.spongepowered.asm.mixin.MixinException; +/** + * Thrown when a {@link MemberInfo} fails basic syntax validation + */ public class InvalidMemberDescriptorException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java index 5b0ab5cd..bc90793d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java @@ -26,11 +26,15 @@ package org.spongepowered.asm.mixin.injection.struct; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.invoke.ModifyArgInjector; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; +/** + * Information about a {@link ModifyArg} injector + */ public class ModifyArgInjectionInfo extends InjectionInfo { public ModifyArgInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java index cd841cd0..048622b0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java @@ -26,12 +26,16 @@ package org.spongepowered.asm.mixin.injection.struct; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.modify.LocalVariableDiscriminator; import org.spongepowered.asm.mixin.injection.modify.ModifyVariableInjector; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; +/** + * Information about a {@link ModifyVariable} injector + */ public class ModifyVariableInjectionInfo extends InjectionInfo { public ModifyVariableInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java index e3396041..d56531c8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java @@ -30,6 +30,9 @@ import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.invoke.RedirectInjector; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +/** + * Information about a redirector injector + */ public class RedirectInjectionInfo extends InjectionInfo { public RedirectInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java index d06e2bc2..65b1485b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java @@ -37,42 +37,107 @@ import com.google.gson.GsonBuilder; import net.minecraft.launchwrapper.Launch; +/** + * Stores runtime information allowing field, method and type references which + * cannot be hard remapped by the reobfuscation process to be remapped in a + * "soft" manner at runtime. Refmaps are generated by the Annotation + * Processor at compile time and must be bundled with an obfuscated binary + * to allow obfuscated references in injectors and other String-defined targets + * to be remapped to the target obfsucation environment as appropriate. If the + * refmap is absent the environment is assumed to be deobfuscated (eg. dev-time) + * and injections and other transformations will fail if this is not the case. + */ public final class ReferenceMapper implements Serializable { private static final long serialVersionUID = 2L; + /** + * Resource to attempt to load if no source is specified explicitly + */ public static final String DEFAULT_RESOURCE = "mixin.refmap.json"; + /** + * Passthrough mapper, used as failover + */ public static final ReferenceMapper DEFAULT_MAPPER = new ReferenceMapper(true); + /** + * "Default" mappings. The set of mappings to use as "default" is specified + * by the AP. Each entry is keyed by the owning mixin, with the value map + * containing the actual remappings for each owner + */ private final Map> mappings = Maps.newHashMap(); + /** + * All mapping sets, keyed by environment type, eg. "notch", "searge". The + * format of each map within this map is the same as for {@link #mappings} + */ private final Map>> data = Maps.newHashMap(); + /** + * True if this refmap cannot be written. Only true for the + * {@link #DEFAULT_MAPPER} + */ private final transient boolean readOnly; + /** + * Current remapping context, used as the key into {@link data} + */ private transient String context = null; + /** + * Create an empty refmap + */ public ReferenceMapper() { this(false); } + /** + * Create a readonly refmap, only used by {@link #DEFAULT_MAPPER} + * + * @param readOnly flag to indicate read-only + */ private ReferenceMapper(boolean readOnly) { this.readOnly = readOnly; } + /** + * Get the current context + * + * @return current context key, can be null + */ public String getContext() { return this.context; } + /** + * Set the current remap context, can be null + * + * @param context remap context + */ public void setContext(String context) { this.context = context; } + /** + * Remap a reference for the specified owning class in the current context + * + * @param className Owner class + * @param reference Reference to remap + * @return remapped reference, returns original reference if not remapped + */ public String remap(String className, String reference) { return this.remapWithContext(this.context, className, reference); } + /** + * Remap a reference for the specified owning class in the specified context + * + * @param context Remap context to use + * @param className Owner class + * @param reference Reference to remap + * @return remapped reference, returns original reference if not remapped + */ public String remapWithContext(String context, String className, String reference) { Map> mappings = this.mappings; if (context != null) { @@ -84,6 +149,9 @@ public final class ReferenceMapper implements Serializable { return this.remap(mappings, className, reference); } + /** + * Remap the things + */ private String remap(Map> mappings, String className, String reference) { if (className == null) { for (Map mapping : mappings.values()) { @@ -101,8 +169,16 @@ public final class ReferenceMapper implements Serializable { return remappedReference != null ? remappedReference : reference; } + /** + * Add a mapping to this refmap + * + * @param context Obfuscation context, can be null + * @param className Class which owns this mapping, cannot be null + * @param reference Reference to remap, cannot be null + * @param newReference Remapped value, cannot be null + */ public void addMapping(String context, String className, String reference, String newReference) { - if (this.readOnly) { + if (this.readOnly || reference == null || newReference == null || reference.equals(newReference)) { return; } Map> mappings = this.mappings; @@ -121,10 +197,21 @@ public final class ReferenceMapper implements Serializable { classMappings.put(reference, newReference); } + /** + * Write this refmap out to the specified writer + * + * @param writer Writer to write to + */ public void write(Appendable writer) { new GsonBuilder().setPrettyPrinting().create().toJson(this, writer); } + /** + * Read a new refmap from the specified resource + * + * @param resource Resource to read from + * @return new refmap or {@link #DEFAULT_MAPPER} if reading fails + */ public static ReferenceMapper read(String resource) { Reader reader = null; try { @@ -143,7 +230,18 @@ public final class ReferenceMapper implements Serializable { } } + /** + * Read a new refmap instance from the specified reader + * + * @param reader Reader to read from + * @return new refmap + */ public static ReferenceMapper read(Reader reader) { - return new Gson().fromJson(reader, ReferenceMapper.class); + try { + return new Gson().fromJson(reader, ReferenceMapper.class); + } catch (Exception ex) { + return ReferenceMapper.DEFAULT_MAPPER; + } } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index fd25c807..269cb0e0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -156,6 +156,9 @@ public class ClassInfo extends TreeInfo { */ abstract static class Member { + /** + * Member type + */ static enum Type { METHOD, FIELD diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java index c726fc63..447285be 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java @@ -26,6 +26,9 @@ package org.spongepowered.asm.mixin.transformer; import org.spongepowered.asm.mixin.MixinException; +/** + * Thrown by the mixin validator when a mixin fails a pre-flight check + */ public class InvalidMixinException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java index bd9cf76a..4240a8e8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java @@ -34,6 +34,9 @@ import org.spongepowered.asm.mixin.MixinException; */ public class MixinTransformerModuleCheckClass implements IMixinTransformerModule { + /** + * Exception thrown when checkclass fails + */ public static class ValidationFailedException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgField.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgField.java index 77b747d9..30f25b4f 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgField.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgField.java @@ -26,6 +26,9 @@ package org.spongepowered.asm.obfuscation; import com.google.common.base.Objects; +/** + * Stores information about an SRG field mapping during AP runs + */ public final class SrgField { private final String mapping; diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java index f214129e..f0a9d8f6 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java @@ -26,6 +26,9 @@ package org.spongepowered.asm.obfuscation; import com.google.common.base.Objects; +/** + * Stores information about an SRG method mapping during AP runs + */ public final class SrgMethod { private final String name; diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 7d08b138..de2bfcab 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -41,6 +41,9 @@ import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.lib.util.CheckClassAdapter; +/** + * Utility methods for working with ASM + */ public class ASMHelper { private static final int[] intConstants = new int[] diff --git a/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java b/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java index f6ba9af5..a9bc5348 100644 --- a/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java +++ b/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java @@ -26,6 +26,10 @@ package org.spongepowered.asm.util; import org.spongepowered.asm.mixin.MixinException; +/** + * Exception thrown when something goes horribly wrong whilst summoning the + * antichrist generating the LVT for a target method. + */ public class LVTGeneratorException extends MixinException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java b/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java index ee990ccd..5dc69656 100644 --- a/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java +++ b/src/main/java/org/spongepowered/asm/util/ObfuscationUtil.java @@ -24,8 +24,14 @@ */ package org.spongepowered.asm.util; +/** + * Utility methods for obfuscation tasks + */ public abstract class ObfuscationUtil { + /** + * Interface for remapper proxies + */ public interface IClassRemapper { /** diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index de2c5432..67f08ac0 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -40,8 +40,16 @@ import com.google.common.base.Strings; */ public class PrettyPrinter { + /** + * Interface for object which supports printing to pretty printer + */ public interface IPrettyPrintable { + /** + * Append this objec to specified pretty printer + * + * @param printer printer to append to + */ public abstract void print(PrettyPrinter printer); } From af602861920cec1090f70ff62c8fb1ab449915a3 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 5 Feb 2016 17:32:36 +0000 Subject: [PATCH 116/169] Use meta class for redirector metadata in place of multiple keys --- .../asm/mixin/injection/InjectionNodes.java | 9 ++- .../injection/invoke/RedirectInjector.java | 68 ++++++++++++------- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java index 96fbdb1d..006e9cec 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionNodes.java @@ -99,15 +99,17 @@ public class InjectionNodes extends ArrayList { * * @param target new node */ - public void replace(AbstractInsnNode target) { + public InjectionNode replace(AbstractInsnNode target) { this.currentTarget = target; + return this; } /** * Remove the node */ - public void remove() { + public InjectionNode remove() { this.currentTarget = null; + return this; } /** @@ -142,11 +144,12 @@ public class InjectionNodes extends ArrayList { * @param key meta key * @param value meta value */ - public void decorate(K key, V value) { + public InjectionNode decorate(K key, V value) { if (this.decorations == null) { this.decorations = new HashMap(); } this.decorations.put(key, value); + return this; } /** diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index 1114b912..75bbcebd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -78,18 +78,46 @@ import com.google.common.primitives.Ints; * required signature of the handler method.

*/ public class RedirectInjector extends InvokeInjector { + + /** + * Meta decoration object for redirector target nodes + */ + class Meta { + + public static final String KEY = "redirector"; - private final int priority; - - private final boolean isFinal; + final int priority; + + final boolean isFinal; + + final String name; + + final String desc; + + public Meta(int priority, boolean isFinal, String name, String desc) { + this.priority = priority; + this.isFinal = isFinal; + this.name = name; + this.desc = desc; + } + + RedirectInjector getOwner() { + return RedirectInjector.this; + } + + } + private Meta meta; + /** * @param info Injection info */ public RedirectInjector(InjectionInfo info) { super(info, "@Redirect"); - this.priority = info.getContext().getPriority(); - this.isFinal = ASMHelper.getVisibleAnnotation(this.methodNode, Final.class) != null; + + int priority = info.getContext().getPriority(); + boolean isFinal = ASMHelper.getVisibleAnnotation(this.methodNode, Final.class) != null; + this.meta = new Meta(priority, isFinal, this.info.toString(), this.methodNode.desc); } @Override @@ -97,39 +125,29 @@ public class RedirectInjector extends InvokeInjector { InjectionNode node = target.injectionNodes.get(insn); if (node != null ) { - boolean isRedirect = node.getDecoration("redir:ect") == Boolean.TRUE; - RedirectInjector redirector = node.getDecoration("redir:owner"); - Boolean isFinal = node.getDecoration("redir:final"); - Integer priority = node.getDecoration("redir:priority"); + Meta other = node.getDecoration(Meta.KEY); - if (isRedirect && redirector != this) { - if (priority >= this.priority) { + if (other != null && other.getOwner() != this) { + if (other.priority >= this.meta.priority) { Injector.logger.warn("{} conflict. Skipping {} with priority {}, already redirected by {} with priority {}", - this.annotationType, this.info, this.priority, node.getDecoration("redir:name"), node.getDecoration("redir:priority")); + this.annotationType, this.info, this.meta.priority, other.name, other.priority); return; - } else if (isFinal != null && isFinal.booleanValue()) { + } else if (other.isFinal) { throw new InvalidInjectionException(this.info, this.annotationType + " conflict: " + this - + " failed because target was already remapped by " + node.getDecoration("redir:name")); + + " failed because target was already remapped by " + other.name); } } } - node = target.injectionNodes.add(insn); - node.decorate("redir:ect", Boolean.TRUE); - node.decorate("redir:owner", this); - node.decorate("redir:priority", Integer.valueOf(this.priority)); - node.decorate("redir:final", Boolean.valueOf(this.isFinal)); - node.decorate("redir:name", this.info.toString()); - node.decorate("redir:desc", this.methodNode.desc); - - myNodes.add(node); + myNodes.add(target.injectionNodes.add(insn).decorate(Meta.KEY, this.meta)); } @Override protected void inject(Target target, InjectionNode node) { - if (node.getDecoration("redir:owner") != this) { + Meta other = node.getDecoration(Meta.KEY); + if (other.getOwner() != this) { Injector.logger.warn("{} conflict. Skipping {} with priority {}, already redirected by {} with priority {}", - this.annotationType, this.info, this.priority, node.getDecoration("redir:name"), node.getDecoration("redir:priority")); + this.annotationType, this.info, this.meta.priority, other.name, other.priority); return; } From 7205be2d680785f0a5c50c6897e825997dcf00b1 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 5 Feb 2016 18:23:53 +0000 Subject: [PATCH 117/169] Fix usage of asterisk (matchAll) selectors for injector targets --- .../mixin/injection/callback/CallbackInjector.java | 4 ++-- .../asm/mixin/injection/struct/InjectionInfo.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 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 c9ed07b0..7a6549ec 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 @@ -356,7 +356,7 @@ public class CallbackInjector extends Injector { MethodNode callbackMethod = this.methodNode; if (!callback.checkDescriptor(this.methodNode.desc)) { - if (this.info.getTargets().size() != 0) { + if (this.info.getTargets().size() > 1) { return; // Look for a match in other targets before failing } @@ -418,7 +418,7 @@ public class CallbackInjector extends Injector { this.injectCancellationCode(callback); callback.inject(); - this.info.getTargets().clear(); + this.info.notifyInjected(callback.target); } /** 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 8ed5a2b1..53aa1494 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 @@ -228,8 +228,9 @@ public abstract class InjectionInfo { * Discover injection points */ public void prepare() { - while (this.targets.size() > 0) { - Target target = this.mixin.getTargetMethod(this.targets.removeFirst()); + this.targetNodes.clear(); + for (MethodNode targetMethod : this.targets) { + Target target = this.mixin.getTargetMethod(targetMethod); this.targetNodes.put(target, this.injector.find(target, this.injectionPoints)); } } @@ -241,6 +242,7 @@ public abstract class InjectionInfo { for (Entry> entry : this.targetNodes.entrySet()) { this.injector.inject(entry.getKey(), entry.getValue()); } + this.targets.clear(); } /** @@ -262,6 +264,11 @@ public abstract class InjectionInfo { } } + public void notifyInjected(Target target) { +// this.targets.remove(target.method); + } + + protected String getDescription() { return "Callback method"; } @@ -401,4 +408,5 @@ public abstract class InjectionInfo { return null; } + } From 665908d32ec4f638cf9848c2d9e46c742d7a9b00 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 8 Feb 2016 13:23:41 +0000 Subject: [PATCH 118/169] Javadoc tweaks --- .../org/spongepowered/asm/mixin/injection/code/Injector.java | 3 ++- .../asm/mixin/injection/invoke/InvokeInjector.java | 2 ++ .../asm/mixin/injection/points/BeforeInvoke.java | 4 ++-- .../asm/mixin/transformer/MixinTargetContext.java | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) 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 27933b4c..1bc1c694 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 @@ -195,6 +195,7 @@ public abstract class Injector { * Invoke the handler method * * @param insns Instruction list to inject into + * @return injected insn node */ protected AbstractInsnNode invokeHandler(InsnList insns) { return this.invokeHandler(insns, this.methodNode); @@ -206,7 +207,7 @@ public abstract class Injector { * @param insns Instruction list to inject into * @param handler Actual method to invoke (may be different if using a * surrogate) - * @return + * @return injected insn node */ protected AbstractInsnNode invokeHandler(InsnList insns, MethodNode handler) { boolean isPrivate = (handler.access & Opcodes.ACC_PRIVATE) != 0; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index 6281003d..23d5d651 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -96,6 +96,7 @@ public abstract class InvokeInjector extends Injector { * @param args handler arguments * @param insns InsnList to inject insns into * @param argMap Mapping of args to local variables + * @return injected insn node */ protected AbstractInsnNode invokeHandlerWithArgs(Type[] args, InsnList insns, int[] argMap) { return this.invokeHandlerWithArgs(args, insns, argMap, 0, args.length); @@ -107,6 +108,7 @@ public abstract class InvokeInjector extends Injector { * @param argMap Mapping of args to local variables * @param startArg Starting arg to consume * @param endArg Ending arg to consume + * @return injected insn node */ protected AbstractInsnNode invokeHandlerWithArgs(Type[] args, InsnList insns, int[] argMap, int startArg, int endArg) { if (!this.isStatic) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java b/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java index e57b4af8..9249322d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/points/BeforeInvoke.java @@ -71,9 +71,9 @@ public class BeforeInvoke extends InjectionPoint { protected final MemberInfo target; /** - * This strategy can be used to identify a particular invokation if the same + * This strategy can be used to identify a particular invocation if the same * method is invoked at multiple points, if this value is -1 then the - * strategy returns all invokations of the method. + * strategy returns all invocations of the method. */ protected final int ordinal; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 4531c885..1b79ab26 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -290,7 +290,7 @@ public class MixinTargetContext implements IReferenceMapperContext { /** * Handles "re-parenting" the method supplied, changes all references to the * mixin class to refer to the target class (for field accesses and method - * invokations) and also handles fixing up the targets of INVOKESPECIAL + * invocations) and also handles fixing up the targets of INVOKESPECIAL * opcodes for mixins with detached targets. * * @param method Method to transform @@ -520,7 +520,7 @@ public class MixinTargetContext implements IReferenceMapperContext { } /** - * Handle "imaginary super" invokations, these are invokations in + * Handle "imaginary super" invocations, these are invocations in * non-derived mixins for accessing methods known to exist in a supermixin * which is not directly inherited by this mixix. The method can only call * its own super-implmentation and the methd must also be tagged with From 590c11d6cdd6da24b75fe4235aaed826042d8de7 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 8 Feb 2016 14:05:42 +0000 Subject: [PATCH 119/169] Fix multi-mixin injector arbitration once and for all --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../transformer/InterfaceMixinApplicator.java | 14 +- .../mixin/transformer/MixinApplicator.java | 129 +++++++++++------- .../mixin/transformer/MixinTargetContext.java | 44 ++++++ 5 files changed, 141 insertions(+), 50 deletions(-) diff --git a/gradle.properties b/gradle.properties index 912e9531..e0b0a086 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5 +buildVersion=0.5.1 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 66921579..9498cb1e 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5"; + public static final String VERSION = "0.5.1"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java index 5a309940..347d2a98 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java @@ -86,11 +86,11 @@ public class InterfaceMixinApplicator extends MixinApplicator { /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.MixinApplicator - * #applyInjections( + * #prepareInjections( * org.spongepowered.asm.mixin.transformer.MixinTargetContext) */ @Override - protected void applyInjections(MixinTargetContext mixin) { + protected void prepareInjections(MixinTargetContext mixin) { // disabled for interface mixins for (MethodNode method : this.targetClass.methods) { try { @@ -104,5 +104,15 @@ public class InterfaceMixinApplicator extends MixinApplicator { } } } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.transformer.MixinApplicator + * #applyInjections( + * org.spongepowered.asm.mixin.transformer.MixinTargetContext) + */ + @Override + protected void applyInjections(MixinTargetContext mixin) { + // Do nothing + } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index f46fb8d8..4588df5f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -51,8 +51,6 @@ import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.util.ASMHelper; @@ -67,6 +65,26 @@ import org.spongepowered.asm.util.InvalidConstraintException; */ public class MixinApplicator { + /** + * Passes the mixin applicator applies to each mixin + */ + enum ApplicatorPass { + /** + * Main pass, mix in methods, fields, interfaces etc + */ + MAIN, + + /** + * Enumerate injectors and scan for injection points + */ + PREINJECT, + + /** + * Apply injectors from previous pass + */ + INJECT + } + /** * Internal struct for representing a range */ @@ -185,9 +203,36 @@ public class MixinApplicator { * Apply supplied mixins to the target class */ void apply(SortedSet mixins) { + List mixinContexts = new ArrayList(); + for (MixinInfo mixin : mixins) { this.logger.log(mixin.getLoggingLevel(), "Mixing {} from {} into {}", mixin.getName(), mixin.getParent(), this.targetName); - this.applyMixin(mixin.createContextFor(this.targetClass)); + mixinContexts.add(mixin.createContextFor(this.targetClass)); + } + + MixinTargetContext current = null; + + try { + for (MixinTargetContext context : mixinContexts) { + current = context; + context.preApply(this.targetName, this.targetClass); + } + + for (ApplicatorPass pass : ApplicatorPass.values()) { + for (MixinTargetContext context : mixinContexts) { + current = context; + this.applyMixin(context, pass); + } + } + + for (MixinTargetContext context : mixinContexts) { + current = context; + context.postApply(this.targetName, this.targetClass); + } + } catch (InvalidMixinException ex) { + throw ex; + } catch (Exception ex) { + throw new InvalidMixinException(current, "Unexpecteded error whilst applying the mixin class", ex); } } @@ -196,23 +241,28 @@ public class MixinApplicator { * * @param mixin Mixin to apply */ - protected final void applyMixin(MixinTargetContext mixin) { - try { - mixin.preApply(this.targetName, this.targetClass); - - this.applyInterfaces(mixin); - this.applyAttributes(mixin); - this.applyAnnotations(mixin); - this.applyFields(mixin); - this.applyMethods(mixin); - this.applyInitialisers(mixin); - this.applyInjections(mixin); - - mixin.postApply(this.targetName, this.targetClass); - } catch (InvalidMixinException ex) { - throw ex; - } catch (Exception ex) { - throw new InvalidMixinException(mixin, "Unexpecteded error whilst applying the mixin class", ex); + protected final void applyMixin(MixinTargetContext mixin, ApplicatorPass pass) { + switch (pass) { + case MAIN: + this.applyInterfaces(mixin); + this.applyAttributes(mixin); + this.applyAnnotations(mixin); + this.applyFields(mixin); + this.applyMethods(mixin); + this.applyInitialisers(mixin); + break; + + case PREINJECT: + this.prepareInjections(mixin); + break; + + case INJECT: + this.applyInjections(mixin); + break; + + default: + // wat? + throw new IllegalStateException("Invalid pass specified " + pass); } } @@ -705,34 +755,21 @@ public class MixinApplicator { } /** - * Process {@link Inject} annotations and inject callbacks to annotated - * methods - * @param mixin + * Scan for injector methods and injection points + * + * @param mixin Mixin being scanned + */ + protected void prepareInjections(MixinTargetContext mixin) { + mixin.prepareInjections(); + } + + /** + * Apply all injectors discovered in the previous pass + * + * @param mixin Mixin being applied */ protected void applyInjections(MixinTargetContext mixin) { - List injectors = new ArrayList(); - - for (MethodNode method : this.targetClass.methods) { - InjectionInfo injectInfo = InjectionInfo.parse(mixin, method); - if (injectInfo == null) { - continue; - } - - if (injectInfo.isValid()) { - injectInfo.prepare(); - injectors.add(injectInfo); - } - - method.visibleAnnotations.remove(injectInfo.getAnnotation()); - } - - for (InjectionInfo injectInfo : injectors) { - injectInfo.inject(); - } - - for (InjectionInfo injectInfo : injectors) { - injectInfo.postInject(); - } + mixin.applyInjections(); } /** diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 1b79ab26..42059621 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -49,6 +49,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.InjectionError; import org.spongepowered.asm.mixin.injection.InjectionValidationException; import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; @@ -112,6 +113,12 @@ public class MixinTargetContext implements IReferenceMapperContext { */ protected final InjectorGroupInfo.Map injectorGroups = new InjectorGroupInfo.Map(); + /** + * Injectors for this target + */ + protected final List injectors = new ArrayList(); + + /** * True if this mixin inherits from a mixin at any point in its hierarchy */ @@ -872,4 +879,41 @@ public class MixinTargetContext implements IReferenceMapperContext { this.mixin.postApply(transformedName, targetClass); } + /** + * Scans the target class for injector methods and prepares discovered + * injectors + */ + public void prepareInjections() { + this.injectors.clear(); + + for (MethodNode method : this.targetClass.methods) { + InjectionInfo injectInfo = InjectionInfo.parse(this, method); + if (injectInfo == null) { + continue; + } + + if (injectInfo.isValid()) { + injectInfo.prepare(); + this.injectors.add(injectInfo); + } + + method.visibleAnnotations.remove(injectInfo.getAnnotation()); + } + } + + /** + * Apply injectors discovered in the {@link #prepareInjections()} pass + */ + public void applyInjections() { + for (InjectionInfo injectInfo : this.injectors) { + injectInfo.inject(); + } + + for (InjectionInfo injectInfo : this.injectors) { + injectInfo.postInject(); + } + + this.injectors.clear(); + } + } From 6e32c0069d9b81ec21f18f7096e54cd1df8a1695 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 8 Feb 2016 14:08:46 +0000 Subject: [PATCH 120/169] This is neater --- .../asm/mixin/transformer/MixinApplicator.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 4588df5f..0728c18e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -214,20 +214,17 @@ public class MixinApplicator { try { for (MixinTargetContext context : mixinContexts) { - current = context; - context.preApply(this.targetName, this.targetClass); + (current = context).preApply(this.targetName, this.targetClass); } for (ApplicatorPass pass : ApplicatorPass.values()) { for (MixinTargetContext context : mixinContexts) { - current = context; - this.applyMixin(context, pass); + this.applyMixin(current = context, pass); } } for (MixinTargetContext context : mixinContexts) { - current = context; - context.postApply(this.targetName, this.targetClass); + (current = context).postApply(this.targetName, this.targetClass); } } catch (InvalidMixinException ex) { throw ex; From 14315014076083e2653c712c28b5451eb4a3b085 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 8 Feb 2016 15:19:01 +0000 Subject: [PATCH 121/169] Preserve correct context through injection passes --- .../mixin/transformer/MixinApplicator.java | 19 ++++--------- .../asm/mixin/transformer/MixinInfo.java | 2 +- .../mixin/transformer/MixinPreProcessor.java | 2 +- .../mixin/transformer/MixinTargetContext.java | 28 ++++++++++++++++--- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 0728c18e..d5465cc8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -177,11 +177,9 @@ public class MixinApplicator { protected final Logger logger = LogManager.getLogger("mixin"); /** - * Session ID, used as a check when parsing {@link MixinMerged} annotations - * to prevent them being applied at compile time by people trying to - * circumvent mixin application + * Target class context */ - protected final String sessionId; + protected final TargetClassContext context; /** * Target class name @@ -194,7 +192,7 @@ public class MixinApplicator { protected final ClassNode targetClass; MixinApplicator(TargetClassContext context) { - this.sessionId = context.getSessionId(); + this.context = context; this.targetName = context.getName(); this.targetClass = context.getClassNode(); } @@ -207,7 +205,7 @@ public class MixinApplicator { for (MixinInfo mixin : mixins) { this.logger.log(mixin.getLoggingLevel(), "Mixing {} from {} into {}", mixin.getName(), mixin.getParent(), this.targetName); - mixinContexts.add(mixin.createContextFor(this.targetClass)); + mixinContexts.add(mixin.createContextFor(this.context)); } MixinTargetContext current = null; @@ -400,12 +398,7 @@ public class MixinApplicator { } this.targetClass.methods.add(method); - mixin.getTargetClassInfo().addMethod(method); - - ASMHelper.setVisibleAnnotation(method, MixinMerged.class, - "mixin", mixin.getClassName(), - "priority", mixin.getPriority(), - "sessionId", this.sessionId); + mixin.addMergedMethod(method); } /** @@ -431,7 +424,7 @@ public class MixinApplicator { String sessionId = ASMHelper.getAnnotationValue(merged, "sessionId"); - if (!this.sessionId.equals(sessionId)) { + if (!this.context.getSessionId().equals(sessionId)) { throw new ClassFormatError("Invalid @MixinMerged annotation found in" + mixin + " at " + method.name + " in " + this.targetClass.name); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 954025ae..d3285e14 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -702,7 +702,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param target * @return new context */ - public MixinTargetContext createContextFor(ClassNode target) { + public MixinTargetContext createContextFor(TargetClassContext target) { ClassNode classNode = this.getClassNode(ClassReader.EXPAND_FRAMES); return this.createPreProcessor(classNode).prepare().createContextFor(target); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 95364409..d16c9805 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -153,7 +153,7 @@ class MixinPreProcessor { // stub } - MixinTargetContext createContextFor(ClassNode target) { + MixinTargetContext createContextFor(TargetClassContext target) { MixinTargetContext context = new MixinTargetContext(this.mixin, this.classNode, target); this.attach(context); return context; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 42059621..b9e4f90a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -102,6 +102,11 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private final Map shadowFields = new LinkedHashMap(); + /** + * List of methods successfully merged from this mixin + */ + private final List mergedMethods = new ArrayList(); + /** * Information about methods in the target class, used to keep track of * transformations we apply @@ -142,11 +147,11 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param classNode Mixin classnode * @param target target class */ - MixinTargetContext(MixinInfo mixin, ClassNode classNode, ClassNode target) { + MixinTargetContext(MixinInfo mixin, ClassNode classNode, TargetClassContext context) { this.mixin = mixin; this.classNode = classNode; - this.targetClass = target; - this.targetClassInfo = ClassInfo.forName(target.name); + this.targetClass = context.getClassNode(); + this.targetClassInfo = ClassInfo.forName(this.targetClass.name); this.inheritsFromMixin = mixin.getClassInfo().hasMixinInHierarchy() || this.targetClassInfo.hasMixinTargetInHierarchy(); this.detachedSuper = !this.classNode.superName.equals(this.targetClass.superName); this.requireVersion(classNode.version); @@ -166,6 +171,21 @@ public class MixinTargetContext implements IReferenceMapperContext { this.shadowFields.put(fieldNode, fieldInfo); } + /** + * Callback from the applicator which notifies us that a method was merged + * + * @param method + */ + void addMergedMethod(MethodNode method) { + this.mergedMethods.add(method); + this.targetClassInfo.addMethod(method); + +// ASMHelper.setVisibleAnnotation(method, MixinMerged.class, +// "mixin", this.getClassName(), +// "priority", this.getPriority(), +// "sessionId", this.sessionId); + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -886,7 +906,7 @@ public class MixinTargetContext implements IReferenceMapperContext { public void prepareInjections() { this.injectors.clear(); - for (MethodNode method : this.targetClass.methods) { + for (MethodNode method : this.mergedMethods) { InjectionInfo injectInfo = InjectionInfo.parse(this, method); if (injectInfo == null) { continue; From a8a9205491d27a88ddb86014d565704cdffe11f4 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 8 Feb 2016 15:22:29 +0000 Subject: [PATCH 122/169] Apply MixinMerged decorations in MixinTargetContext --- .../asm/mixin/transformer/MixinTargetContext.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index b9e4f90a..8ef2d157 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -54,6 +54,7 @@ import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Traversal; +import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; @@ -87,6 +88,11 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private final ClassNode targetClass; + /** + * Session ID from context + */ + private final String sessionId; + /** * Target ClassInfo */ @@ -154,6 +160,7 @@ public class MixinTargetContext implements IReferenceMapperContext { this.targetClassInfo = ClassInfo.forName(this.targetClass.name); this.inheritsFromMixin = mixin.getClassInfo().hasMixinInHierarchy() || this.targetClassInfo.hasMixinTargetInHierarchy(); this.detachedSuper = !this.classNode.superName.equals(this.targetClass.superName); + this.sessionId = context.getSessionId(); this.requireVersion(classNode.version); } @@ -180,10 +187,10 @@ public class MixinTargetContext implements IReferenceMapperContext { this.mergedMethods.add(method); this.targetClassInfo.addMethod(method); -// ASMHelper.setVisibleAnnotation(method, MixinMerged.class, -// "mixin", this.getClassName(), -// "priority", this.getPriority(), -// "sessionId", this.sessionId); + ASMHelper.setVisibleAnnotation(method, MixinMerged.class, + "mixin", this.getClassName(), + "priority", this.getPriority(), + "sessionId", this.sessionId); } /* (non-Javadoc) From cce1039dc7a88163ee72bed3d3e49c7e84f6f7bc Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 9 Feb 2016 17:00:05 +0000 Subject: [PATCH 123/169] Import targets from upstream jars, supported by MixinGradle --- gradle.properties | 2 +- .../tools/obfuscation/AnnotatedMixins.java | 10 ++++++ .../tools/obfuscation/SupportedOptions.java | 4 ++- .../tools/obfuscation/TargetMap.java | 33 +++++++++++++++++++ .../tools/obfuscation/TypeReference.java | 9 +++++ .../asm/launch/MixinBootstrap.java | 2 +- 6 files changed, 57 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index e0b0a086..e65224d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.1 +buildVersion=0.5.2 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 443b20e9..c07715aa 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -24,6 +24,8 @@ */ package org.spongepowered.tools.obfuscation; +import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; @@ -161,6 +163,14 @@ class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider, ITyp protected TargetMap initTargetMap() { TargetMap targets = TargetMap.create(System.getProperty(AnnotatedMixins.MAPID_SYSTEM_PROPERTY)); System.setProperty(AnnotatedMixins.MAPID_SYSTEM_PROPERTY, targets.getSessionId()); + String targetsFileName = this.getOption(SupportedOptions.DEPENDENCY_TARGETS_FILE); + if (targetsFileName != null) { + try { + targets.readImports(new File(targetsFileName)); + } catch (IOException ex) { + this.printMessage(Kind.WARNING, "Could not read from specified imports file: " + targetsFileName); + } + } return targets; } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index e278faf7..ac1252d0 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -47,6 +47,7 @@ public final class SupportedOptions { public static final String DISABLE_OVERWRITE_CHECKER = "disableOverwriteChecker"; public static final String OVERWRITE_ERROR_LEVEL = "overwriteErrorLevel"; public static final String DEFAULT_OBFUSCATION_ENV = "defaultObfuscationEnv"; + public static final String DEPENDENCY_TARGETS_FILE = "dependencyTargetsFile"; public static final Set all = ImmutableSet.of( SupportedOptions.TOKENS, @@ -61,7 +62,8 @@ public final class SupportedOptions { SupportedOptions.DISABLE_TARGET_EXPORT, SupportedOptions.DISABLE_OVERWRITE_CHECKER, SupportedOptions.OVERWRITE_ERROR_LEVEL, - SupportedOptions.DEFAULT_OBFUSCATION_ENV + SupportedOptions.DEFAULT_OBFUSCATION_ENV, + SupportedOptions.DEPENDENCY_TARGETS_FILE ); private SupportedOptions() {} diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java index 0e5c472a..aa7d9773 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetMap.java @@ -30,6 +30,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.nio.charset.Charset; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -39,6 +40,8 @@ import java.util.Set; import javax.lang.model.element.TypeElement; +import com.google.common.io.Files; + /** * Serialisable map of classes to their associated mixins, used so that we can * pass target information for supermixins from one compiler session to another @@ -106,6 +109,16 @@ public class TargetMap extends HashMap> { this.addMixin(target.getReference(), mixin.getReference()); } + /** + * Register the specified mixin against the specified target + * + * @param target Target class + * @param mixin Mixin class + */ + public void addMixin(String target, String mixin) { + this.addMixin(new TypeReference(target), new TypeReference(mixin)); + } + /** * Register the specified mixin against the specified target * @@ -161,6 +174,25 @@ public class TargetMap extends HashMap> { } return mixins; } + + /** + * Read upstream library mixins from a file + * + * @param file File to read from + * @throws IOException if an error occurs whilst reading the file + */ + public void readImports(File file) throws IOException { + if (!file.isFile()) { + return; + } + + for (String line : Files.readLines(file, Charset.defaultCharset())) { + String[] parts = line.split("\t"); + if (parts.length == 2) { + this.addMixin(parts[1], parts[0]); + } + } + } /** * Write this target map to temporary session file @@ -246,4 +278,5 @@ public class TargetMap extends HashMap> { File tempDir = new File(System.getProperty("java.io.tmpdir")); return new File(tempDir, String.format("mixin-targetdb-%s.tmp", sessionId)); } + } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java index 9e14f807..40e28c9a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeReference.java @@ -56,6 +56,15 @@ public class TypeReference implements Serializable, Comparable { this.handle = handle; } + /** + * Create a type reference with no handle + * + * @param name Name of the type + */ + TypeReference(String name) { + this.name = name; + } + /** * Get the class name (internal format) */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 9498cb1e..2f8be596 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.1"; + public static final String VERSION = "0.5.2"; /** * Blackboard key where the subsystem version will be stored to indicate From 71b44f93f3d980aecec707cf61094265536bdf1e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 9 Feb 2016 17:00:55 +0000 Subject: [PATCH 124/169] Add ID for injectors --- .../asm/mixin/injection/Inject.java | 10 +++++++- .../injection/callback/CallbackInfo.java | 9 ++++--- .../injection/callback/CallbackInjector.java | 24 +++++++++++++++++-- .../struct/CallbackInjectionInfo.java | 3 ++- 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java index 5f065f74..fcbfdfeb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java @@ -42,6 +42,15 @@ import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @Retention(RetentionPolicy.RUNTIME) public @interface Inject { + /** + * The identifier for this injector, can be retrieved via the + * {@link CallbackInfo#getId} accessor. If not specified, the ID defaults to + * the target method name. + * + * @return the injector id to use + */ + public String id() default ""; + /** * String representation of a * {@link org.spongepowered.asm.mixin.injection.struct.MemberInfo @@ -112,7 +121,6 @@ public @interface Inject { */ public LocalCapture locals() default LocalCapture.NO_CAPTURE; - /** * By default, the annotation processor will attempt to locate an * obfuscation mapping for all {@link Inject} methods since it is diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java index 5c954ce7..e3a6c7b3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java @@ -25,6 +25,7 @@ package org.spongepowered.asm.mixin.injection.callback; import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.mixin.injection.Inject; /** * CallbackInfo instances are passed to callbacks in order to provide @@ -65,11 +66,13 @@ public class CallbackInfo implements Cancellable { } /** - * Get the method name where this callback originated + * Get the ID of the injector which defined this callback. This defaults to + * the method name but can be overridden by specifying the {@link Inject#id} + * parameter on the injector * - * @return the name of the calling method + * @return the injector ID */ - public String getName() { + public String getId() { return this.name; } 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 7a6549ec..ff0f77f1 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 @@ -46,6 +46,8 @@ import org.spongepowered.asm.util.Locals; import org.spongepowered.asm.util.PrettyPrinter; import org.spongepowered.asm.util.SignaturePrinter; +import com.google.common.base.Strings; + /** * This class is responsible for generating the bytecode for injected callbacks */ @@ -286,6 +288,11 @@ public class CallbackInjector extends Injector { */ private final LocalCapture localCapture; + /** + * ID to return from callbackinfo + */ + private final String identifier; + /** * Make a new CallbackInjector with the supplied args * @@ -294,10 +301,11 @@ public class CallbackInjector extends Injector { * be cancellable * @param localCapture Local variable capture behaviour */ - public CallbackInjector(InjectionInfo info, boolean cancellable, LocalCapture localCapture) { + public CallbackInjector(InjectionInfo info, boolean cancellable, LocalCapture localCapture, String identifier) { super(info); this.cancellable = cancellable; this.localCapture = localCapture; + this.identifier = identifier; } /* (non-Javadoc) @@ -543,7 +551,7 @@ public class CallbackInjector extends Injector { * invoke */ protected void invokeCallbackInfoCtor(final Callback callback, boolean store) { - callback.add(new LdcInsnNode(callback.target.method.name), true, !store); + callback.add(new LdcInsnNode(this.getIdentifier(callback)), true, !store); callback.add(new InsnNode(this.cancellable ? Opcodes.ICONST_1 : Opcodes.ICONST_0), true, !store); if (callback.isAtReturn) { @@ -582,6 +590,18 @@ public class CallbackInjector extends Injector { this.invokeHandler(callback, callbackMethod); } + /** + * Get the identifier to use for the specified callback. If an id was + * specified by the end user on the annotation then use the value specified, + * otherwise defaults to the target method name. + * + * @param callback Callback being injected + * @return Identifier to use + */ + private String getIdentifier(Callback callback) { + return Strings.isNullOrEmpty(this.identifier) ? callback.target.method.name : this.identifier; + } + /** * if (e.isCancelled()) return e.getReturnValue(); * diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java index 4e671147..da9871e2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java @@ -46,8 +46,9 @@ public class CallbackInjectionInfo extends InjectionInfo { protected Injector initInjector(AnnotationNode injectAnnotation) { boolean cancellable = ASMHelper.getAnnotationValue(injectAnnotation, "cancellable", false); LocalCapture locals = ASMHelper.getAnnotationValue(injectAnnotation, "locals", LocalCapture.class, LocalCapture.NO_CAPTURE); + String identifier = ASMHelper.getAnnotationValue(injectAnnotation, "id", ""); - return new CallbackInjector(this, cancellable, locals); + return new CallbackInjector(this, cancellable, locals, identifier); } } From 71b3d2aaafe5dae312208c5c34ba7b8c88f2741f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 14 Feb 2016 23:10:47 +0000 Subject: [PATCH 125/169] Apply priority logic to injectors as well, fixes #103 --- .../mixin/injection/struct/InjectionInfo.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) 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 53aa1494..9627b553 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 @@ -37,6 +37,7 @@ import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.Inject; @@ -371,16 +372,33 @@ public abstract class InjectionInfo { continue; } - AnnotationNode merged = ASMHelper.getVisibleAnnotation(target, MixinMerged.class); - if (merged != null) { - throw new InvalidInjectionException(this, "Cannot inject into a mixin method"); - } - + this.checkTarget(target); + this.targets.add(target); ordinal++; } } } + + private void checkTarget(MethodNode target) { + AnnotationNode merged = ASMHelper.getVisibleAnnotation(target, MixinMerged.class); + if (merged == null) { + return; + } + + String owner = ASMHelper.getAnnotationValue(merged, "mixin"); + int priority = ASMHelper.getAnnotationValue(merged, "priority"); + + if (priority >= this.mixin.getPriority() && !owner.equals(this.mixin.getClassName())) { + throw new InvalidInjectionException(this, this + " cannot inject into " + this.classNode.name + "::" + target.name + target.desc + + " merged by " + owner + " with priority " + priority); + } + + if (ASMHelper.getVisibleAnnotation(target, Final.class) != null) { + throw new InvalidInjectionException(this, this + " cannot inject into @Final method " + this.classNode.name + "::" + target.name + + target.desc + " merged by " + owner); + } + } @SuppressWarnings("unchecked") public static InjectionInfo parse(MixinTargetContext mixin, MethodNode method) { From 083eb425d7d4494f295a92f69000dc583beb2bd5 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 17 Feb 2016 17:45:47 +0000 Subject: [PATCH 126/169] Give injector handlers unique names to resolve potential conflicts --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/MixinEnvironment.java | 10 +++ .../injection/invoke/RedirectInjector.java | 2 - .../mixin/injection/struct/InjectionInfo.java | 36 +++++++--- .../asm/mixin/transformer/ClassInfo.java | 1 + .../mixin/transformer/MixinApplicator.java | 12 +++- .../mixin/transformer/MixinPreProcessor.java | 49 +++++++++++-- .../mixin/transformer/MixinTargetContext.java | 44 ++++++------ .../mixin/transformer/MixinTransformer.java | 14 +++- .../mixin/transformer/TargetClassContext.java | 68 +++++++++++++++++-- 11 files changed, 191 insertions(+), 49 deletions(-) diff --git a/gradle.properties b/gradle.properties index e65224d9..89716d50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.2 +buildVersion=0.5.3 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 2f8be596..5054e1af 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.2"; + public static final String VERSION = "0.5.3"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index a15760de..4eaf37b9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -291,6 +291,16 @@ public class MixinEnvironment implements ITokenProvider { */ DEBUG_INJECTORS(Option.DEBUG_ALL, "countInjections"), + /** + * Disable the injector handler remapper + */ + DEBUG_DISABLE_HANDLER_REMAP(Option.DEBUG_ALL, "disableHandlerRename") { + @Override + boolean getBooleanValue() { + return Booleans.parseBoolean(System.getProperty(this.property), super.getBooleanValue()); + } + }, + /** * Dumps the bytecode for the target class to disk when mixin * application fails diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index 75bbcebd..f35efdeb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -304,8 +304,6 @@ public class RedirectInjector extends InvokeInjector { return true; } - System.err.printf("%s\n", alternateDesc); - throw new InvalidInjectionException(this.info, this.annotationType + " field " + type + " " + this + " has an invalid signature. Expected " + desc + " but found " + this.methodNode.desc); } 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 9627b553..1d67a8b1 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 @@ -400,15 +400,8 @@ public abstract class InjectionInfo { } } - @SuppressWarnings("unchecked") public static InjectionInfo parse(MixinTargetContext mixin, MethodNode method) { - AnnotationNode annotation = null; - try { - annotation = ASMHelper.getSingleVisibleAnnotation(method, Inject.class, ModifyArg.class, Redirect.class, ModifyVariable.class); - } catch (IllegalArgumentException ex) { - throw new InvalidMixinException(mixin, "Error parsing annotations on " + method.name + " in " + mixin.getClassName() + ": " - + ex.getMessage()); - } + AnnotationNode annotation = InjectionInfo.getInjectorAnnotation(mixin, method); if (annotation == null) { return null; @@ -426,5 +419,30 @@ public abstract class InjectionInfo { return null; } - + + @SuppressWarnings("unchecked") + public static AnnotationNode getInjectorAnnotation(MixinTargetContext mixin, MethodNode method) { + AnnotationNode annotation = null; + try { + annotation = ASMHelper.getSingleVisibleAnnotation(method, Inject.class, ModifyArg.class, Redirect.class, ModifyVariable.class); + } catch (IllegalArgumentException ex) { + throw new InvalidMixinException(mixin, "Error parsing annotations on " + method.name + " in " + mixin.getClassName() + ": " + + ex.getMessage()); + } + return annotation; + } + + public static String getInjectorPrefix(AnnotationNode annotation) { + if (annotation != null) { + if (annotation.desc.endsWith(ModifyArg.class.getSimpleName() + ";")) { + return "modify"; + } else if (annotation.desc.endsWith(Redirect.class.getSimpleName() + ";")) { + return "redirect"; + } else if (annotation.desc.endsWith(ModifyVariable.class.getSimpleName() + ";")) { + return "localvar"; + } + } + return "handler"; + } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 269cb0e0..98ce2cd9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -60,6 +60,7 @@ public class ClassInfo extends TreeInfo { public static final int INCLUDE_PRIVATE = 0x0002; public static final int INCLUDE_STATIC = 0x0008; + public static final int INCLUDE_ALL = ClassInfo.INCLUDE_PRIVATE | ClassInfo.INCLUDE_STATIC; /** *

To all intents and purposes, the "real" class hierarchy and the mixin diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index d5465cc8..1619e472 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -193,7 +193,7 @@ public class MixinApplicator { MixinApplicator(TargetClassContext context) { this.context = context; - this.targetName = context.getName(); + this.targetName = context.getClassName(); this.targetClass = context.getClassNode(); } @@ -427,7 +427,15 @@ public class MixinApplicator { if (!this.context.getSessionId().equals(sessionId)) { throw new ClassFormatError("Invalid @MixinMerged annotation found in" + mixin + " at " + method.name + " in " + this.targetClass.name); } - + + if (MixinApplicator.hasFlag(target, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE) + && MixinApplicator.hasFlag(method, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE)) { + if (mixin.getEnvironment().getOption(Option.DEBUG_VERBOSE)) { + this.logger.warn("Synthetic bridge method clash for {} in {}", method.name, mixin); + } + return true; + } + String owner = ASMHelper.getAnnotationValue(merged, "mixin"); int priority = ASMHelper.getAnnotationValue(merged, "priority"); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index d16c9805..0afc1b4e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -47,6 +47,8 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.RemapperChain; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.Surrogate; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; @@ -188,13 +190,21 @@ class MixinPreProcessor { continue; } - if (this.processMethod(context, mixinMethod, Shadow.class, true, true)) { + if (this.processInjectorMethod(context, mixinMethod)) { + continue; + } + + if (this.processMemberMethod(context, mixinMethod, Shadow.class, true, true)) { iter.remove(); context.addShadowMethod(mixinMethod); continue; } - this.processMethod(context, mixinMethod, Overwrite.class, false, false); + if (this.processMemberMethod(context, mixinMethod, Overwrite.class, false, false)) { + continue; + } + + this.processMethod(mixinMethod); } } @@ -202,14 +212,28 @@ class MixinPreProcessor { return true; } - protected boolean processMethod(MixinTargetContext context, MethodNode mixinMethod, Class annotationType, + protected boolean processInjectorMethod(MixinTargetContext context, MethodNode mixinMethod) { + AnnotationNode annotation = InjectionInfo.getInjectorAnnotation(context, mixinMethod); + boolean surrogate = ASMHelper.getVisibleAnnotation(mixinMethod, Surrogate.class) != null; + if (annotation == null && !surrogate) { + return false; + } + + String handlerName = context.getHandlerName(annotation, mixinMethod, surrogate); + Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_ALL); + method.renameTo(handlerName); + mixinMethod.name = handlerName; + return true; + } + + protected boolean processMemberMethod(MixinTargetContext context, MethodNode mixinMethod, Class annotationType, boolean mustExist, boolean mustBePrivate) { AnnotationNode annotation = ASMHelper.getVisibleAnnotation(mixinMethod, annotationType); if (annotation == null) { return false; } - Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_PRIVATE); + Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_ALL); MethodNode target = MixinPreProcessor.findMethod(context.getTargetClass(), mixinMethod, annotation); if (target == null) { @@ -241,6 +265,19 @@ class MixinPreProcessor { return true; } + protected void processMethod(MethodNode mixinMethod) { + Method method = this.mixin.getClassInfo().findMethod(mixinMethod); + if (method == null) { + return; + } + + Method parentMethod = this.mixin.getClassInfo().findMethodInHierarchy(mixinMethod, false); + if (parentMethod != null && parentMethod.isRenamed()) { + mixinMethod.name = parentMethod.getName(); + method.renameTo(parentMethod.getName()); + } + } + protected void attachFields(MixinTargetContext context) { for (Iterator iter = this.classNode.fields.iterator(); iter.hasNext();) { FieldNode mixinField = iter.next(); @@ -344,13 +381,13 @@ class MixinPreProcessor { AbstractInsnNode insn = iter.next(); if (insn instanceof MethodInsnNode) { MethodInsnNode methodNode = (MethodInsnNode)insn; - Method method = this.mixin.getClassInfo().findMethodInHierarchy(methodNode, true, ClassInfo.INCLUDE_PRIVATE); + Method method = ClassInfo.forName(methodNode.owner).findMethodInHierarchy(methodNode, true, ClassInfo.INCLUDE_PRIVATE); if (method != null && method.isRenamed()) { methodNode.name = method.getName(); } } else if (insn instanceof FieldInsnNode) { FieldInsnNode fieldNode = (FieldInsnNode)insn; - Field field = this.mixin.getClassInfo().findField(fieldNode, ClassInfo.INCLUDE_PRIVATE); + Field field = ClassInfo.forName(fieldNode.owner).findField(fieldNode, ClassInfo.INCLUDE_PRIVATE); if (field != null && field.isRenamed()) { fieldNode.name = field.getName(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 8ef2d157..6796b6fa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -86,7 +86,7 @@ public class MixinTargetContext implements IReferenceMapperContext { /** * */ - private final ClassNode targetClass; + private final TargetClassContext targetClass; /** * Session ID from context @@ -122,13 +122,12 @@ public class MixinTargetContext implements IReferenceMapperContext { /** * Injector groups */ - protected final InjectorGroupInfo.Map injectorGroups = new InjectorGroupInfo.Map(); + private final InjectorGroupInfo.Map injectorGroups = new InjectorGroupInfo.Map(); /** * Injectors for this target */ - protected final List injectors = new ArrayList(); - + private final List injectors = new ArrayList(); /** * True if this mixin inherits from a mixin at any point in its hierarchy @@ -146,6 +145,7 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private int minRequiredClassVersion = CompatibilityLevel.JAVA_6.classVersion(); + /** * ctor * @@ -156,10 +156,10 @@ public class MixinTargetContext implements IReferenceMapperContext { MixinTargetContext(MixinInfo mixin, ClassNode classNode, TargetClassContext context) { this.mixin = mixin; this.classNode = classNode; - this.targetClass = context.getClassNode(); - this.targetClassInfo = ClassInfo.forName(this.targetClass.name); + this.targetClass = context; + this.targetClassInfo = ClassInfo.forName(this.targetClass.getName()); this.inheritsFromMixin = mixin.getClassInfo().hasMixinInHierarchy() || this.targetClassInfo.hasMixinTargetInHierarchy(); - this.detachedSuper = !this.classNode.superName.equals(this.targetClass.superName); + this.detachedSuper = !this.classNode.superName.equals(this.targetClass.getClassNode().superName); this.sessionId = context.getSessionId(); this.requireVersion(classNode.version); } @@ -244,7 +244,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * mixins) */ public String getTargetClassRef() { - return this.targetClass.name; + return this.targetClass.getName(); } /** @@ -253,7 +253,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * @return the target class */ public ClassNode getTargetClass() { - return this.targetClass; + return this.targetClass.getClassNode(); } /** @@ -366,7 +366,7 @@ public class MixinTargetContext implements IReferenceMapperContext { ClassInfo.Method superMethod = this.targetClassInfo.findMethodInHierarchy(method.name, method.desc, false, Traversal.SUPER); if (superMethod == null || !superMethod.isInjected()) { throw new InvalidMixinException(this, "Mixin method " + method.name + method.desc + " is tagged with @SoftOverride but no " - + "valid method was found in superclasses of " + this.targetClass.name); + + "valid method was found in superclasses of " + this.targetClass.getName()); } } } @@ -383,7 +383,7 @@ public class MixinTargetContext implements IReferenceMapperContext { this.transformDescriptor(methodRef); if (methodRef.getOwner().equals(this.getClassRef())) { - methodRef.setOwner(this.targetClass.name); + methodRef.setOwner(this.targetClass.getName()); } else if ((this.detachedSuper || this.inheritsFromMixin)) { if (methodRef.getOpcode() == Opcodes.INVOKESPECIAL) { this.updateStaticBinding(method, methodRef); @@ -416,18 +416,18 @@ public class MixinTargetContext implements IReferenceMapperContext { this.transformDescriptor(fieldRef); if (fieldRef.getOwner().equals(this.getClassRef())) { - fieldRef.setOwner(this.targetClass.name); + fieldRef.setOwner(this.targetClass.getName()); } else { ClassInfo fieldOwner = ClassInfo.forName(fieldRef.getOwner()); if (fieldOwner.isMixin()) { ClassInfo actualOwner = this.targetClassInfo.findCorrespondingType(fieldOwner); - fieldRef.setOwner(actualOwner != null ? actualOwner.getName() : this.targetClass.name); + fieldRef.setOwner(actualOwner != null ? actualOwner.getName() : this.targetClass.getName()); } } } private void checkFinal(MethodNode method, Iterator iter, FieldInsnNode fieldNode) { - if (!fieldNode.owner.equals(this.targetClass.name)) { + if (!fieldNode.owner.equals(this.targetClass.getName())) { return; } @@ -471,7 +471,7 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private void transformTypeNode(MethodNode method, Iterator iter, TypeInsnNode typeInsn, AbstractInsnNode lastNode) { if (typeInsn.getOpcode() == Opcodes.CHECKCAST - && typeInsn.desc.equals(this.targetClass.name) + && typeInsn.desc.equals(this.targetClass.getName()) && lastNode.getOpcode() == Opcodes.ALOAD && ((VarInsnNode)lastNode).var == 0) { iter.remove(); @@ -479,7 +479,7 @@ public class MixinTargetContext implements IReferenceMapperContext { } if (typeInsn.desc.equals(this.getClassRef())) { - typeInsn.desc = this.targetClass.name; + typeInsn.desc = this.targetClass.getName(); } this.transformDescriptor(typeInsn); @@ -624,7 +624,9 @@ public class MixinTargetContext implements IReferenceMapperContext { } private void updateBinding(MethodNode method, MemberRef methodRef, Traversal traversal) { - if (Constants.CTOR.equals(method.name) || methodRef.getOwner().equals(this.targetClass.name) || this.targetClass.name.startsWith("<")) { + if (Constants.CTOR.equals(method.name) + || methodRef.getOwner().equals(this.targetClass.getName()) + || this.targetClass.getName().startsWith("<")) { return; } @@ -749,14 +751,14 @@ public class MixinTargetContext implements IReferenceMapperContext { * @return new or existing target handle for the supplied method */ public Target getTargetMethod(MethodNode method) { - if (!this.targetClass.methods.contains(method)) { + if (!this.targetClass.getMethods().contains(method)) { throw new IllegalArgumentException("Invalid target method supplied to getTargetMethod()"); } String targetName = method.name + method.desc; Target target = this.targetMethods.get(targetName); if (target == null) { - target = new Target(this.targetClass, method); + target = new Target(this.targetClass.getClassNode(), method); this.targetMethods.put(targetName, target); } return target; @@ -906,6 +908,10 @@ public class MixinTargetContext implements IReferenceMapperContext { this.mixin.postApply(transformedName, targetClass); } + public String getHandlerName(AnnotationNode annotation, MethodNode method, boolean surrogate) { + return this.targetClass.getHandlerName(annotation, method, surrogate); + } + /** * Scans the target class for injector methods and prepares discovered * injectors 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 7e1b9ae8..327eb96f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -27,6 +27,7 @@ package org.spongepowered.asm.mixin.transformer; import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -481,11 +482,17 @@ public class MixinTransformer extends TreeTransformer { private void init(MixinEnvironment environment) { this.verboseLoggingLevel = (environment.getOption(Option.DEBUG_VERBOSE)) ? Level.INFO : Level.DEBUG; this.logger.log(this.verboseLoggingLevel, "Preparing mixins for {}", environment); + long startTime = System.currentTimeMillis(); this.addConfigs(environment); this.addModules(environment); this.initConfigs(); this.currentEnvironment = environment; + + double elapsedTime = (System.currentTimeMillis() - startTime) * 0.001D; + if (elapsedTime > 0.25D) { + this.logger.log(this.verboseLoggingLevel, "Mixin preparation completed in {} sec", new DecimalFormat("###0.000").format(elapsedTime)); + } } /** @@ -501,7 +508,7 @@ public class MixinTransformer extends TreeTransformer { try { MixinConfig config = MixinConfig.create(configFile, environment); if (config != null) { - this.logger.log(this.verboseLoggingLevel, "Adding mixin config {}", config); + this.logger.log(this.verboseLoggingLevel, "Adding config {}", config); this.pendingConfigs.add(config); } } catch (Exception ex) { @@ -538,6 +545,7 @@ public class MixinTransformer extends TreeTransformer { private void initConfigs() { for (MixinConfig config : this.pendingConfigs) { try { + this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getClasses().size()); config.initialise(this.hotSwapper); } catch (Exception ex) { this.logger.error("Error encountered whilst initialising mixin config '" + config.getName() + "': " + ex.getMessage(), ex); @@ -564,7 +572,7 @@ public class MixinTransformer extends TreeTransformer { try { config.postInitialise(this.hotSwapper); } catch (Exception ex) { - this.logger.error("Error encountered during mixin config postInit setp'" + config.getName() + "': " + ex.getMessage(), ex); + this.logger.error("Error encountered during mixin config postInit step'" + config.getName() + "': " + ex.getMessage(), ex); } } @@ -717,7 +725,7 @@ public class MixinTransformer extends TreeTransformer { } private byte[] writeClass(TargetClassContext context) { - return this.writeClass(context.getName(), context.getClassNode()); + return this.writeClass(context.getClassName(), context.getClassNode()); } private byte[] writeClass(String transformedName, ClassNode targetClass) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index 8c43fc83..eb8757d4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -24,14 +24,29 @@ */ package org.spongepowered.asm.mixin.transformer; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.SortedSet; +import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; /** * Struct for containing target class information during mixin application */ class TargetClassContext { + + /** + * Mutable integer + */ + static class Counter { + public int value; + } /** * Transformer session ID @@ -41,7 +56,7 @@ class TargetClassContext { /** * Target class name */ - private final String name; + private final String className; /** * Target class as tree @@ -58,6 +73,16 @@ class TargetClassContext { */ private final SortedSet mixins; + /** + * Injector Method descriptor to ID map + */ + private final Map injectorMethodIndices = new HashMap(); + + /** + * Do not remap injector handler methods (debug option) + */ + private final boolean disableHandlerRemap; + /** * True once mixins have been applied to this class */ @@ -65,10 +90,11 @@ class TargetClassContext { TargetClassContext(String sessionId, String name, ClassNode classNode, SortedSet mixins) { this.sessionId = sessionId; - this.name = name; + this.className = name; this.classNode = classNode; this.classInfo = ClassInfo.fromClassNode(classNode); this.mixins = mixins; + this.disableHandlerRemap = MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_DISABLE_HANDLER_REMAP); } /** @@ -79,10 +105,17 @@ class TargetClassContext { } /** - * Get the class name + * Get the internal class name */ public String getName() { - return this.name; + return this.classNode.name; + } + + /** + * Get the class name + */ + public String getClassName() { + return this.className; } /** @@ -91,7 +124,14 @@ class TargetClassContext { public ClassNode getClassNode() { return this.classNode; } - + + /** + * Get the class methods (from the tree) + */ + public List getMethods() { + return this.classNode.methods; + } + /** * Get the target class metadata */ @@ -106,12 +146,28 @@ class TargetClassContext { return this.mixins; } + public String getHandlerName(AnnotationNode annotation, MethodNode method, boolean surrogate) { + if (this.disableHandlerRemap) { + return method.name; + } + + String descriptor = String.format("%s%s", method.name, method.desc); + Counter id = this.injectorMethodIndices.get(descriptor); + if (id == null) { + id = new Counter(); + this.injectorMethodIndices.put(descriptor, id); + } else if (!surrogate) { + id.value++; + } + return String.format("%s$%s$%d", InjectionInfo.getInjectorPrefix(annotation), method.name, id.value); + } + /** * Apply mixins to this class */ public void applyMixins() { if (this.applied) { - throw new IllegalStateException("Mixins already applied to target class " + this.name); + throw new IllegalStateException("Mixins already applied to target class " + this.className); } this.applied = true; MixinApplicator applicator = this.createApplicator(); From 8e891daa922a56a3e6d504dab4ec108505cdc6b4 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 17 Feb 2016 18:44:52 +0000 Subject: [PATCH 127/169] Quality of life improvements for PrettyPrinter --- checkstyle.xml | 2 +- .../asm/mixin/MixinEnvironment.java | 10 +- .../injection/callback/CallbackInjector.java | 12 +- .../modify/LocalVariableDiscriminator.java | 6 +- .../modify/ModifyVariableInjector.java | 27 +-- .../spongepowered/asm/util/PrettyPrinter.java | 212 +++++++++++++++--- 6 files changed, 204 insertions(+), 65 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 538b210c..b10493a1 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -24,7 +24,7 @@ - + diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 4eaf37b9..caf310c0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -722,17 +722,17 @@ public class MixinEnvironment implements ITokenProvider { if (this.getOption(Option.DEBUG_VERBOSE)) { PrettyPrinter printer = new PrettyPrinter(32); printer.add("SpongePowered MIXIN (Verbose debugging enabled)").centre().hr(); - printer.add("%28s : %s", "Code source", codeSource); - printer.add("%28s : %s", "Internal Version", version); - printer.add("%28s : %s", "Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr(); + printer.kv("Code source", codeSource); + printer.kv("Internal Version", version); + printer.kv("Java 8 Supported", CompatibilityLevel.JAVA_8.isSupported()).hr(); for (Option option : Option.values()) { StringBuilder indent = new StringBuilder(); for (int i = 0; i < option.depth; i++) { indent.append("- "); } - printer.add("%28s : %s<%s>", option.property, indent, option); + printer.kv(option.property, "%s<%s>", indent, option); } - printer.hr().add("%28s : %s", "Detected Side", side); + printer.hr().kv("Detected Side", side); printer.print(System.err); } } 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 ff0f77f1..7dc861c0 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 @@ -477,12 +477,12 @@ public class CallbackInjector extends Injector { handlerSig.setModifiers(this.methodNode); PrettyPrinter printer = new PrettyPrinter(); - printer.add("%20s : %s", "Target Class", this.classNode.name.replace('/', '.')); - printer.add("%20s : %s", "Target Method", methodSig); - printer.add("%20s : %d", "Target Max LOCALS", callback.target.getMaxLocals()); - printer.add("%20s : %d", "Initial Frame Size", callback.frameSize); - printer.add("%20s : %s", "Callback Name", this.methodNode.name); - printer.add("%20s : %s %s", "Instruction", callback.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(callback.node.getOpcode())); + printer.kv("Target Class", this.classNode.name.replace('/', '.')); + printer.kv("Target Method", methodSig); + printer.kv("Target Max LOCALS", callback.target.getMaxLocals()); + printer.kv("Initial Frame Size", callback.frameSize); + printer.kv("Callback Name", this.methodNode.name); + printer.kv("Instruction", "%s %s", callback.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(callback.node.getOpcode())); printer.hr(); if (callback.locals.length > callback.frameSize) { printer.add(" %s %20s %s", "LOCAL", "TYPE", "NAME"); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java index 50ad557a..48d68c61 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java @@ -169,7 +169,7 @@ public class LocalVariableDiscriminator { @Override public void print(PrettyPrinter printer) { - printer.add("%5s %7s %20s %-50s %s", "INDEX", "ORDINAL", "TYPE", "NAME", "CANDIDATE"); + printer.add("%5s %7s %30s %-50s %s", "INDEX", "ORDINAL", "TYPE", "NAME", "CANDIDATE"); for (int l = this.baseArgIndex; l < this.locals.length; l++) { Local local = this.locals[l]; if (local != null) { @@ -177,11 +177,11 @@ public class LocalVariableDiscriminator { String localName = local.name; int ordinal = local.ord; String candidate = this.returnType.equals(localType) ? "YES" : "-"; - printer.add("[%3d] [%3d] %20s %-50s %s", l, ordinal, SignaturePrinter.getTypeName(localType, false), localName, candidate); + printer.add("[%3d] [%3d] %30s %-50s %s", l, ordinal, SignaturePrinter.getTypeName(localType, false), localName, candidate); } else if (l > 0) { Local prevLocal = this.locals[l - 1]; boolean isTop = prevLocal != null && prevLocal.type != null && prevLocal.type.getSize() > 1; - printer.add("[%3d] %20s", l, isTop ? "" : "-"); + printer.add("[%3d] %30s", l, isTop ? "" : "-"); } } } 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 743c98fe..c0f70853 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 @@ -174,19 +174,20 @@ public class ModifyVariableInjector extends Injector { SignaturePrinter handlerSig = new SignaturePrinter(this.methodNode.name, this.returnType, this.methodArgs, new String[] { "var" }); handlerSig.setModifiers(this.methodNode); - PrettyPrinter printer = new PrettyPrinter(); - printer.add("%20s : %s", "Target Class", this.classNode.name.replace('/', '.')); - printer.add("%20s : %s", "Target Method", context.target.method.name); - printer.add("%20s : %s", "Callback Name", this.methodNode.name); - printer.add("%20s : %s", "Capture Type", SignaturePrinter.getTypeName(this.returnType, false)); - printer.add("%20s : %s %s", "Instruction", context.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(context.node.getOpcode())).hr(); - printer.add("%20s : %s", "Match mode", this.discriminator.isImplicit(context) ? "IMPLICIT (match single)" : "EXPLICIT (match by criteria)"); - printer.add("%20s : %s", "Match ordinal", this.discriminator.getOrdinal() < 0 ? "any" : this.discriminator.getOrdinal()); - printer.add("%20s : %s", "Match index", this.discriminator.getIndex() < context.baseArgIndex ? "any" : this.discriminator.getIndex()); - printer.add("%20s : %s", "Match name(s)", this.discriminator.hasNames() ? this.discriminator.getNames() : "any"); - printer.add("%20s : %s", "Args only", this.discriminator.isArgsOnly()).hr(); - printer.add(context); - printer.print(System.err); + new PrettyPrinter() + .kvWidth(20) + .kv("Target Class", this.classNode.name.replace('/', '.')) + .kv("Target Method", context.target.method.name) + .kv("Callback Name", this.methodNode.name) + .kv("Capture Type", SignaturePrinter.getTypeName(this.returnType, false)) + .kv("Instruction", "%s %s", context.node.getClass().getSimpleName(), ASMHelper.getOpcodeName(context.node.getOpcode())).hr() + .kv("Match mode", this.discriminator.isImplicit(context) ? "IMPLICIT (match single)" : "EXPLICIT (match by criteria)") + .kv("Match ordinal", this.discriminator.getOrdinal() < 0 ? "any" : this.discriminator.getOrdinal()) + .kv("Match index", this.discriminator.getIndex() < context.baseArgIndex ? "any" : this.discriminator.getIndex()) + .kv("Match name(s)", this.discriminator.hasNames() ? this.discriminator.getNames() : "any") + .kv("Args only", this.discriminator.isArgsOnly()).hr() + .add(context) + .print(System.err); } /** diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 67f08ac0..0516af5c 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -55,29 +55,109 @@ public class PrettyPrinter { } /** - * "Horizontal rule" marker + * Interface for objects which need their width calculated prior to printing */ - private static final char HR = '\253'; + interface IVariableWidthEntry { + + public abstract int getWidth(); + + } + + /** + * Interface for objects which control their own output format + */ + interface ISpecialEntry { + + } + + /** + * A key/value pair for convenient printing + */ + class KeyValue implements PrettyPrinter.IVariableWidthEntry { + + private final String key; + + private final Object value; + + public KeyValue(String key, Object value) { + this.key = key; + this.value = value; + } + + @Override + public String toString() { + return String.format(PrettyPrinter.this.kvFormat, this.key, this.value); + } + + @Override + public int getWidth() { + return this.toString().length(); + } + + } + + /** + * Horizontal rule + */ + class HorizontalRule implements PrettyPrinter.ISpecialEntry { + + private final char[] hrChars; + + public HorizontalRule(char... hrChars) { + this.hrChars = hrChars; + } + + @Override + public String toString() { + return Strings.repeat(new String(this.hrChars), PrettyPrinter.this.width + 2); + } + + } + + /** + * Centred text + */ + class CentredText { + + private final Object centred; + + public CentredText(Object centred) { + this.centred = centred; + } + + @Override + public String toString() { + String text = this.centred.toString(); + return String.format("%" + (((PrettyPrinter.this.width - (text.length())) / 2) + text.length()) + "s", text); + } + + } + + private final HorizontalRule horizontalRule = new HorizontalRule('*'); /** - * If specified as the first character on a line, centres the line + * Content lines */ - private static final char CENTRE = '\252'; + private final List lines = new ArrayList(); + + private boolean recalcWidth = false; /** * Box with (adapts to contents) */ - private int width = 100; + protected int width = 100; /** * Wrap width used when an explicit wrap width is not specified */ - private int wrapWidth = 80; + protected int wrapWidth = 80; /** - * Content lines + * Key/value key width */ - private final List lines = new ArrayList(); + protected int kvKeyWidth = 10; + + protected String kvFormat = PrettyPrinter.makeKvFormat(this.kvKeyWidth); public PrettyPrinter() { this(100); @@ -205,6 +285,45 @@ public class PrettyPrinter { return lines; } + /** + * Add a formatted key/value pair to the output + * + * @param key Key + * @param format Value format + * @param args Value args + * @return fluent interface + */ + public PrettyPrinter kv(String key, String format, Object... args) { + return this.kv(key, String.format(format, args)); + } + + /** + * Add a key/value pair to the output + * + * @param key Key + * @param value Value + * @return fluent interface + */ + public PrettyPrinter kv(String key, Object value) { + this.lines.add(new KeyValue(key, value)); + return this.kvWidth(key.length()); + } + + /** + * Set the minimum key display width + * + * @param width width to set + * @return fluent + */ + public PrettyPrinter kvWidth(int width) { + if (width > this.kvKeyWidth) { + this.kvKeyWidth = width; + this.kvFormat = PrettyPrinter.makeKvFormat(width); + } + this.recalcWidth = true; + return this; + } + /** * Adds a horizontal rule to the output * @@ -222,7 +341,7 @@ public class PrettyPrinter { * @return fluent interface */ public PrettyPrinter hr(char ruleChar) { - this.lines.add("" + PrettyPrinter.HR + ruleChar); + this.lines.add(new HorizontalRule(ruleChar)); return this; } @@ -233,7 +352,10 @@ public class PrettyPrinter { */ public PrettyPrinter centre() { if (!this.lines.isEmpty()) { - this.lines.add(PrettyPrinter.CENTRE + this.lines.remove(this.lines.size() - 1)); + Object lastLine = this.lines.get(this.lines.size() - 1); + if (lastLine instanceof String) { + this.lines.add(new CentredText(this.lines.remove(this.lines.size() - 1))); + } } return this; } @@ -244,26 +366,26 @@ public class PrettyPrinter { * @param stream stream to print to */ public void print(PrintStream stream) { - this.printHr(stream, '*'); - for (String line : this.lines) { - int len = line.length(); - if (len > 1 && line.charAt(0) == PrettyPrinter.HR) { - this.printHr(stream, line.charAt(1)); + this.updateWidth(); + this.printSpecial(stream, this.horizontalRule); + for (Object line : this.lines) { + if (line instanceof ISpecialEntry) { + this.printSpecial(stream, (ISpecialEntry)line); } else { - if (len > 0 && line.charAt(0) == PrettyPrinter.CENTRE) { - String text = line.substring(1); - line = String.format("%" + (((this.width - (text.length())) / 2) + text.length()) + "s", text); - } - stream.printf("/* %-" + this.width + "s */\n", line); + this.printString(stream, line.toString()); } } - this.printHr(stream, '*'); + this.printSpecial(stream, this.horizontalRule); } - private void printHr(PrintStream stream, char... hrChars) { - stream.printf("/*%s*/\n", Strings.repeat(new String(hrChars), this.width + 2)); + private void printSpecial(PrintStream stream, ISpecialEntry line) { + stream.printf("/*%s*/\n", line.toString()); } - + + private void printString(PrintStream stream, String string) { + stream.printf("/* %-" + this.width + "s */\n", string); + } + public void log(Logger logger) { this.log(logger, Level.INFO); } @@ -275,23 +397,39 @@ public class PrettyPrinter { * @param level log level */ public void log(Logger logger, Level level) { - this.logHr(logger, level, '*'); - for (String line : this.lines) { - int len = line.length(); - if (len > 1 && line.charAt(0) == PrettyPrinter.HR) { - this.logHr(logger, level, line.charAt(1)); + this.updateWidth(); + this.logSpecial(logger, level, this.horizontalRule); + for (Object line : this.lines) { + if (line instanceof ISpecialEntry) { + this.logSpecial(logger, level, (ISpecialEntry)line); } else { - if (len > 0 && line.charAt(0) == PrettyPrinter.CENTRE) { - String text = line.substring(1); - line = String.format("%" + (((this.width - (text.length())) / 2) + text.length()) + "s", text); - } - logger.log(level, String.format("/* %-" + this.width + "s */", line)); + this.logString(logger, level, line.toString()); } } - this.logHr(logger, level, '*'); + this.logSpecial(logger, level, this.horizontalRule); + } + + private void logSpecial(Logger logger, Level level, ISpecialEntry line) { + logger.log(level, "/*{}*/\n", line.toString()); + } + + private void logString(Logger logger, Level level, String line) { + logger.log(level, String.format("/* %-" + this.width + "s */", line)); } - private void logHr(Logger logger, Level level, char... hrChars) { - logger.log(level, String.format("/*%s*/", Strings.repeat(new String(hrChars), this.width + 2))); + private void updateWidth() { + if (this.recalcWidth) { + this.recalcWidth = false; + for (Object line : this.lines) { + if (line instanceof IVariableWidthEntry) { + this.width = Math.max(this.width, ((IVariableWidthEntry)line).getWidth()); + } + } + } } + + private static String makeKvFormat(int keyWidth) { + return String.format("%%%ds : %%s", keyWidth); + } + } From 6978f2585541b08cce9071411cc6123fd1963e9f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 17 Feb 2016 18:50:49 +0000 Subject: [PATCH 128/169] Convenience method for Map instances --- .../spongepowered/asm/util/PrettyPrinter.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 0516af5c..06a99c02 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -27,6 +27,7 @@ package org.spongepowered.asm.util; import java.io.PrintStream; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -232,7 +233,7 @@ public class PrettyPrinter { } return this; } - + public PrettyPrinter addWrapped(String format, Object... args) { return this.addWrapped(this.wrapWidth, format, args); } @@ -324,6 +325,20 @@ public class PrettyPrinter { return this; } + /** + * Add all values of the specified map to this printer as key/value pairs + * + * @param map Map with entries to add + * @return fluent + */ + public PrettyPrinter add(Map map) { + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey() == null ? "null" : entry.getKey().toString(); + this.kv(key, entry.getValue()); + } + return this; + } + /** * Adds a horizontal rule to the output * From 2eebd34635eb92ba2c59fffe52829e61617d0315 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 18 Feb 2016 01:01:04 +0000 Subject: [PATCH 129/169] Add Throwable convenience functions to PrettyPrinter --- .../spongepowered/asm/util/PrettyPrinter.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 06a99c02..d26956f7 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -234,6 +234,34 @@ public class PrettyPrinter { return this; } + /** + * Print a formatted representation of the specified throwable with the + * default indent (4) + * + * @param th Throwable to print + * @return fluent interface + */ + public PrettyPrinter add(Throwable th) { + return this.add(th, 4); + } + + /** + * Print a formatted representation of the specified throwable with the + * specified indent + * + * @param th Throwable to print + * @param indent Indent size for stacktrace lines + * @return fluent interface + */ + public PrettyPrinter add(Throwable th, int indent) { + String margin = Strings.repeat(" ", indent); + this.add("%s: %s", th.getClass().getName(), th.getMessage()); + for (StackTraceElement st : th.getStackTrace()) { + this.add("%s%s", margin, st); + } + return this; + } + public PrettyPrinter addWrapped(String format, Object... args) { return this.addWrapped(this.wrapWidth, format, args); } @@ -446,5 +474,13 @@ public class PrettyPrinter { private static String makeKvFormat(int keyWidth) { return String.format("%%%ds : %%s", keyWidth); } + + public static void dumpStack() { + new PrettyPrinter().add(new Exception("Stack trace")).print(System.err); + } + public static void print(Throwable th) { + new PrettyPrinter().add(th).print(System.err); + } + } From 1e6ae382dce358bc862f53926a42881dbce38e9a Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 18 Feb 2016 15:23:46 +0000 Subject: [PATCH 130/169] More debug stuff --- .../spongepowered/asm/util/PrettyPrinter.java | 296 +++++++++++++++++- 1 file changed, 291 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index d26956f7..3da693ad 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -26,12 +26,14 @@ package org.spongepowered.asm.util; import java.io.PrintStream; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.common.base.Strings; @@ -168,11 +170,22 @@ public class PrettyPrinter { this.width = width; } + /** + * Set the wrap width (default 80 columns) + * + * @param wrapWidth new width (in characters) to wrap to + * @return fluent interface + */ public PrettyPrinter wrapTo(int wrapWidth) { this.wrapWidth = wrapWidth; return this; } + /** + * Get the current wrap width + * + * @return the current wrap width + */ public int wrapTo() { return this.wrapWidth; } @@ -186,6 +199,18 @@ public class PrettyPrinter { this.lines.add(""); return this; } + + /** + * Adds a string line to the output + * + * @param string format string + * @return fluent interface + */ + public PrettyPrinter add(String string) { + this.lines.add(string); + this.width = Math.max(this.width, string.length()); + return this; + } /** * Adds a formatted line to the output @@ -227,6 +252,39 @@ public class PrettyPrinter { return this; } + /** + * Add elements of the array to the output, one per line, with array indices + * + * @param array Array of objects to print + * @return fluent interface + */ + public PrettyPrinter addIndexed(Object[] array) { + int indexWidth = String.valueOf(array.length - 1).length(); + String format = "[%" + indexWidth + "d] %s"; + for (int index = 0; index < array.length; index++) { + this.add(format, index, array[index]); + } + + return this; + } + + /** + * Add elements of the collection to the output, one per line, with indices + * + * @param c Collection of objects to print + * @return fluent interface + */ + public PrettyPrinter addWithIndices(Collection c) { + return this.addIndexed(c.toArray(new Object[0])); + } + + /** + * Adds a pretty-printable object to the output, the object is responsible + * for adding its own representation to this printer + * + * @param printable object to add + * @return fluent interface + */ public PrettyPrinter add(IPrettyPrintable printable) { if (printable != null) { printable.print(this); @@ -262,6 +320,58 @@ public class PrettyPrinter { return this; } + /** + * Adds the specified object to the output + * + * @param object object to add + * @return fluent interface + */ + public PrettyPrinter add(Object object) { + return this.add(object, 0); + } + + /** + * Adds the specified object to the output + * + * @param object object to add + * @param indent indent amount + * @return fluent interface + */ + public PrettyPrinter add(Object object, int indent) { + String margin = Strings.repeat(" ", indent); + return this.append(object, indent, margin); + } + + private PrettyPrinter append(Object object, int indent, String margin) { + if (object instanceof String) { + return this.add("%s%s", margin, object); + } else if (object instanceof Iterable) { + for (Object entry : (Iterable)object) { + this.append(entry, indent, margin); + } + return this; + } else if (object instanceof Map) { + this.kvWidth(indent); + return this.add((Map)object); + } else if (object instanceof IPrettyPrintable) { + return this.add((IPrettyPrintable)object); + } else if (object instanceof Throwable) { + return this.add((Throwable)object, indent); + } else if (object.getClass().isArray()) { + return this.add((Object[])object, indent + "%s"); + } + return this.add("%s%s", margin, object); + } + + /** + * Adds a formatted line to the output, and attempts to wrap the line + * content to the current wrap width + * + * @param format format string + * @param args arguments + * + * @return fluent interface + */ public PrettyPrinter addWrapped(String format, Object... args) { return this.addWrapped(this.wrapWidth, format, args); } @@ -402,13 +512,165 @@ public class PrettyPrinter { } return this; } + + /** + * Outputs this printer to stderr and to a logger decorated with the calling + * class name with level {@link Level#DEBUG} + * + * @return fluent interface + */ + public PrettyPrinter trace() { + return this.trace(PrettyPrinter.getDefaultLoggerName()); + } + /** + * Outputs this printer to stderr and to a logger decorated with the calling + * class name at the specified level + * + * @param level Log level to write messages + * @return fluent interface + */ + public PrettyPrinter trace(Level level) { + return this.trace(PrettyPrinter.getDefaultLoggerName(), level); + } + + /** + * Outputs this printer to stderr and to a logger decorated with specified + * name with level {@link Level#DEBUG} + * + * @param logger Logger name to write to + * @return fluent interface + */ + public PrettyPrinter trace(String logger) { + return this.trace(System.err, LogManager.getLogger(logger)); + } + + /** + * Outputs this printer to stderr and to a logger decorated with specified + * name with the specified level + * + * @param logger Logger name to write to + * @param level Log level to write messages + * @return fluent interface + */ + public PrettyPrinter trace(String logger, Level level) { + return this.trace(System.err, LogManager.getLogger(logger), level); + } + + /** + * Outputs this printer to stderr and to the supplied logger with level + * {@link Level#DEBUG} + * + * @param logger Logger to write to + * @return fluent interface + */ + public PrettyPrinter trace(Logger logger) { + return this.trace(System.err, logger); + } + + /** + * Outputs this printer to stderr and to the supplied logger with the + * specified level + * + * @param logger Logger to write to + * @param level Log level to write messages + * @return fluent interface + */ + public PrettyPrinter trace(Logger logger, Level level) { + return this.trace(System.err, logger, level); + } + + /** + * Outputs this printer to the specified stream and to a logger decorated + * with the calling class name with level {@link Level#DEBUG} + * + * @param stream Output stream to print to + * @return fluent interface + */ + public PrettyPrinter trace(PrintStream stream) { + return this.trace(stream, PrettyPrinter.getDefaultLoggerName()); + } + + /** + * Outputs this printer to the specified stream and to a logger decorated + * with the calling class name with the specified level + * + * @param stream Output stream to print to + * @param level Log level to write messages + * @return fluent interface + */ + public PrettyPrinter trace(PrintStream stream, Level level) { + return this.trace(stream, PrettyPrinter.getDefaultLoggerName(), level); + } + + /** + * Outputs this printer to the specified stream and to a logger with the + * specified name with level {@link Level#DEBUG} + * + * @param stream Output stream to print to + * @param logger Logger name to write to + * @return fluent interface + */ + public PrettyPrinter trace(PrintStream stream, String logger) { + return this.trace(stream, LogManager.getLogger(logger)); + } + + /** + * Outputs this printer to the specified stream and to a logger with the + * specified name at the specified level + * + * @param stream Output stream to print to + * @param logger Logger name to write to + * @param level Log level to write messages + * @return fluent interface + */ + public PrettyPrinter trace(PrintStream stream, String logger, Level level) { + return this.trace(stream, LogManager.getLogger(logger), level); + } + + /** + * Outputs this printer to the specified stream and to the supplied logger + * with level {@link Level#DEBUG} + * + * @param stream Output stream to print to + * @param logger Logger to write to + * @return fluent interface + */ + public PrettyPrinter trace(PrintStream stream, Logger logger) { + return this.trace(stream, logger, Level.DEBUG); + } + + /** + * Outputs this printer to the specified stream and to the supplied logger + * with at the specified level + * + * @param stream Output stream to print to + * @param logger Logger to write to + * @param level Log level to write messages + * @return fluent interface + */ + public PrettyPrinter trace(PrintStream stream, Logger logger, Level level) { + this.log(logger, level); + this.print(stream); + return this; + } + + /** + * Print this printer to stderr + * + * @return fluent interface + */ + public PrettyPrinter print() { + return this.print(System.err); + } + /** * Print this printer to the specified output * * @param stream stream to print to + * @return fluent interface */ - public void print(PrintStream stream) { + public PrettyPrinter print(PrintStream stream) { this.updateWidth(); this.printSpecial(stream, this.horizontalRule); for (Object line : this.lines) { @@ -419,6 +681,7 @@ public class PrettyPrinter { } } this.printSpecial(stream, this.horizontalRule); + return this; } private void printSpecial(PrintStream stream, ISpecialEntry line) { @@ -429,8 +692,14 @@ public class PrettyPrinter { stream.printf("/* %-" + this.width + "s */\n", string); } - public void log(Logger logger) { - this.log(logger, Level.INFO); + /** + * Write this printer to the specified logger at {@link Level#INFO} + * + * @param logger logger to log to + * @return fluent interface + */ + public PrettyPrinter log(Logger logger) { + return this.log(logger, Level.INFO); } /** @@ -438,8 +707,9 @@ public class PrettyPrinter { * * @param logger logger to log to * @param level log level + * @return fluent interface */ - public void log(Logger logger, Level level) { + public PrettyPrinter log(Logger logger, Level level) { this.updateWidth(); this.logSpecial(logger, level, this.horizontalRule); for (Object line : this.lines) { @@ -450,10 +720,11 @@ public class PrettyPrinter { } } this.logSpecial(logger, level, this.horizontalRule); + return this; } private void logSpecial(Logger logger, Level level, ISpecialEntry line) { - logger.log(level, "/*{}*/\n", line.toString()); + logger.log(level, "/*{}*/", line.toString()); } private void logString(Logger logger, Level level, String line) { @@ -475,10 +746,25 @@ public class PrettyPrinter { return String.format("%%%ds : %%s", keyWidth); } + private static String getDefaultLoggerName() { + String name = new Throwable().getStackTrace()[2].getClassName(); + int pos = name.lastIndexOf('.'); + return pos == -1 ? name : name.substring(pos + 1); + } + + /** + * Convenience method, alternative to using Thread.dumpStack which + * prints to stderr in pretty-printed format. + */ public static void dumpStack() { new PrettyPrinter().add(new Exception("Stack trace")).print(System.err); } + /** + * Convenience methods, pretty-prints the specified throwable to stderr + * + * @param th Throwable to log + */ public static void print(Throwable th) { new PrettyPrinter().add(th).print(System.err); } From e9d93c66caa8a2b8000ecc14e30cf20d12ea6c9c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 19 Feb 2016 13:45:16 +0000 Subject: [PATCH 131/169] Fix generic super lookups --- .../tools/obfuscation/validation/TargetValidator.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java index e445b98a..bb4c23e9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java @@ -106,6 +106,10 @@ public class TargetValidator extends MixinValidator { return false; } + if (MirrorUtils.isAssignable(this.processingEnv, targetType, superClass)) { + return true; + } + TypeElement targetElement = (TypeElement)((DeclaredType)targetType).asElement(); TypeMirror targetSuper = targetElement.getSuperclass(); if (targetSuper.getKind() == TypeKind.NONE) { From b34e7e67eb8590bd5fd20c466ce78247788c8bc5 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 22 Feb 2016 14:27:25 +0000 Subject: [PATCH 132/169] Add table methods to PrettyPrinter --- .../spongepowered/asm/util/PrettyPrinter.java | 403 +++++++++++++++++- 1 file changed, 393 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 3da693ad..2126e9d6 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -136,6 +136,251 @@ public class PrettyPrinter { } + /** + * Table column alignment + */ + public static enum Alignment { + LEFT, + RIGHT + } + + /** + * Table information, added to output in order to print header + */ + static class Table implements PrettyPrinter.IVariableWidthEntry { + + final List columns = new ArrayList(); + + final List rows = new ArrayList(); + + String format = "%s"; + + int colSpacing = 2; + + boolean addHeader = true; + + void headerAdded() { + this.addHeader = false; + } + + void setColSpacing(int spacing) { + this.colSpacing = Math.max(0, spacing); + this.updateFormat(); + } + + Table grow(int size) { + while (this.columns.size() < size) { + this.columns.add(new Column(this)); + } + this.updateFormat(); + return this; + } + + Column add(Column column) { + this.columns.add(column); + return column; + } + + Row add(Row row) { + this.rows.add(row); + return row; + } + + Column addColumn(String title) { + return this.add(new Column(this, title)); + } + + Column addColumn(Alignment align, int size, String title) { + return this.add(new Column(this, align, size, title)); + } + + Row addRow(Object... args) { + return this.add(new Row(this, args)); + } + + void updateFormat() { + String spacing = Strings.repeat(" ", this.colSpacing); + StringBuilder format = new StringBuilder(); + boolean addSpacing = false; + for (Column column : this.columns) { + if (addSpacing) { + format.append(spacing); + } + addSpacing = true; + format.append(column.getFormat()); + } + this.format = format.toString(); + } + + String getFormat() { + return this.format; + } + + Object[] getTitles() { + List titles = new ArrayList(); + for (Column column : this.columns) { + titles.add(column.getTitle()); + } + return titles.toArray(); + } + + @Override + public String toString() { + boolean nonEmpty = false; + String[] titles = new String[this.columns.size()]; + for (int col = 0; col < this.columns.size(); col++) { + titles[col] = this.columns.get(col).toString(); + nonEmpty |= !titles[col].isEmpty(); + } + return nonEmpty ? String.format(this.format, titles) : null; + } + + @Override + public int getWidth() { + String str = this.toString(); + return str != null ? str.length() : 0; + } + + } + + /** + * Table column, internal + */ + static class Column { + + private final Table table; + + private Alignment align = Alignment.LEFT; + + private int minWidth = 1; + + private int maxWidth = Integer.MAX_VALUE; + + private int size = 0; + + private String title = ""; + + private String format = "%s"; + + Column(Table table) { + this.table = table; + } + + Column(Table table, String title) { + this(table); + this.title = title; + this.minWidth = title.length(); + this.updateFormat(); + } + + Column(Table table, Alignment align, int size, String title) { + this(table, title); + this.align = align; + this.size = size; + } + + void setAlignment(Alignment align) { + this.align = align; + this.updateFormat(); + } + + void setWidth(int width) { + if (width > this.size) { + this.size = width; + this.updateFormat(); + } + } + + void setMinWidth(int width) { + if (width > this.minWidth) { + this.minWidth = width; + this.updateFormat(); + } + } + + void setMaxWidth(int width) { + this.size = Math.min(this.size, this.maxWidth); + this.maxWidth = Math.max(1, width); + this.updateFormat(); + } + + void setTitle(String title) { + this.title = title; + this.setWidth(title.length()); + } + + private void updateFormat() { + int width = Math.min(this.maxWidth, this.size == 0 ? this.minWidth : this.size); + this.format = "%" + (this.align == Alignment.RIGHT ? "" : "-") + width + "s"; + this.table.updateFormat(); + } + + int getMaxWidth() { + return this.maxWidth; + } + + String getTitle() { + return this.title; + } + + String getFormat() { + return this.format; + } + + @Override + public String toString() { + if (this.title.length() > this.maxWidth) { + return this.title.substring(0, this.maxWidth); + } + + return this.title; + } + + } + + /** + * Table row, internal + */ + static class Row implements PrettyPrinter.IVariableWidthEntry { + + final Table table; + + final String[] args; + + public Row(Table table, Object... args) { + this.table = table.grow(args.length); + this.args = new String[args.length]; + for (int i = 0; i < args.length; i++) { + this.args[i] = args[i].toString(); + this.table.columns.get(i).setMinWidth(this.args[i].length()); + } + } + + @Override + public String toString() { + Object[] args = new Object[this.table.columns.size()]; + for (int col = 0; col < args.length; col++) { + Column column = this.table.columns.get(col); + if (col >= this.args.length) { + args[col] = ""; + } else { + args[col] = (this.args[col].length() > column.getMaxWidth()) ? this.args[col].substring(0, column.getMaxWidth()) : this.args[col]; + } + } + + return String.format(this.table.format, args); + } + + @Override + public int getWidth() { + return this.toString().length(); + } + + } + + /** + * Horizontal rule + */ private final HorizontalRule horizontalRule = new HorizontalRule('*'); /** @@ -143,6 +388,15 @@ public class PrettyPrinter { */ private final List lines = new ArrayList(); + /** + * Table + */ + private Table table; + + /** + * True when a variable-width entry is added whose width must be calculated + * on print + */ private boolean recalcWidth = false; /** @@ -189,14 +443,131 @@ public class PrettyPrinter { public int wrapTo() { return this.wrapWidth; } + + /** + * Begin a new table with no header and adaptive column widths + * + * @return fluent interface + */ + public PrettyPrinter table() { + this.table = new Table(); + return this; + } + + /** + * Begin a new table with the specified headers and adaptive column widths + * + * @param titles Column titles + * @return fluent interface + */ + public PrettyPrinter table(String... titles) { + this.table = new Table(); + for (String title : titles) { + this.table.addColumn(title); + } + return this; + } + /** + * Begin a new table with the specified format. The format is specified as a + * sequence of values with {@link String}s defining column titles, + * {@link Integer}s defining column widths, and {@link Alignment}s defining + * column alignments. Widths and alignment specifiers should follow the + * relevant column title. Specify a negative value to specify the + * maximum width for a column (values will be truncated). + * + *

For example, to specify a table with two columns of width 10:

+ * + * printer.table("Column 1", 10, "Column 2", 10); + * + *

A table with a column 30 characters wide and a right-aligned column 20 + * characters wide:

+ * + * printer.table("Column 1", 30, "Column 2", 20, Alignment.RIGHT); + * + * + * @param format + * @return fluent interface + */ + public PrettyPrinter table(Object... format) { + this.table = new Table(); + Column column = null; + for (Object entry : format) { + if (entry instanceof String) { + column = this.table.addColumn((String)entry); + } else if (entry instanceof Integer && column != null) { + int width = ((Integer)entry).intValue(); + if (width > 0) { + column.setWidth(width); + } else if (width < 0) { + column.setMaxWidth(-width); + } + } else if (entry instanceof Alignment && column != null) { + column.setAlignment((Alignment)entry); + } else if (entry != null) { + column = this.table.addColumn(entry.toString()); + } + } + return this; + } + + /** + * Set the column spacing for the current table. Default = 2 + * + * @param spacing Column spacing in characters + * @return fluent interface + */ + public PrettyPrinter spacing(int spacing) { + if (this.table == null) { + this.table = new Table(); + } + this.table.setColSpacing(spacing); + return this; + } + + /** + * Print the current table header. The table header is automatically printed + * before the first row if not explicitly specified by calling this method. + * + * @return fluent interface + */ + public PrettyPrinter th() { + return this.th(false); + } + + private PrettyPrinter th(boolean onlyIfNeeded) { + if (this.table == null) { + this.table = new Table(); + } + if (!onlyIfNeeded || this.table.addHeader) { + this.table.headerAdded(); + this.addLine(this.table); + } + return this; + } + + /** + * Print a table row with the specified values. If more columns are + * specified than exist in the table, then the table is automatically + * expanded. + * + * @param args column values + * @return fluent interface + */ + public PrettyPrinter tr(Object... args) { + this.th(true); + this.addLine(this.table.addRow(args)); + this.recalcWidth = true; + return this; + } + /** * Adds a blank line to the output * * @return fluent interface */ public PrettyPrinter add() { - this.lines.add(""); + this.addLine(""); return this; } @@ -207,7 +578,7 @@ public class PrettyPrinter { * @return fluent interface */ public PrettyPrinter add(String string) { - this.lines.add(string); + this.addLine(string); this.width = Math.max(this.width, string.length()); return this; } @@ -222,7 +593,7 @@ public class PrettyPrinter { */ public PrettyPrinter add(String format, Object... args) { String line = String.format(format, args); - this.lines.add(line); + this.addLine(line); this.width = Math.max(this.width, line.length()); return this; } @@ -275,7 +646,7 @@ public class PrettyPrinter { * @return fluent interface */ public PrettyPrinter addWithIndices(Collection c) { - return this.addIndexed(c.toArray(new Object[0])); + return this.addIndexed(c.toArray()); } /** @@ -396,7 +767,7 @@ public class PrettyPrinter { try { for (String wrappedLine : this.getWrapped(width, line, indent)) { - this.lines.add(wrappedLine); + this.addLine(wrappedLine); } } catch (Exception ex) { this.add(line); @@ -444,7 +815,7 @@ public class PrettyPrinter { * @return fluent interface */ public PrettyPrinter kv(String key, Object value) { - this.lines.add(new KeyValue(key, value)); + this.addLine(new KeyValue(key, value)); return this.kvWidth(key.length()); } @@ -494,7 +865,7 @@ public class PrettyPrinter { * @return fluent interface */ public PrettyPrinter hr(char ruleChar) { - this.lines.add(new HorizontalRule(ruleChar)); + this.addLine(new HorizontalRule(ruleChar)); return this; } @@ -507,12 +878,20 @@ public class PrettyPrinter { if (!this.lines.isEmpty()) { Object lastLine = this.lines.get(this.lines.size() - 1); if (lastLine instanceof String) { - this.lines.add(new CentredText(this.lines.remove(this.lines.size() - 1))); + this.addLine(new CentredText(this.lines.remove(this.lines.size() - 1))); } } return this; } + private void addLine(Object line) { + if (line == null) { + return; + } + this.lines.add(line); + this.recalcWidth |= line instanceof PrettyPrinter.IVariableWidthEntry; + } + /** * Outputs this printer to stderr and to a logger decorated with the calling * class name with level {@link Level#DEBUG} @@ -689,7 +1068,9 @@ public class PrettyPrinter { } private void printString(PrintStream stream, String string) { - stream.printf("/* %-" + this.width + "s */\n", string); + if (string != null) { + stream.printf("/* %-" + this.width + "s */\n", string); + } } /** @@ -728,7 +1109,9 @@ public class PrettyPrinter { } private void logString(Logger logger, Level level, String line) { - logger.log(level, String.format("/* %-" + this.width + "s */", line)); + if (line != null) { + logger.log(level, String.format("/* %-" + this.width + "s */", line)); + } } private void updateWidth() { From ea29f2ba6cae5d149ac1037f42ca1ce7064e2ab2 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 22 Feb 2016 17:22:45 +0000 Subject: [PATCH 133/169] Enable hotswapper automatically if agent is active --- src/agent/java/org/spongepowered/tools/agent/MixinAgent.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index fa63b736..4bbb8434 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -204,6 +204,7 @@ public class MixinAgent implements IHotSwap { * @param instrumentation Instance to use to transform the mixins */ public static void premain(String arg, Instrumentation instrumentation) { + System.setProperty("mixin.hotSwap", "true"); MixinAgent.init(instrumentation); } From 4ad037ade15988230f2486d45f8d0c7bdb2c1739 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 23 Feb 2016 11:55:44 +0000 Subject: [PATCH 134/169] Use correct mixin list in debug message, fixes #105 --- .../spongepowered/asm/mixin/transformer/MixinConfig.java | 9 +++++++++ .../asm/mixin/transformer/MixinTransformer.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 2fd7d029..a73edd6c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -465,6 +465,15 @@ class MixinConfig implements Comparable, IMixinConfig { return defaultGroup != null && !defaultGroup.isEmpty() ? defaultGroup : "default"; } + /** + * Get the number of mixins in this config, for debug logging + * + * @return total enumerated mixins in set + */ + int getMixinCount() { + return this.mixins.size(); + } + /** * Get the list of mixin classes we will be applying */ 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 327eb96f..70a49483 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -545,7 +545,7 @@ public class MixinTransformer extends TreeTransformer { private void initConfigs() { for (MixinConfig config : this.pendingConfigs) { try { - this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getClasses().size()); + this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getMixinCount()); config.initialise(this.hotSwapper); } catch (Exception ex) { this.logger.error("Error encountered whilst initialising mixin config '" + config.getName() + "': " + ex.getMessage(), ex); From c1e2c9c0d1af3f96a8ed36323dbc326a07c79132 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 1 Mar 2016 18:46:50 +0000 Subject: [PATCH 135/169] Disable refmap if running from GradleStart --- .../java/org/spongepowered/asm/launch/MixinBootstrap.java | 5 +++++ src/main/java/org/spongepowered/asm/util/PrettyPrinter.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 5054e1af..4f26b1a8 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -133,6 +133,11 @@ public abstract class MixinBootstrap { if (!MixinBootstrap.initialised) { MixinBootstrap.initialised = true; + + String command = System.getProperty("sun.java.command"); + if (command != null && command.contains("GradleStart")) { + System.setProperty("mixin.env.disableRefMap", "true"); + } if (MixinBootstrap.findInStackTrace(Launch.class.getName(), "launch") > 132) { MixinBootstrap.logger.error("Initialising mixin subsystem after game pre-init phase! Some mixins may be skipped."); diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 2126e9d6..3b84814c 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -1119,7 +1119,7 @@ public class PrettyPrinter { this.recalcWidth = false; for (Object line : this.lines) { if (line instanceof IVariableWidthEntry) { - this.width = Math.max(this.width, ((IVariableWidthEntry)line).getWidth()); + this.width = Math.min(4096, Math.max(this.width, ((IVariableWidthEntry)line).getWidth())); } } } From 00f2b8e2027d1d6643866edda04411bd48caee42 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 4 Mar 2016 16:23:07 +0000 Subject: [PATCH 136/169] Improve warning for final contract violations in initialisers, ref #106 --- .../mixin/transformer/MixinTargetContext.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 6796b6fa..84839e9f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -447,12 +447,16 @@ public class MixinTargetContext implements IReferenceMapperContext { if (this.mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERBOSE)) { MixinTargetContext.logger.warn("Write access to @Mutable @Final field {} in {}::{}", shadowField, this.mixin, method.name); } - } else { - MixinTargetContext.logger.error("Write access detected to @Final field {} in {}::{}", shadowField, this.mixin, method.name); - if (this.mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERIFY)) { - throw new InvalidMixinException(this.mixin, "Write access detected to @Final field " + shadowField + " in " + this.mixin - + "::" + method.name); - } + } else { + if (Constants.CTOR.equals(method.name) || Constants.CLINIT.equals(method.name)) { + MixinTargetContext.logger.warn("@Final field {} in {} should be final", shadowField, this.mixin); + } else { + MixinTargetContext.logger.error("Write access detected to @Final field {} in {}::{}", shadowField, this.mixin, method.name); + if (this.mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERIFY)) { + throw new InvalidMixinException(this.mixin, "Write access detected to @Final field " + shadowField + " in " + this.mixin + + "::" + method.name); + } + } } } return; From 5558a5c94a669bf09aeb9830e43bdd45d34d62d4 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Thu, 7 Apr 2016 20:13:39 -0400 Subject: [PATCH 137/169] Fix 'Preparing (count)' message Previously, the message was logged before the mixins in the config were initialzed, leading to the 'count' always being 0. This commit moves the message to after the initialization of the config, and changes the message from 'Preparing' to 'Prepared' Since any exception caught during config intiialization is logged with the mixin config, no information is hidden by this change. --- .../spongepowered/asm/mixin/transformer/MixinTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 70a49483..7799a8b0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -545,8 +545,8 @@ public class MixinTransformer extends TreeTransformer { private void initConfigs() { for (MixinConfig config : this.pendingConfigs) { try { - this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getMixinCount()); config.initialise(this.hotSwapper); + this.logger.log(this.verboseLoggingLevel, "Prepared {} ({})", config, config.getMixinCount()); } catch (Exception ex) { this.logger.error("Error encountered whilst initialising mixin config '" + config.getName() + "': " + ex.getMessage(), ex); } From 6a82a617f64c25328689dd55191fce9bbe4649ad Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 14 Apr 2016 13:10:06 +0100 Subject: [PATCH 138/169] Fix for some generics handling issues in the Annotation Processor --- .../org/spongepowered/tools/MirrorUtils.java | 78 ++++++++++++++++++- .../AnnotatedMixinElementHandler.java | 2 +- .../tools/obfuscation/TypeHandle.java | 45 ++--------- 3 files changed, 82 insertions(+), 43 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/MirrorUtils.java b/src/ap/java/org/spongepowered/tools/MirrorUtils.java index 82fde87b..bddd8717 100644 --- a/src/ap/java/org/spongepowered/tools/MirrorUtils.java +++ b/src/ap/java/org/spongepowered/tools/MirrorUtils.java @@ -41,12 +41,16 @@ import javax.lang.model.element.VariableElement; import javax.lang.model.type.ArrayType; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.TypeVariable; /** * Convenience functions for mirror */ public abstract class MirrorUtils { + private static final String OBJECT_SIG = "java.lang.Object"; + private static final String OBJECT_REF = "java/lang/Object"; + // No instances for you private MirrorUtils() {} @@ -150,6 +154,61 @@ public abstract class MirrorUtils { return parent.getClass().getSimpleName(); } + + public static String getJavaSignature(Element element) { + if (element instanceof ExecutableElement) { + ExecutableElement method = (ExecutableElement)element; + StringBuilder desc = new StringBuilder().append("("); + boolean extra = false; + for (VariableElement arg : method.getParameters()) { + if (extra) { + desc.append(','); + } + desc.append(MirrorUtils.getTypeName(arg.asType())); + extra = true; + } + desc.append(')').append(method.getReturnType().toString()); + return desc.toString(); + } + return MirrorUtils.getTypeName(element.asType()); + } + + public static String stripGenerics(String type) { + StringBuilder sb = new StringBuilder(); + for (int pos = 0, depth = 0; pos < type.length(); pos++) { + char c = type.charAt(pos); + if (c == '<') { + depth++; + } + if (depth == 0) { + sb.append(c); + } else if (c == '>') { + depth--; + } + } + return sb.toString(); + } + + public static String getTypeName(TypeMirror type) { + switch (type.getKind()) { + case ARRAY: return MirrorUtils.getTypeName(((ArrayType)type).getComponentType()) + "[]"; + case DECLARED: return MirrorUtils.getTypeName((DeclaredType)type); + case TYPEVAR: return MirrorUtils.getTypeName(MirrorUtils.getUpperBound(type)); + case ERROR: return MirrorUtils.OBJECT_SIG; + default: return type.toString(); + } + } + + public static String getTypeName(DeclaredType type) { + if (type == null) { + return MirrorUtils.OBJECT_SIG; + } + return MirrorUtils.getTypeName((TypeElement)type.asElement()); + } + + private static String getTypeName(TypeElement elem) { + return MirrorUtils.getInternalName(elem).replace('/', '.').replace('$', '.'); + } public static String generateSignature(ExecutableElement method) { StringBuilder signature = new StringBuilder(); @@ -164,11 +223,12 @@ public abstract class MirrorUtils { public static String getInternalName(VariableElement var) { return MirrorUtils.getInternalName(var.asType()); } - + public static String getInternalName(TypeMirror type) { switch (type.getKind()) { case ARRAY: return "[" + MirrorUtils.getInternalName(((ArrayType)type).getComponentType()); case DECLARED: return "L" + MirrorUtils.getInternalName((DeclaredType)type) + ";"; + case TYPEVAR: return "L" + MirrorUtils.getInternalName(MirrorUtils.getUpperBound(type)) + ";"; case BOOLEAN: return "Z"; case BYTE: return "B"; case CHAR: return "C"; @@ -179,14 +239,28 @@ public abstract class MirrorUtils { case SHORT: return "S"; case VOID: return "V"; // TODO figure out a better way to not crash when we get here - case ERROR: return "Ljava/lang/Object;"; + case ERROR: return "L" + MirrorUtils.OBJECT_REF + ";"; default: } throw new IllegalArgumentException("Unable to parse type symbol " + type + " with " + type.getKind() + " to equivalent bytecode type"); } + private static DeclaredType getUpperBound(TypeMirror type) { + if (type instanceof TypeVariable) { + try { + return (DeclaredType)((TypeVariable)type).getUpperBound(); + } catch (Exception ex) { + throw new IllegalArgumentException("Unable to compute upper bound of type symbol " + type); + } + } + return null; + } + public static String getInternalName(DeclaredType type) { + if (type == null) { + return MirrorUtils.OBJECT_REF; + } return MirrorUtils.getInternalName((TypeElement)type.asElement()); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java index bacec1f3..35067eb7 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -322,7 +322,7 @@ abstract class AnnotatedMixinElementHandler { * warnings where appropriate */ protected final void validateTargetMethod(ExecutableElement method, AnnotationMirror annotation, AliasedElementName name, String type) { - String signature = TypeHandle.getElementSignature(method); + String signature = MirrorUtils.getJavaSignature(method); for (TypeHandle target : this.mixin.getTargets()) { if (target.isImaginary()) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java index 72f23a07..ffda8931 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java @@ -209,7 +209,7 @@ public class TypeHandle { * @return handle to the discovered field if matched or null if no match */ public FieldHandle findField(VariableElement element) { - return this.findField(element.getSimpleName().toString(), element.asType().toString()); + return this.findField(element.getSimpleName().toString(), MirrorUtils.getTypeName(element.asType())); } /** @@ -221,7 +221,7 @@ public class TypeHandle { * @return handle to the discovered field if matched or null if no match */ public FieldHandle findField(String name, String type) { - String rawType = TypeHandle.stripGenerics(type); + String rawType = MirrorUtils.stripGenerics(type); for (Element element : this.getEnclosedElements()) { if (element.getKind() != ElementKind.FIELD) { @@ -247,7 +247,7 @@ public class TypeHandle { * @return handle to the discovered method if matched or null if no match */ public MethodHandle findMethod(ExecutableElement element) { - return this.findMethod(element.getSimpleName().toString(), TypeHandle.getElementSignature(element)); + return this.findMethod(element.getSimpleName().toString(), MirrorUtils.getJavaSignature(element)); } /** @@ -259,7 +259,7 @@ public class TypeHandle { * @return handle to the discovered method if matched or null if no match */ public MethodHandle findMethod(String name, String signature) { - String rawSignature = TypeHandle.stripGenerics(signature); + String rawSignature = MirrorUtils.stripGenerics(signature); for (Element element : this.getEnclosedElements()) { switch (element.getKind()) { @@ -285,46 +285,11 @@ public class TypeHandle { private boolean compareElement(Element elem, String name, String type) { try { String elementName = elem.getSimpleName().toString(); - String elementType = TypeHandle.getElementSignature(elem); + String elementType = MirrorUtils.getJavaSignature(elem); return name.equals(elementName) && (type.length() == 0 || type.equals(elementType)); } catch (NullPointerException ex) { return false; } } - - static String getElementSignature(Element element) { - if (element instanceof ExecutableElement) { - ExecutableElement method = (ExecutableElement)element; - StringBuilder desc = new StringBuilder().append("("); - boolean extra = false; - for (VariableElement arg : method.getParameters()) { - if (extra) { - desc.append(','); - } - desc.append(arg.asType().toString()); - extra = true; - } - desc.append(')').append(method.getReturnType().toString()); - return desc.toString(); - } - - return element.asType().toString(); - } - - static String stripGenerics(String type) { - StringBuilder sb = new StringBuilder(); - for (int pos = 0, depth = 0; pos < type.length(); pos++) { - char c = type.charAt(pos); - if (c == '<') { - depth++; - } - if (depth == 0) { - sb.append(c); - } else if (c == '>') { - depth--; - } - } - return sb.toString(); - } } From 2060164ec850916106a9c411034fcf7ded6fb55b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 14 Apr 2016 14:43:31 +0100 Subject: [PATCH 139/169] Fix this stupid message once and for all, closes #107 --- .../asm/mixin/transformer/MixinConfig.java | 22 ++++++++++++++++++- .../mixin/transformer/MixinTransformer.java | 17 ++++++++++---- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index a73edd6c..cc1b22c9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -26,6 +26,7 @@ package org.spongepowered.asm.mixin.transformer; import java.io.InputStreamReader; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -464,12 +465,21 @@ class MixinConfig implements Comparable, IMixinConfig { String defaultGroup = this.injectorOptions.defaultGroup; return defaultGroup != null && !defaultGroup.isEmpty() ? defaultGroup : "default"; } - + /** * Get the number of mixins in this config, for debug logging * * @return total enumerated mixins in set */ + int getDeclaredMixinCount() { + return MixinConfig.getCollectionSize(this.mixinClasses, this.mixinClassesClient, this.mixinClassesServer); + } + + /** + * Get the number of mixins actually initialised, for debug logging + * + * @return total enumerated mixins in set + */ int getMixinCount() { return this.mixins.size(); } @@ -648,4 +658,14 @@ class MixinConfig implements Comparable, IMixinConfig { } } + private static int getCollectionSize(Collection... collections) { + int total = 0; + for (Collection collection : collections) { + if (collection != null) { + total += collection.size(); + } + } + return total; + } + } 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 7799a8b0..d7e6b1fa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -486,12 +486,14 @@ public class MixinTransformer extends TreeTransformer { this.addConfigs(environment); this.addModules(environment); - this.initConfigs(); + int totalMixins = this.initConfigs(); this.currentEnvironment = environment; double elapsedTime = (System.currentTimeMillis() - startTime) * 0.001D; if (elapsedTime > 0.25D) { - this.logger.log(this.verboseLoggingLevel, "Mixin preparation completed in {} sec", new DecimalFormat("###0.000").format(elapsedTime)); + String elapsed = new DecimalFormat("###0.000").format(elapsedTime); + String perMixinTime = new DecimalFormat("###0.0").format((elapsedTime / totalMixins) * 1000.0); + this.logger.log(this.verboseLoggingLevel, "Prepared {} mixins in {} sec ({} msec avg.)", totalMixins, elapsed, perMixinTime); } } @@ -541,12 +543,17 @@ public class MixinTransformer extends TreeTransformer { /** * Initialise mixin configs + * + * @return total number of mixins initialised */ - private void initConfigs() { + private int initConfigs() { + int totalMixins = 0; + for (MixinConfig config : this.pendingConfigs) { try { + this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getDeclaredMixinCount()); config.initialise(this.hotSwapper); - this.logger.log(this.verboseLoggingLevel, "Prepared {} ({})", config, config.getMixinCount()); + totalMixins += config.getMixinCount(); } catch (Exception ex) { this.logger.error("Error encountered whilst initialising mixin config '" + config.getName() + "': " + ex.getMessage(), ex); } @@ -579,6 +586,8 @@ public class MixinTransformer extends TreeTransformer { this.configs.addAll(this.pendingConfigs); Collections.sort(this.configs); this.pendingConfigs.clear(); + + return totalMixins; } /** From 3ca55a3a5ccab0666de6faa5d039e914c8d29167 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 20 Apr 2016 14:44:56 +0100 Subject: [PATCH 140/169] Improve error message for invalid injector descriptors, closes #115 --- .../asm/mixin/injection/InjectionPoint.java | 2 +- .../InvalidInjectionPointException.java | 53 ++++++++++++++++++ .../mixin/injection/struct/InjectionInfo.java | 19 ++++--- .../injection/struct/InjectionPointData.java | 54 +++++++++++++++++-- .../org/spongepowered/asm/util/ASMHelper.java | 8 +++ 5 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionPointException.java diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java index b16c8bf4..a37dc776 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java @@ -373,7 +373,7 @@ public abstract class InjectionPoint { */ public static InjectionPoint parse(MixinTargetContext mixin, MethodNode method, AnnotationNode parent, String at, At.Shift shift, int by, List args, String target, int ordinal, int opcode) { - InjectionPointData data = new InjectionPointData(mixin, args, target, ordinal, opcode); + InjectionPointData data = new InjectionPointData(mixin, method, parent, at, args, target, ordinal, opcode); InjectionPoint point = null; if (BeforeFieldAccess.CODE.equals(at)) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionPointException.java b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionPointException.java new file mode 100644 index 00000000..23a0b59d --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionPointException.java @@ -0,0 +1,53 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; + +/** + * Thrown when an injection point cannot be parsed due to invalid data + */ +public class InvalidInjectionPointException extends InvalidInjectionException { + + private static final long serialVersionUID = 1L; + + public InvalidInjectionPointException(MixinTargetContext mixin, String format, Object... args) { + super(mixin, String.format(format, args)); + } + + public InvalidInjectionPointException(InjectionInfo info, String format, Object... args) { + super(info, String.format(format, args)); + } + + public InvalidInjectionPointException(MixinTargetContext mixin, Throwable cause, String format, Object... args) { + super(mixin, String.format(format, args), cause); + } + + public InvalidInjectionPointException(InjectionInfo info, Throwable cause, String format, Object... args) { + super(info, String.format(format, args), cause); + } + +} 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 1d67a8b1..0de2641b 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 @@ -63,8 +63,6 @@ public abstract class InjectionInfo { protected final AnnotationNode annotation; - protected final String annotationType; - /** * Class */ @@ -142,7 +140,6 @@ public abstract class InjectionInfo { this.mixin = mixin; this.method = method; this.annotation = annotation; - this.annotationType = annotation.desc.substring(annotation.desc.lastIndexOf('/') + 1).replace(";", ""); this.classNode = mixin.getTargetClass(); this.isStatic = ASMHelper.methodIsStatic(method); this.readAnnotation(); @@ -157,7 +154,7 @@ public abstract class InjectionInfo { return; } - String type = "@" + this.annotation.desc.substring(this.annotation.desc.lastIndexOf('/') + 1, this.annotation.desc.length() - 1); + String type = "@" + ASMHelper.getSimpleName(this.annotation); String method = ASMHelper.getAnnotationValue(this.annotation, "method"); if (method == null) { @@ -175,7 +172,13 @@ public abstract class InjectionInfo { throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " is missing 'at' value(s)"); } - MemberInfo targetMember = MemberInfo.parseAndValidate(method, this.mixin); + MemberInfo targetMember; + try { + targetMember = MemberInfo.parseAndValidate(method, this.mixin); + } catch (InvalidMemberDescriptorException ex) { + throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + ", has invalid target descriptor: \"" + + method + "\""); + } if (targetMember.owner != null && !targetMember.owner.equals(this.mixin.getTargetClassRef())) { throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " specifies a target class '" @@ -276,7 +279,7 @@ public abstract class InjectionInfo { @Override public String toString() { - return String.format("%s->@%s::%s%s", this.mixin.toString(), this.annotationType, this.method.name, this.method.desc); + return InjectionInfo.describeInjector(this.mixin, this.annotation, this.method); } /** @@ -445,4 +448,8 @@ public abstract class InjectionInfo { return "handler"; } + static String describeInjector(MixinTargetContext mixin, AnnotationNode annotation, MethodNode method) { + return String.format("%s->@%s::%s%s", mixin.toString(), ASMHelper.getSimpleName(annotation), method.name, method.desc); + } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java index 667f53b1..bd5130f9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java @@ -28,8 +28,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; +import org.spongepowered.asm.mixin.injection.InvalidInjectionPointException; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; /** * Data read from an {@link org.spongepowered.asm.mixin.injection.At} annotation @@ -45,8 +48,23 @@ public class InjectionPointData { /** * Mixin */ - private final IReferenceMapperContext mixin; + private final MixinTargetContext mixin; + /** + * Injector callback + */ + private MethodNode method; + + /** + * Parent annotation + */ + private AnnotationNode parent; + + /** + * At arg + */ + private String at; + /** * Target */ @@ -62,8 +80,12 @@ public class InjectionPointData { */ private final int opcode; - public InjectionPointData(IReferenceMapperContext mixin, List args, String target, int ordinal, int opcode) { + public InjectionPointData(MixinTargetContext mixin, MethodNode method, AnnotationNode parent, String at, List args, String target, + int ordinal, int opcode) { this.mixin = mixin; + this.method = method; + this.parent = parent; + this.at = at; this.target = target; this.ordinal = Math.max(-1, ordinal); this.opcode = opcode; @@ -87,6 +109,18 @@ public class InjectionPointData { } } } + + public MixinTargetContext getMixin() { + return this.mixin; + } + + public MethodNode getMethod() { + return this.method; + } + + public AnnotationNode getParent() { + return this.parent; + } public String get(String key, String defaultValue) { String value = this.args.get(key); @@ -102,7 +136,12 @@ public class InjectionPointData { } public MemberInfo get(String key) { - return MemberInfo.parseAndValidate(this.get(key, ""), this.mixin); + try { + return MemberInfo.parseAndValidate(this.get(key, ""), this.mixin); + } catch (InvalidMemberDescriptorException ex) { + throw new InvalidInjectionPointException(this.mixin, "Failed parsing @At(\"%s\").%s descriptor \"%s\" on %s", + this.at, key, this.target, InjectionInfo.describeInjector(this.mixin, this.parent, this.method)); + } } private int parseInt(String string, int defaultValue) { @@ -122,7 +161,12 @@ public class InjectionPointData { } public MemberInfo getTarget() { - return MemberInfo.parseAndValidate(this.target, this.mixin); + try { + return MemberInfo.parseAndValidate(this.target, this.mixin); + } catch (InvalidMemberDescriptorException ex) { + throw new InvalidInjectionPointException(this.mixin, "Failed parsing @At(\"%s\") descriptor \"%s\" on %s", + this.at, this.target, InjectionInfo.describeInjector(this.mixin, this.parent, this.method)); + } } public int getOrdinal() { diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index de2bfcab..3c5bc534 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -934,4 +934,12 @@ public class ASMHelper { return arg == null ? "" : arg.toString(); } + public static String getSimpleName(AnnotationNode annotation) { + return ASMHelper.getSimpleName(annotation.desc); + } + + public static String getSimpleName(String desc) { + return desc.substring(desc.lastIndexOf('/') + 1).replace(";", ""); + } + } From 505981e3027f2dc6431164c72d0176598f031dfa Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 20 Apr 2016 16:09:17 +0100 Subject: [PATCH 141/169] Auditing changes, report unapplied classes as errors, closes #114 --- .../audit/ClassAlreadyLoadedException.java | 53 +++++++++++++++++++ .../mixin/transformer/MixinTransformer.java | 20 +++++-- 2 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/audit/ClassAlreadyLoadedException.java diff --git a/src/main/java/org/spongepowered/asm/mixin/audit/ClassAlreadyLoadedException.java b/src/main/java/org/spongepowered/asm/mixin/audit/ClassAlreadyLoadedException.java new file mode 100644 index 00000000..bc0c2b58 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/audit/ClassAlreadyLoadedException.java @@ -0,0 +1,53 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +/** + * + */ +package org.spongepowered.asm.mixin.audit; + +import org.spongepowered.asm.mixin.MixinException; + + +/** + * Exception raised when a class was loaded before mixins were able to be + * applied. + */ +public class ClassAlreadyLoadedException extends MixinException { + + private static final long serialVersionUID = 1L; + + public ClassAlreadyLoadedException(String message) { + super(message); + } + + public ClassAlreadyLoadedException(Throwable cause) { + super(cause); + } + + public ClassAlreadyLoadedException(String message, Throwable cause) { + super(message, cause); + } + +} 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 d7e6b1fa..19d9aa00 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -51,6 +51,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.audit.ClassAlreadyLoadedException; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler.ErrorAction; @@ -363,13 +364,22 @@ public class MixinTransformer extends TreeTransformer { for (MixinConfig config : this.configs) { unhandled.addAll(config.getUnhandledTargets()); } - - for (String nextClass : unhandled) { + + Logger auditLogger = LogManager.getLogger("mixin/audit"); + + for (String target : unhandled) { try { - this.logger.info("Force-loading class {}", nextClass); - Class.forName(nextClass, true, Launch.classLoader); + auditLogger.info("Force-loading class {}", target); + Class.forName(target, true, Launch.classLoader); } catch (ClassNotFoundException ex) { - throw new Error("Could not force-load " + nextClass); + auditLogger.error("Could not force-load " + target, ex); + } + } + + for (MixinConfig config : this.configs) { + for (String target : config.getUnhandledTargets()) { + ClassAlreadyLoadedException ex = new ClassAlreadyLoadedException(target + " was already classloaded"); + auditLogger.error("Could not force-load " + target, ex); } } } From 5f3b6b4c5d8520d3020359a2306be8213147dd25 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 20 Apr 2016 16:09:43 +0100 Subject: [PATCH 142/169] Fix yet another generics parsing issue with the Annotation Processor --- .../java/org/spongepowered/tools/obfuscation/TypeHandle.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java index ffda8931..98fe3ed3 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TypeHandle.java @@ -286,7 +286,8 @@ public class TypeHandle { try { String elementName = elem.getSimpleName().toString(); String elementType = MirrorUtils.getJavaSignature(elem); - return name.equals(elementName) && (type.length() == 0 || type.equals(elementType)); + String rawElementType = MirrorUtils.stripGenerics(elementType); + return name.equals(elementName) && (type.length() == 0 || type.equals(elementType) || type.equals(rawElementType)); } catch (NullPointerException ex) { return false; } From 902e9b93a0c10a6a4ddc40d9c76df17d57151682 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 21 Apr 2016 00:07:49 +0100 Subject: [PATCH 143/169] Something something exceptions, something something something @gabizou --- .../asm/mixin/MixinPrepareError.java | 50 ++++++++++++ .../asm/mixin/transformer/InterfaceInfo.java | 2 +- .../transformer/InterfaceMixinApplicator.java | 4 +- .../InterfaceMixinPreProcessor.java | 5 +- .../InvalidInterfaceMixinException.java | 58 ++++++++++++++ .../mixin/transformer/MixinApplicator.java | 22 +++--- .../mixin/transformer/MixinPreProcessor.java | 14 ++-- .../mixin/transformer/MixinTransformer.java | 79 +++++++++++++------ .../spongepowered/asm/util/PrettyPrinter.java | 16 +++- 9 files changed, 205 insertions(+), 45 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/InvalidInterfaceMixinException.java diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java b/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java new file mode 100644 index 00000000..f03e789c --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java @@ -0,0 +1,50 @@ +/* + * This file is part of Sponge, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +/** + * Error to throw for required configs when initialising of the config fails + */ +public class MixinPrepareError extends Error { + + private static final long serialVersionUID = 1L; + + public MixinPrepareError(String message) { + super(message); + } + + public MixinPrepareError(Throwable cause) { + super(cause); + } + + public MixinPrepareError(String message, Throwable cause) { + super(message, cause); + } + + public MixinPrepareError(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java index a6ea42e1..0da51a79 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java @@ -174,7 +174,7 @@ public class InterfaceInfo extends TreeInfo { Type iface = ASMHelper.getAnnotationValue(node, "iface"); if (prefix == null || iface == null) { - throw new InvalidMixinException(mixin, String.format("@Interface annotation on is missing a required parameter")); + throw new InvalidMixinException(mixin, String.format("@Interface annotation on %s is missing a required parameter", mixin)); } return new InterfaceInfo(mixin, prefix, iface); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java index 347d2a98..dc6bb192 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java @@ -96,11 +96,11 @@ public class InterfaceMixinApplicator extends MixinApplicator { try { InjectionInfo injectInfo = InjectionInfo.parse(mixin, method); if (injectInfo != null) { - throw new InvalidMixinException(mixin, injectInfo + " is not supported"); + throw new InvalidInterfaceMixinException(mixin, injectInfo + " is not supported on interface mixin method " + method.name); } } catch (InvalidInjectionException ex) { String description = ex.getInjectionInfo() != null ? ex.getInjectionInfo().toString() : "Injection"; - throw new InvalidMixinException(mixin, description + " is not supported"); + throw new InvalidInterfaceMixinException(mixin, description + " is not supported in interface mixin"); } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java index da26f550..84fcca3b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java @@ -56,7 +56,8 @@ class InterfaceMixinPreProcessor extends MixinPreProcessor { protected void prepareMethod(MethodNode mixinMethod, Method method) { // I have no idea how the hell you'd compile this, but we make sure anyway! if (!MixinApplicator.hasFlag(mixinMethod, Opcodes.ACC_PUBLIC)) { - throw new InvalidMixinException(this.mixin, "Interface mixin contains a non-public method! Found " + method + " in " + this.mixin); + throw new InvalidInterfaceMixinException(this.mixin, "Interface mixin contains a non-public method! Found " + method + " in " + + this.mixin); } super.prepareMethod(mixinMethod, method); @@ -72,7 +73,7 @@ class InterfaceMixinPreProcessor extends MixinPreProcessor { @Override protected boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { if (!MixinApplicator.hasFlag(field, Opcodes.ACC_STATIC)) { - throw new InvalidMixinException(this.mixin, "Interface mixin contains an instance field! Found " + field.name + " in " + throw new InvalidInterfaceMixinException(this.mixin, "Interface mixin contains an instance field! Found " + field.name + " in " + this.mixin); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidInterfaceMixinException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidInterfaceMixinException.java new file mode 100644 index 00000000..c1fdbaf7 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidInterfaceMixinException.java @@ -0,0 +1,58 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer; + +/** + * Exception thrown for bad states when parsing/loading interface mixins + */ +public class InvalidInterfaceMixinException extends InvalidMixinException { + + private static final long serialVersionUID = 1L; + + public InvalidInterfaceMixinException(MixinInfo mixin, String message) { + super(mixin, message); + } + + public InvalidInterfaceMixinException(MixinTargetContext mixin, String message) { + super(mixin, message); + } + + public InvalidInterfaceMixinException(MixinInfo mixin, Throwable message) { + super(mixin, message); + } + + public InvalidInterfaceMixinException(MixinTargetContext mixin, Throwable message) { + super(mixin, message); + } + + public InvalidInterfaceMixinException(MixinInfo mixin, String message, Throwable cause) { + super(mixin, message, cause); + } + + public InvalidInterfaceMixinException(MixinTargetContext mixin, String message, Throwable cause) { + super(mixin, message, cause); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 1619e472..a6a03cc9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -227,7 +227,8 @@ public class MixinApplicator { } catch (InvalidMixinException ex) { throw ex; } catch (Exception ex) { - throw new InvalidMixinException(current, "Unexpecteded error whilst applying the mixin class", ex); + throw new InvalidMixinException(current, "Unexpecteded " + ex.getClass().getSimpleName() + " whilst applying the mixin class: " + + ex.getMessage(), ex); } } @@ -358,7 +359,7 @@ public class MixinApplicator { && !MixinApplicator.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) && !isOverwrite) { throw new InvalidMixinException(mixin, - String.format("Mixin classes cannot contain visible static methods or fields, found %s", mixinMethod.name)); + String.format("Mixin %s contains non-private static method %s%s", mixin, mixinMethod.name, mixinMethod.desc)); } this.mergeMethod(mixin, mixinMethod, isOverwrite); @@ -394,7 +395,8 @@ public class MixinApplicator { this.targetClass.methods.remove(target); } } else if (isOverwrite) { - throw new InvalidMixinException(mixin, String.format("Overwrite target %s was not located in the target class", method.name)); + throw new InvalidMixinException(mixin, String.format("Overwrite target \"%s\" was not located in target class %s", + method.name, mixin.getTargetClassRef())); } this.targetClass.methods.add(method); @@ -470,20 +472,22 @@ public class MixinApplicator { if (isOverwrite) { throw new InvalidMixinException(mixin, "@Intrinsic is not compatible with @Overwrite, remove one of these annotations on " - + method.name); + + method.name + " in " + mixin); } + String methodName = method.name + method.desc; if (MixinApplicator.hasFlag(method, Opcodes.ACC_STATIC)) { - throw new InvalidMixinException(mixin, "@Intrinsic method cannot be static, found " + method.name); + throw new InvalidMixinException(mixin, "@Intrinsic method cannot be static, found " + methodName + " in " + mixin); } AnnotationNode renamed = ASMHelper.getVisibleAnnotation(method, MixinRenamed.class); if (renamed == null || !ASMHelper.getAnnotationValue(renamed, "isInterfaceMember", false)) { - throw new InvalidMixinException(mixin, "@Intrinsic method must be prefixed interface method, no rename encountered on " + method.name); + throw new InvalidMixinException(mixin, "@Intrinsic method must be prefixed interface method, no rename encountered on " + + methodName + " in " + mixin); } if (!ASMHelper.getAnnotationValue(intrinsic, "displace", false)) { - this.logger.log(mixin.getLoggingLevel(), "Skipping Intrinsic mixin method {}", method.name); + this.logger.log(mixin.getLoggingLevel(), "Skipping Intrinsic mixin method {} for {}", methodName, mixin.getTargetClassRef()); return true; } @@ -715,7 +719,7 @@ public class MixinApplicator { if (last != null) { if (last.getOpcode() != Opcodes.PUTFIELD) { throw new InvalidMixinException(mixin, "Could not parse initialiser, expected 0xB5, found 0x" - + Integer.toHexString(last.getOpcode())); + + Integer.toHexString(last.getOpcode()) + " in " + mixin); } } @@ -739,7 +743,7 @@ public class MixinApplicator { continue; } if (node instanceof JumpInsnNode) { - throw new InvalidMixinException(mixin, "Unsupported opcode in initialiser"); + throw new InvalidMixinException(mixin, "Unsupported JUMP opcode in initialiser in " + mixin); } AbstractInsnNode imACloneNow = node.clone(labels); ctor.instructions.insert(insn, imACloneNow); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 0afc1b4e..65f61050 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -346,24 +346,26 @@ class MixinPreProcessor { if (MixinApplicator.hasFlag(field, Opcodes.ACC_STATIC) && !MixinApplicator.hasFlag(field, Opcodes.ACC_PRIVATE) && !MixinApplicator.hasFlag(field, Opcodes.ACC_SYNTHETIC)) { - throw new InvalidMixinException(context, String.format("Mixin classes cannot contain visible static methods or fields, found %s", - field.name)); + throw new InvalidMixinException(context, String.format("Mixin %s contains non-private static field %s:%s", + context, field.name, field.desc)); } // Shadow fields can't have prefixes, it's meaningless for them anyway String prefix = ASMHelper.getAnnotationValue(shadow, "prefix", Shadow.class); if (field.name.startsWith(prefix)) { - throw new InvalidMixinException(context, String.format("Shadow field %s in %s has a shadow prefix. This is not allowed.", - field.name, context)); + throw new InvalidMixinException(context, String.format("@Shadow field %s.%s has a shadow prefix. This is not allowed.", + context, field.name)); } // Imaginary super fields get stripped from the class, but first we validate them if (Constants.IMAGINARY_SUPER.equals(field.name)) { if (field.access != Opcodes.ACC_PRIVATE) { - throw new InvalidMixinException(this.mixin, "Imaginary super field " + field.name + " must be private and non-final"); + throw new InvalidMixinException(this.mixin, "Imaginary super field " + context + "." + field.name + + " must be private and non-final"); } if (!field.desc.equals("L" + this.mixin.getClassRef() + ";")) { - throw new InvalidMixinException(this.mixin, "Imaginary super field " + field.name + " must have the same type as the parent mixin"); + throw new InvalidMixinException(this.mixin, "Imaginary super field " + context + "." + field.name + + " must have the same type as the parent mixin"); } return false; } 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 19d9aa00..ad7db7d6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -51,6 +51,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.MixinPrepareError; import org.spongepowered.asm.mixin.audit.ClassAlreadyLoadedException; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler; @@ -61,6 +62,7 @@ import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.transformers.TreeTransformer; import org.spongepowered.asm.util.Constants; +import org.spongepowered.asm.util.PrettyPrinter; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.Launch; @@ -451,20 +453,14 @@ public class MixinTransformer extends TreeTransformer { TargetClassContext context = new TargetClassContext(this.sessionId, transformedName, targetClassNode, mixins); basicClass = this.applyMixins(context); } catch (InvalidMixinException th) { - if (environment.getOption(Option.DUMP_TARGET_ON_FAILURE)) { - this.dumpClass(transformedName.replace('.', '/') + ".target", basicClass); - } - - this.handleMixinErrorState(transformedName, th); + this.dumpClassOnFailure(transformedName, basicClass, environment); + this.handleMixinApplyError(transformedName, th, environment); } } return basicClass; } catch (Exception ex) { - if (environment.getOption(Option.DUMP_TARGET_ON_FAILURE)) { - this.dumpClass(transformedName.replace('.', '/') + ".target", basicClass); - } - + this.dumpClassOnFailure(transformedName, basicClass, environment); throw new MixinTransformerError("An unexpected critical error was encountered", ex); } finally { this.lock.pop(); @@ -496,7 +492,7 @@ public class MixinTransformer extends TreeTransformer { this.addConfigs(environment); this.addModules(environment); - int totalMixins = this.initConfigs(); + int totalMixins = this.initConfigs(environment); this.currentEnvironment = environment; double elapsedTime = (System.currentTimeMillis() - startTime) * 0.001D; @@ -554,9 +550,10 @@ public class MixinTransformer extends TreeTransformer { /** * Initialise mixin configs * + * @param environment Environment * @return total number of mixins initialised */ - private int initConfigs() { + private int initConfigs(MixinEnvironment environment) { int totalMixins = 0; for (MixinConfig config : this.pendingConfigs) { @@ -564,6 +561,8 @@ public class MixinTransformer extends TreeTransformer { this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getDeclaredMixinCount()); config.initialise(this.hotSwapper); totalMixins += config.getMixinCount(); + } catch (InvalidMixinException ex) { + this.handleMixinPrepareError(config, ex, environment); } catch (Exception ex) { this.logger.error("Error encountered whilst initialising mixin config '" + config.getName() + "': " + ex.getMessage(), ex); } @@ -588,6 +587,8 @@ public class MixinTransformer extends TreeTransformer { for (MixinConfig config : this.pendingConfigs) { try { config.postInitialise(this.hotSwapper); + } catch (InvalidMixinException ex) { + this.handleMixinPrepareError(config, ex, environment); } catch (Exception ex) { this.logger.error("Error encountered during mixin config postInit step'" + config.getName() + "': " + ex.getMessage(), ex); } @@ -686,32 +687,58 @@ public class MixinTransformer extends TreeTransformer { } } - private void handleMixinErrorState(String targetClassName, InvalidMixinException th) throws MixinApplyError { + private void handleMixinPrepareError(MixinConfig config, InvalidMixinException ex, MixinEnvironment environment) throws MixinPrepareError { + this.handleMixinError(config.getName(), ex, environment, "prepare"); + } + + private void handleMixinApplyError(String targetClass, InvalidMixinException ex, MixinEnvironment environment) throws MixinApplyError { + this.handleMixinError(targetClass, ex, environment, "apply"); + } + + private void handleMixinError(String context, InvalidMixinException ex, MixinEnvironment environment, String operation) throws Error { this.errorState = true; - MixinInfo mixin = th.getMixin(); + MixinInfo mixin = ex.getMixin(); MixinConfig config = mixin.getParent(); + Phase phase = mixin.getPhase(); ErrorAction action = config.isRequired() ? ErrorAction.ERROR : ErrorAction.WARN; - if (MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_VERBOSE)) { - th.printStackTrace(); + if (environment.getOption(Option.DEBUG_VERBOSE)) { + new PrettyPrinter() + .add("Invalid Mixin").centre() + .hr('-') + .kvWidth(10) + .kv("Action", operation.toUpperCase()) + .kv("Mixin", mixin.getClassName()) + .kv("Config", mixin.getParent().getName()) + .kv("Phase", phase) + .hr('-') + .add(" %s", ex.getClass().getName()) + .hr('-') + .addWrapped(" %s", ex.getMessage()) + .hr('-') + .add(ex.getStackTrace(), 8) + .trace(action.logLevel); } - for (IMixinErrorHandler handler : this.getErrorHandlers(mixin.getPhase())) { - ErrorAction newAction = handler.onError(targetClassName, th, mixin, action); - if (newAction != null) { - action = newAction; + if (context != null) { + for (IMixinErrorHandler handler : this.getErrorHandlers(mixin.getPhase())) { + ErrorAction newAction = handler.onError(context, ex, mixin, action); + if (newAction != null) { + action = newAction; + } } } - this.logger.log(action.logLevel, String.format("Mixin failed applying %s -> %s: %s %s", mixin, targetClassName, - th.getClass().getName(), th.getMessage()), th); + String ext = context != null ? String.format(" -> %s", context) : ""; + this.logger.log(action.logLevel, String.format("Mixin %s failed %s%s: %s %s", operation, mixin, ext, + ex.getClass().getName(), ex.getMessage()), ex); this.errorState = false; if (action == ErrorAction.ERROR) { - throw new MixinApplyError(String.format("Mixin [%s] from phase [%s] in config [%s] FAILED", mixin, mixin.getPhase(), - config), th); + throw new MixinApplyError(String.format("Mixin [%s] from phase [%s] in config [%s] FAILED %s", mixin, phase, + config, operation.toUpperCase()), ex); } } @@ -766,6 +793,12 @@ public class MixinTransformer extends TreeTransformer { return bytes; } + private void dumpClassOnFailure(String className, byte[] bytes, MixinEnvironment env) { + if (env.getOption(Option.DUMP_TARGET_ON_FAILURE)) { + this.dumpClass(className.replace('.', '/') + ".target", bytes); + } + } + private File dumpClass(String fileName, byte[] bytes) { File outputFile = new File(this.classExportDir, fileName + ".class"); try { diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index 3b84814c..ec8cfb50 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -683,9 +683,21 @@ public class PrettyPrinter { * @return fluent interface */ public PrettyPrinter add(Throwable th, int indent) { - String margin = Strings.repeat(" ", indent); this.add("%s: %s", th.getClass().getName(), th.getMessage()); - for (StackTraceElement st : th.getStackTrace()) { + return this.add(th.getStackTrace(), indent); + } + + /** + * Print a formatted representation of the specified stack trace with the + * specified indent + * + * @param stackTrace stack trace to print + * @param indent Indent size for stacktrace lines + * @return fluent interface + */ + public PrettyPrinter add(StackTraceElement[] stackTrace, int indent) { + String margin = Strings.repeat(" ", indent); + for (StackTraceElement st : stackTrace) { this.add("%s%s", margin, st); } return this; From ecd9e1e41c7634e82e2f4121255edb361581882b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 21 Apr 2016 12:03:44 +0100 Subject: [PATCH 144/169] Fix issue where a generic type's upper bound is also generic, fixes #116 --- .../org/spongepowered/tools/MirrorUtils.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/ap/java/org/spongepowered/tools/MirrorUtils.java b/src/ap/java/org/spongepowered/tools/MirrorUtils.java index bddd8717..b42ea05b 100644 --- a/src/ap/java/org/spongepowered/tools/MirrorUtils.java +++ b/src/ap/java/org/spongepowered/tools/MirrorUtils.java @@ -48,6 +48,12 @@ import javax.lang.model.type.TypeVariable; */ public abstract class MirrorUtils { + /** + * Number of times to recurse into TypeMirrors when trying to determine the + * upper bound of a TYPEVAR + */ + private static final int MAX_GENERIC_RECURSION_DEPTH = 5; + private static final String OBJECT_SIG = "java.lang.Object"; private static final String OBJECT_REF = "java/lang/Object"; @@ -247,9 +253,31 @@ public abstract class MirrorUtils { } private static DeclaredType getUpperBound(TypeMirror type) { + try { + return MirrorUtils.getUpperBound0(type, MirrorUtils.MAX_GENERIC_RECURSION_DEPTH); + } catch (IllegalStateException ex) { + throw new IllegalArgumentException("Type symbol \"" + type + "\" is too complex", ex); + } catch (IllegalArgumentException ex) { + throw new IllegalArgumentException("Unable to compute upper bound of type symbol " + type, ex); + } + } + + private static DeclaredType getUpperBound0(TypeMirror type, int depth) { + if (depth == 0) { + throw new IllegalStateException("Generic symbol \"" + type + "\" is too complex, exceeded " + + MirrorUtils.MAX_GENERIC_RECURSION_DEPTH + " iterations attempting to determine upper bound"); + } + if (type instanceof DeclaredType) { + return (DeclaredType)type; + } if (type instanceof TypeVariable) { try { - return (DeclaredType)((TypeVariable)type).getUpperBound(); + TypeMirror upper = ((TypeVariable)type).getUpperBound(); + return MirrorUtils.getUpperBound0(upper, --depth); + } catch (IllegalStateException ex) { + throw ex; + } catch (IllegalArgumentException ex) { + throw ex; } catch (Exception ex) { throw new IllegalArgumentException("Unable to compute upper bound of type symbol " + type); } From cf5deda1b9784e6bdde49eb7697048d7812c380c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 21 Apr 2016 12:05:21 +0100 Subject: [PATCH 145/169] Remove non-java6 overload --- .../java/org/spongepowered/asm/mixin/MixinPrepareError.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java b/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java index f03e789c..c505487d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java @@ -43,8 +43,4 @@ public class MixinPrepareError extends Error { super(message, cause); } - public MixinPrepareError(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } - } From ef9ab259aeb3b83c6f4df411d8247b129754fda9 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 21 Apr 2016 12:09:24 +0100 Subject: [PATCH 146/169] Incorrect licence header --- .../java/org/spongepowered/asm/mixin/MixinPrepareError.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java b/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java index c505487d..bcc7e3db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java @@ -1,5 +1,5 @@ /* - * This file is part of Sponge, licensed under the MIT License (MIT). + * This file is part of Mixin, licensed under the MIT License (MIT). * * Copyright (c) SpongePowered * Copyright (c) contributors From 46af4560df2817dfd0c9970b58685faa3da3a27f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 22 Apr 2016 13:14:31 +0100 Subject: [PATCH 147/169] Fix previous fix for generic issues, fixes #117 --- src/ap/java/org/spongepowered/tools/MirrorUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ap/java/org/spongepowered/tools/MirrorUtils.java b/src/ap/java/org/spongepowered/tools/MirrorUtils.java index b42ea05b..3a683e0f 100644 --- a/src/ap/java/org/spongepowered/tools/MirrorUtils.java +++ b/src/ap/java/org/spongepowered/tools/MirrorUtils.java @@ -213,7 +213,7 @@ public abstract class MirrorUtils { } private static String getTypeName(TypeElement elem) { - return MirrorUtils.getInternalName(elem).replace('/', '.').replace('$', '.'); + return MirrorUtils.getInternalName(elem).replace('/', '.'); } public static String generateSignature(ExecutableElement method) { From 0a7067a6e045a16dfec9b9c4d7c22475b5a63518 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 22 Apr 2016 13:14:47 +0100 Subject: [PATCH 148/169] Fix minor derp in PrettyPrinter --- src/main/java/org/spongepowered/asm/util/PrettyPrinter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java index ec8cfb50..064dc7a5 100644 --- a/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java +++ b/src/main/java/org/spongepowered/asm/util/PrettyPrinter.java @@ -232,7 +232,7 @@ public class PrettyPrinter { titles[col] = this.columns.get(col).toString(); nonEmpty |= !titles[col].isEmpty(); } - return nonEmpty ? String.format(this.format, titles) : null; + return nonEmpty ? String.format(this.format, (Object[])titles) : null; } @Override From 107b58d418be26063504183411764def76fdc57f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 25 Apr 2016 13:59:05 +0100 Subject: [PATCH 149/169] Pass mixin prepare errors to error handlers, version bump to 0.5.4 --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../extensibility/IMixinErrorHandler.java | 29 +++++- .../asm/mixin/transformer/MixinConfig.java | 12 ++- .../asm/mixin/transformer/MixinInfo.java | 27 ++++-- .../mixin/transformer/MixinTransformer.java | 96 +++++++++++++++---- 6 files changed, 140 insertions(+), 28 deletions(-) diff --git a/gradle.properties b/gradle.properties index 89716d50..475a7c84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.3 +buildVersion=0.5.4 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 4f26b1a8..7f49b9ca 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.3"; + public static final String VERSION = "0.5.4"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java index 2492102e..fff9bc6c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java @@ -63,6 +63,33 @@ public interface IMixinErrorHandler { } } + /** + * Called when an error occurs whilst initialising a mixin config. This + * allows the plugin to display more user-friendly error messages if + * required. + * + *

By default, when a critical error occurs the mixin processor will + * raise a warning if the config is not marked as "required" and will throw + * an {@link Error} if it is. This behaviour can be altered by returning + * different values from this method.

+ * + *

The original throwable which was caught is passed in via the + * th parameter and the default action is passed in to the + * action parameter. A plugin can choose to output a friendly message + * but leave the original behaviour intact (by returning null + * or returning action directly. Alternatively it may throw a + * different exception or error, or can reduce the severity of the error by + * returning a different {@link ErrorAction}.

+ * + * @param config Config being prepared when the error occurred + * @param th Throwable which was caught + * @param mixin Mixin which was being applied at the time of the error + * @param action Default action + * @return null to perform the default action (or return action) or new + * action to take + */ + public abstract ErrorAction onPrepareError(IMixinConfig config, Throwable th, IMixinInfo mixin, ErrorAction action); + /** * Called when an error occurs applying a mixin. This allows * the plugin to display more user-friendly error messages if required. @@ -87,6 +114,6 @@ public interface IMixinErrorHandler { * @return null to perform the default action (or return action) or new * action to take */ - public abstract ErrorAction onError(String targetClassName, Throwable th, IMixinInfo mixin, ErrorAction action); + public abstract ErrorAction onApplyError(String targetClassName, Throwable th, IMixinInfo mixin, ErrorAction action); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index cc1b22c9..2f1e53db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -373,8 +373,10 @@ class MixinConfig implements Comparable, IMixinConfig { continue; } + MixinInfo mixin = null; + try { - MixinInfo mixin = new MixinInfo(this, mixinClass, true, this.plugin, suppressPlugin); + mixin = new MixinInfo(this, mixinClass, true, this.plugin, suppressPlugin); if (mixin.getTargetClasses().size() > 0) { MixinConfig.globalMixinList.add(fqMixinClass); for (String targetClass : mixin.getTargetClasses()) { @@ -387,7 +389,15 @@ class MixinConfig implements Comparable, IMixinConfig { } this.mixins.add(mixin); } + } catch (InvalidMixinException ex) { + if (this.required) { + throw ex; + } + this.logger.error(ex.getMessage(), ex); } catch (Exception ex) { + if (this.required) { + throw new InvalidMixinException(mixin, "Error initialising mixin " + mixin + " - " + ex.getClass() + ": " + ex.getMessage(), ex); + } this.logger.error(ex.getMessage(), ex); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index d3285e14..f052e937 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -262,21 +262,26 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param suppressPlugin * @throws ClassNotFoundException */ - MixinInfo(MixinConfig parent, String mixinName, boolean runTransformers, IMixinConfigPlugin plugin, boolean suppressPlugin) - throws ClassNotFoundException { + MixinInfo(MixinConfig parent, String mixinName, boolean runTransformers, IMixinConfigPlugin plugin, boolean suppressPlugin) { this.parent = parent; this.name = mixinName; this.className = parent.getMixinPackage() + mixinName; this.plugin = plugin; this.phase = MixinEnvironment.getCurrentEnvironment().getPhase(); + ClassNode classNode = null; + // Read the class bytes and transform - byte[] mixinBytes = this.loadMixinClass(this.className, runTransformers); - this.uninitialisedState = new ValidationState(mixinBytes); - this.info = this.uninitialisedState.classInfo; - this.isInterfaceMixin = this.info.isInterface(); + try { + byte[] mixinBytes = this.loadMixinClass(this.className, runTransformers); + this.uninitialisedState = new ValidationState(mixinBytes); + this.info = this.uninitialisedState.classInfo; + classNode = this.uninitialisedState.getClassNode(0); + this.isInterfaceMixin = this.info.isInterface(); + } catch (Exception ex) { + throw new InvalidMixinException(this, ex); + } - ClassNode classNode = this.uninitialisedState.getClassNode(0); this.priority = this.readPriority(classNode); this.targetClasses = this.readTargetClasses(classNode, suppressPlugin); this.targetClassNames = Collections.unmodifiableList(Lists.transform(this.targetClasses, Functions.toStringFunction())); @@ -310,6 +315,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @return */ protected List readTargetClasses(ClassNode classNode, boolean suppressPlugin) { + if (classNode == null) { + return Collections.emptyList(); + } + AnnotationNode mixin = ASMHelper.getInvisibleAnnotation(classNode, Mixin.class); if (mixin == null) { throw new InvalidMixinException(this, String.format("The mixin '%s' is missing an @Mixin annotation", this.className)); @@ -379,6 +388,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @return */ protected int readPriority(ClassNode classNode) { + if (classNode == null) { + return this.parent.getDefaultMixinPriority(); + } + AnnotationNode mixin = ASMHelper.getInvisibleAnnotation(classNode, Mixin.class); if (mixin == null) { throw new InvalidMixinException(this, String.format("The mixin '%s' is missing an @Mixin annotation", this.className)); 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 ad7db7d6..67541c3f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -72,6 +72,73 @@ import net.minecraft.launchwrapper.Launch; */ public class MixinTransformer extends TreeTransformer { + /** + * Phase during which an error occurred, delegates to functionality in + * available handler + */ + static enum ErrorPhase { + /** + * Error during initialisation of a MixinConfig + */ + PREPARE { + @Override + ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, MixinInfo mixin, ErrorAction action) { + try { + return handler.onPrepareError(mixin.getParent(), ex, mixin, action); + } catch (AbstractMethodError ame) { + // Catch if error handler is pre-0.5.4 + return action; + } + } + + @Override + protected String getContext(MixinInfo mixin, String context) { + return String.format("preparing %s in %s", mixin.getName(), context); + } + }, + /** + * Error during application of a mixin to a target class + */ + APPLY { + @Override + ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, MixinInfo mixin, ErrorAction action) { + try { + return handler.onApplyError(context, ex, mixin, action); + } catch (AbstractMethodError ame) { + // Catch if error handler is pre-0.5.4 + return action; + } + } + + @Override + protected String getContext(MixinInfo mixin, String context) { + return String.format("%s -> %s", mixin, context); + } + }; + + /** + * Human-readable name + */ + private final String text; + + private ErrorPhase() { + this.text = this.name().toLowerCase(); + } + + abstract ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, MixinInfo mixin, ErrorAction action); + + protected abstract String getContext(MixinInfo mixin, String context); + + public String getLogMessage(String context, InvalidMixinException ex, MixinInfo mixin) { + return String.format("Mixin %s failed %s: %s %s", this.text, this.getContext(mixin, context), ex.getClass().getName(), ex.getMessage()); + } + + public String getErrorMessage(MixinInfo mixin, MixinConfig config, Phase phase) { + return String.format("Mixin [%s] from phase [%s] in config [%s] FAILED during %s", mixin, phase, config, this.name()); + } + + } + /** * Proxy transformer for the mixin transformer. These transformers are used * to allow the mixin transformer to be re-registered in the transformer @@ -688,14 +755,14 @@ public class MixinTransformer extends TreeTransformer { } private void handleMixinPrepareError(MixinConfig config, InvalidMixinException ex, MixinEnvironment environment) throws MixinPrepareError { - this.handleMixinError(config.getName(), ex, environment, "prepare"); + this.handleMixinError(config.getName(), ex, environment, ErrorPhase.PREPARE); } private void handleMixinApplyError(String targetClass, InvalidMixinException ex, MixinEnvironment environment) throws MixinApplyError { - this.handleMixinError(targetClass, ex, environment, "apply"); + this.handleMixinError(targetClass, ex, environment, ErrorPhase.APPLY); } - private void handleMixinError(String context, InvalidMixinException ex, MixinEnvironment environment, String operation) throws Error { + private void handleMixinError(String context, InvalidMixinException ex, MixinEnvironment environment, ErrorPhase errorPhase) throws Error { this.errorState = true; MixinInfo mixin = ex.getMixin(); @@ -708,9 +775,9 @@ public class MixinTransformer extends TreeTransformer { .add("Invalid Mixin").centre() .hr('-') .kvWidth(10) - .kv("Action", operation.toUpperCase()) + .kv("Action", errorPhase.name()) .kv("Mixin", mixin.getClassName()) - .kv("Config", mixin.getParent().getName()) + .kv("Config", config.getName()) .kv("Phase", phase) .hr('-') .add(" %s", ex.getClass().getName()) @@ -720,25 +787,20 @@ public class MixinTransformer extends TreeTransformer { .add(ex.getStackTrace(), 8) .trace(action.logLevel); } - - if (context != null) { - for (IMixinErrorHandler handler : this.getErrorHandlers(mixin.getPhase())) { - ErrorAction newAction = handler.onError(context, ex, mixin, action); - if (newAction != null) { - action = newAction; - } + + for (IMixinErrorHandler handler : this.getErrorHandlers(mixin.getPhase())) { + ErrorAction newAction = errorPhase.onError(handler, context, ex, mixin, action); + if (newAction != null) { + action = newAction; } } - String ext = context != null ? String.format(" -> %s", context) : ""; - this.logger.log(action.logLevel, String.format("Mixin %s failed %s%s: %s %s", operation, mixin, ext, - ex.getClass().getName(), ex.getMessage()), ex); + this.logger.log(action.logLevel, errorPhase.getLogMessage(context, ex, mixin), ex); this.errorState = false; if (action == ErrorAction.ERROR) { - throw new MixinApplyError(String.format("Mixin [%s] from phase [%s] in config [%s] FAILED %s", mixin, phase, - config, operation.toUpperCase()), ex); + throw new MixinApplyError(errorPhase.getErrorMessage(mixin, config, phase), ex); } } From f19f4deac6c45e0e1260e458634b0c52d6f772e5 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 27 Apr 2016 22:22:47 +0100 Subject: [PATCH 150/169] Add ModifyConstant injector, version bump to 0.5.5 --- gradle.properties | 2 +- .../InjectionObfuscationProcessor.java | 2 + .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/injection/Constant.java | 111 +++++++++ .../asm/mixin/injection/ModifyConstant.java | 124 ++++++++++ .../injection/callback/CallbackInfo.java | 10 +- .../callback/CallbackInfoReturnable.java | 3 +- .../invoke/ModifyConstantInjector.java | 94 ++++++++ .../injection/invoke/RedirectInjector.java | 58 +++-- .../struct/CallbackInjectionInfo.java | 2 +- .../mixin/injection/struct/InjectionInfo.java | 86 ++++--- .../injection/struct/InjectionPointData.java | 3 + .../struct/ModifyArgInjectionInfo.java | 2 +- .../struct/ModifyConstantInjectionInfo.java | 222 ++++++++++++++++++ .../struct/ModifyVariableInjectionInfo.java | 2 +- .../struct/RedirectInjectionInfo.java | 2 +- .../asm/mixin/injection/struct/Target.java | 14 ++ .../mixin/transformer/MixinTransformer.java | 5 +- .../org/spongepowered/asm/util/ASMHelper.java | 105 ++++++++- .../org/spongepowered/asm/util/Constants.java | 4 + 20 files changed, 778 insertions(+), 75 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/Constant.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java create mode 100644 src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java diff --git a/gradle.properties b/gradle.properties index 475a7c84..e2f84d7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.4 +buildVersion=0.5.5 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java index 99861657..832b5600 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java @@ -39,6 +39,7 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.tools.MirrorUtils; @@ -71,6 +72,7 @@ public class InjectionObfuscationProcessor extends MixinProcessor { this.processInjectors(roundEnv, ModifyArg.class); this.processInjectors(roundEnv, Redirect.class); this.processInjectors(roundEnv, ModifyVariable.class); + this.processInjectors(roundEnv, ModifyConstant.class); this.postProcess(roundEnv); return true; diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 7f49b9ca..c7ccddea 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.4"; + public static final String VERSION = "0.5.5"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Constant.java b/src/main/java/org/spongepowered/asm/mixin/injection/Constant.java new file mode 100644 index 00000000..8600d46e --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Constant.java @@ -0,0 +1,111 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Annotation for specifying the injection point for an {@link ModifyConstant} + * injector. Leaving all values unset causes the injection point to match all + * constants with the same type as the {@link ModifyConstant} handler's return + * type. + * + *

To match a specific constant, specify the appropriate value for the + * appropriate argument. Specifying values of different types will cause an + * error to be raised by the injector.

+ */ +@Retention(RetentionPolicy.RUNTIME) +public @interface Constant { + + /** + * Causes this injector to match ACONST_NULL (null object) literals + * + * @return true to match null + */ + public boolean nullValue() default false; + + /** + * Specify an integer constant to match, includes byte and short values + * + * @return integer value to match + */ + public int intValue() default 0; + + /** + * Specify a float constant to match + * + * @return float value to match + */ + public float floatValue() default 0.0F; + + /** + * Specify a long constant to match + * + * @return long value to match + */ + public long longValue() default 0L; + + /** + * Specify a double constant to match + * + * @return double value to match + */ + public double doubleValue() default 0.0; + + /** + * Specify a String constant to match + * + * @return string value to match + */ + public String stringValue() default ""; + + /** + * Specify a type literal to match + * + * @return type literal to match + */ + public Class classValue() default Object.class; + + /** + * Ordinal offset. Many InjectionPoints will return every opcode matching + * their criteria, specifying ordinal allows a particular opcode to + * be identified from the returned list. The default value of -1 does not + * alter the behaviour and returns all matching opcodes. Specifying a value + * of 0 or higher returns only the requested opcode (if one exists: + * for example specifying an ordinal of 4 when only 2 opcodes are matched by + * the InjectionPoint is not going to work particularly well!) + * + * @return ordinal value for supported InjectionPoint types + */ + public int ordinal() default -1; + + /** + * @return true to enable verbose debug logging for this injection point + */ + public boolean log() default false; +} + + diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java new file mode 100644 index 00000000..bfa1a6d5 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java @@ -0,0 +1,124 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.spongepowered.asm.mixin.MixinEnvironment.Option; + +/** + * Specifies that this mixin method should inject a constant modifier callback + * to itself in the target method(s) identified by {@link #method} at the + * specified LDC (or specialised const opcode) instruction in order to adjust + * the constant value returned. + * + *

ModifyConstant callbacks should always take one argument of the + * appropriate constant type and return the same type. For example a + * ModifyConstant for a local of type {@link String} should have the + * signature:

+ * + * private String methodName(String variable) { ... + * + *

The callback receives the original value of the constant, and should + * return the new value.

+ */ + +@Target({ ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ModifyConstant { + + /** + * String representation of a + * {@link org.spongepowered.asm.mixin.injection.struct.MemberInfo + * MemberInfo} which identifies the target method. + * + * @return method to inject into + */ + public String method(); + + /** + * Discriminator for the constant to match (injection point), if not + * specified then all constants matching the annotated handler's return type + * are matched + * + * @return the constant discriminator + */ + public Constant constant() default @Constant; + + /** + * By default, the annotation processor will attempt to locate an + * obfuscation mapping for all {@link ModifyConstant} methods since it is + * anticipated that in general the target of a {@link ModifyConstant} + * annotation will be an obfuscated method in the target class. However + * since it is possible to also apply mixins to non-obfuscated targets (or + * non- obfuscated methods in obfuscated targets, such as methods added by + * Forge) it may be necessary to suppress the compiler error which would + * otherwise be generated. Setting this value to false will cause + * the annotation processor to skip this annotation when attempting to build + * the obfuscation table for the mixin. + * + * @return True to instruct the annotation processor to search for + * obfuscation mappings for this annotation + */ + public boolean remap() default true; + + /** + * In general, injectors are intended to "fail soft" in that a failure to + * locate the injection point in the target method is not considered an + * error condition. Another transformer may have changed the method + * structure or any number of reasons may cause an injection to fail. This + * also makes it possible to define several injections to achieve the same + * task given expected mutation of the target class and the + * injectors which fail are simply ignored. + * + *

However, this behaviour is not always desirable. For example, if your + * application depends on a particular injection succeeding you may wish to + * detect the injection failure as an error condition. This argument is thus + * provided to allow you to stipulate a minimum number of successful + * injections for this callback handler. If the number of injections + * specified is not achieved then an {@link InjectionError} is thrown at + * application time. Use this option with care.

+ * + * @return Minimum required number of injected callbacks, default specified + * by the containing config + */ + public int require() default -1; + + /** + * Like {@link #require()} but only enabled if the + * {@link Option#DEBUG_INJECTORS mixin.debug.countInjections} option is set + * to true and defaults to 1. Use this option during debugging to + * perform simple checking of your injectors. Causes the injector to throw + * a {@link InvalidInjectionException} if the expected number of injections + * is not realised. + * + * @return Minimum number of expected callbacks, default 1 + */ + public int expect() default 1; + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java index e3a6c7b3..e05cee7e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfo.java @@ -26,6 +26,7 @@ package org.spongepowered.asm.mixin.injection.callback; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.util.Constants; /** * CallbackInfo instances are passed to callbacks in order to provide @@ -35,9 +36,6 @@ import org.spongepowered.asm.mixin.injection.Inject; */ public class CallbackInfo implements Cancellable { - protected static final String STRING = "Ljava/lang/String;"; - protected static final String OBJECT = "Ljava/lang/Object;"; - /** * Method name being injected into, this is useful if a single callback is * injecting into multiple methods. @@ -122,14 +120,14 @@ public class CallbackInfo implements Cancellable { } if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { - return String.format("(%sZ%s)V", CallbackInfo.STRING, CallbackInfo.OBJECT); + return String.format("(%sZ%s)V", Constants.STRING, Constants.OBJECT); } - return String.format("(%sZ%s)V", CallbackInfo.STRING, returnType.getDescriptor()); + return String.format("(%sZ%s)V", Constants.STRING, returnType.getDescriptor()); } static String getConstructorDescriptor() { - return String.format("(%sZ)V", CallbackInfo.STRING); + return String.format("(%sZ)V", Constants.STRING); } static String getIsCancelledMethodName() { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java index 8d152a66..588baf42 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInfoReturnable.java @@ -25,6 +25,7 @@ package org.spongepowered.asm.mixin.injection.callback; import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.util.Constants; /** * For callbacks with a non-void return type, a CallbackInfoReturnable is passed @@ -133,7 +134,7 @@ public class CallbackInfoReturnable extends CallbackInfo { static String getReturnDescriptor(Type returnType) { if (returnType.getSort() == Type.OBJECT || returnType.getSort() == Type.ARRAY) { - return String.format("()%s", CallbackInfo.OBJECT); + return String.format("()%s", Constants.OBJECT); } return String.format("()%s", returnType.getDescriptor()); 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 new file mode 100644 index 00000000..84d487df --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java @@ -0,0 +1,94 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.invoke; + +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; +import org.spongepowered.asm.mixin.injection.InvalidInjectionException; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.util.ASMHelper; + +/** + * A bytecode injector which allows a specific + */ +public class ModifyConstantInjector extends RedirectInjector { + + /** + * @param info Injection info + */ + public ModifyConstantInjector(InjectionInfo info) { + super(info, "@ModifyConstant"); + } + + @Override + protected void inject(Target target, InjectionNode node) { + if (!this.preInject(node)) { + return; + } + + if (node.isReplaced()) { + throw new UnsupportedOperationException("Target failure for " + this.info); + } + + if (ASMHelper.isConstant(node.getCurrentTarget())) { + this.injectConstantModifier(target, node); + return; + } + + throw new InvalidInjectionException(this.info, this.annotationType + " annotation on is targetting an invalid insn in " + + target + " in " + this); + } + + private void injectConstantModifier(Target target, InjectionNode node) { + final AbstractInsnNode constNode = node.getCurrentTarget(); + final Type constantType = ASMHelper.getConstantType(constNode); + final InsnList before = new InsnList(); + final InsnList after = new InsnList(); + AbstractInsnNode invoke = this.invokeConstantHandler(constNode, constantType, target, before, after); + target.wrapNode(constNode, invoke, before, after); + } + + private AbstractInsnNode invokeConstantHandler(AbstractInsnNode targetNode, Type constantType, Target target, InsnList before, InsnList after) { + final String handlerDesc = ASMHelper.generateDescriptor(constantType, constantType); + final boolean withArgs = this.checkDescriptor(handlerDesc, target, "getter"); + + if (!this.isStatic) { + before.add(new VarInsnNode(Opcodes.ALOAD, 0)); + target.addToStack(1); + } + + if (withArgs) { + this.pushArgs(target.arguments, after, target.argIndices, 0, target.arguments.length); + target.addToStack(ASMHelper.getArgsSize(target.arguments)); + } + + return this.invokeHandler(after); + } +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index f35efdeb..4882d234 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -107,13 +107,17 @@ public class RedirectInjector extends InvokeInjector { } - private Meta meta; + protected Meta meta; /** * @param info Injection info */ public RedirectInjector(InjectionInfo info) { - super(info, "@Redirect"); + this(info, "@Redirect"); + } + + protected RedirectInjector(InjectionInfo info, String annotationType) { + super(info, annotationType); int priority = info.getContext().getPriority(); boolean isFinal = ASMHelper.getVisibleAnnotation(this.methodNode, Final.class) != null; @@ -144,10 +148,7 @@ public class RedirectInjector extends InvokeInjector { @Override protected void inject(Target target, InjectionNode node) { - Meta other = node.getDecoration(Meta.KEY); - if (other.getOwner() != this) { - Injector.logger.warn("{} conflict. Skipping {} with priority {}, already redirected by {} with priority {}", - this.annotationType, this.info, this.meta.priority, other.name, other.priority); + if (!this.preInject(node)) { return; } @@ -168,19 +169,29 @@ public class RedirectInjector extends InvokeInjector { throw new InvalidInjectionException(this.info, this.annotationType + " annotation on is targetting an invalid insn in " + target + " in " + this); } + + protected boolean preInject(InjectionNode node) { + Meta other = node.getDecoration(Meta.KEY); + if (other.getOwner() != this) { + Injector.logger.warn("{} conflict. Skipping {} with priority {}, already redirected by {} with priority {}", + this.annotationType, this.info, this.meta.priority, other.name, other.priority); + return false; + } + return true; + } /** * Redirect a method invocation */ @Override protected void injectAtInvoke(Target target, InjectionNode node) { - MethodInsnNode methodNode = (MethodInsnNode)node.getCurrentTarget(); + final MethodInsnNode methodNode = (MethodInsnNode)node.getCurrentTarget(); + final boolean targetIsStatic = methodNode.getOpcode() == Opcodes.INVOKESTATIC; + final Type ownerType = Type.getType("L" + methodNode.owner + ";"); + final Type returnType = Type.getReturnType(methodNode.desc); + final Type[] args = Type.getArgumentTypes(methodNode.desc); + final Type[] stackVars = targetIsStatic ? args : ObjectArrays.concat(ownerType, args); boolean injectTargetParams = false; - boolean targetIsStatic = methodNode.getOpcode() == Opcodes.INVOKESTATIC; - Type ownerType = Type.getType("L" + methodNode.owner + ";"); - Type returnType = Type.getReturnType(methodNode.desc); - Type[] args = Type.getArgumentTypes(methodNode.desc); - Type[] stackVars = targetIsStatic ? args : ObjectArrays.concat(ownerType, args); String desc = Injector.printArgs(stackVars) + returnType; if (!desc.equals(this.methodNode.desc)) { @@ -213,19 +224,20 @@ public class RedirectInjector extends InvokeInjector { * Redirect a field get or set operation */ private void injectAtFieldAccess(Target target, InjectionNode node) { - FieldInsnNode fieldNode = (FieldInsnNode)node.getCurrentTarget(); - boolean staticField = fieldNode.getOpcode() == Opcodes.GETSTATIC || fieldNode.getOpcode() == Opcodes.PUTSTATIC; - Type ownerType = Type.getType("L" + fieldNode.owner + ";"); - Type fieldType = Type.getType(fieldNode.desc); + final FieldInsnNode fieldNode = (FieldInsnNode)node.getCurrentTarget(); + final int opCode = fieldNode.getOpcode(); + final boolean staticField = opCode == Opcodes.GETSTATIC || opCode == Opcodes.PUTSTATIC; + final Type ownerType = Type.getType("L" + fieldNode.owner + ";"); + final Type fieldType = Type.getType(fieldNode.desc); AbstractInsnNode invoke = null; InsnList insns = new InsnList(); - if (fieldNode.getOpcode() == Opcodes.GETSTATIC || fieldNode.getOpcode() == Opcodes.GETFIELD) { + if (opCode == Opcodes.GETSTATIC || opCode == Opcodes.GETFIELD) { invoke = this.injectAtGetField(insns, target, fieldNode, staticField, ownerType, fieldType); - } else if (fieldNode.getOpcode() == Opcodes.PUTSTATIC || fieldNode.getOpcode() == Opcodes.PUTFIELD) { + } else if (opCode == Opcodes.PUTSTATIC || opCode == Opcodes.PUTFIELD) { invoke = this.injectAtPutField(insns, target, fieldNode, staticField, ownerType, fieldType); } else { - throw new InvalidInjectionException(this.info, "Unspported opcode " + fieldNode.getOpcode() + " on FieldInsnNode for " + this.info); + throw new InvalidInjectionException(this.info, "Unspported opcode " + opCode + " on FieldInsnNode for " + this.info); } target.replaceNode(fieldNode, invoke, insns); @@ -238,8 +250,8 @@ public class RedirectInjector extends InvokeInjector { * handler and the field itself. */ private AbstractInsnNode injectAtGetField(InsnList insns, Target target, FieldInsnNode node, boolean staticField, Type owner, Type fieldType) { - String handlerDesc = staticField ? ASMHelper.generateDescriptor(fieldType) : ASMHelper.generateDescriptor(fieldType, owner); - boolean withArgs = this.checkDescriptor(handlerDesc, target, "getter"); + final String handlerDesc = staticField ? ASMHelper.generateDescriptor(fieldType) : ASMHelper.generateDescriptor(fieldType, owner); + final boolean withArgs = this.checkDescriptor(handlerDesc, target, "getter"); if (!this.isStatic) { insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); @@ -293,7 +305,7 @@ public class RedirectInjector extends InvokeInjector { * Check that the handler descriptor matches the calculated descriptor for * the field access being redirected. */ - private boolean checkDescriptor(String desc, Target target, String type) { + protected boolean checkDescriptor(String desc, Target target, String type) { if (this.methodNode.desc.equals(desc)) { return false; } @@ -304,7 +316,7 @@ public class RedirectInjector extends InvokeInjector { return true; } - throw new InvalidInjectionException(this.info, this.annotationType + " field " + type + " " + this + throw new InvalidInjectionException(this.info, this.annotationType + " method " + type + " " + this + " has an invalid signature. Expected " + desc + " but found " + this.methodNode.desc); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java index da9871e2..a6689266 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/CallbackInjectionInfo.java @@ -43,7 +43,7 @@ public class CallbackInjectionInfo extends InjectionInfo { } @Override - protected Injector initInjector(AnnotationNode injectAnnotation) { + protected Injector parseInjector(AnnotationNode injectAnnotation) { boolean cancellable = ASMHelper.getAnnotationValue(injectAnnotation, "cancellable", false); LocalCapture locals = ASMHelper.getAnnotationValue(injectAnnotation, "locals", LocalCapture.class, LocalCapture.NO_CAPTURE); String identifier = ASMHelper.getAnnotationValue(injectAnnotation, "id", ""); 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 0de2641b..83d9f3a7 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 @@ -47,6 +47,7 @@ import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.code.Injector; @@ -148,56 +149,61 @@ public abstract class InjectionInfo { /** * Parse the info from the supplied annotation */ - @SuppressWarnings("unchecked") protected void readAnnotation() { if (this.annotation == null) { return; } String type = "@" + ASMHelper.getSimpleName(this.annotation); - + List injectionPoints = this.readInjectionPoints(type); + this.findMethods(this.parseTarget(type), type); + this.parseInjectionPoints(injectionPoints); + this.parseRequirements(); + this.injector = this.parseInjector(this.annotation); + } + + protected MemberInfo parseTarget(String type) { String method = ASMHelper.getAnnotationValue(this.annotation, "method"); if (method == null) { throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " is missing method name"); } - List ats = null; - Object atValue = ASMHelper.getAnnotationValue(this.annotation, "at"); - if (atValue instanceof List) { - ats = (List)atValue; - } else if (atValue instanceof AnnotationNode) { - ats = new ArrayList(); - ats.add((AnnotationNode)atValue); - } else { - throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " is missing 'at' value(s)"); - } - - MemberInfo targetMember; try { - targetMember = MemberInfo.parseAndValidate(method, this.mixin); + MemberInfo targetMember = MemberInfo.parseAndValidate(method, this.mixin); + if (targetMember.owner != null && !targetMember.owner.equals(this.mixin.getTargetClassRef())) { + throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " specifies a target class '" + + targetMember.owner + "', which is not supported"); + } + return targetMember; } catch (InvalidMemberDescriptorException ex) { throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + ", has invalid target descriptor: \"" + method + "\""); } - - if (targetMember.owner != null && !targetMember.owner.equals(this.mixin.getTargetClassRef())) { - throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " specifies a target class '" - + targetMember.owner + "', which is not supported"); + } + + @SuppressWarnings("unchecked") + protected List readInjectionPoints(String type) { + Object atValue = ASMHelper.getAnnotationValue(this.annotation, "at"); + if (atValue instanceof List) { + return (List)atValue; + } else if (atValue instanceof AnnotationNode) { + List ats = new ArrayList(); + ats.add((AnnotationNode)atValue); + return ats; } - - this.findMethods(targetMember); - - if (this.targets.size() == 0) { - throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " could not find '" + targetMember.name + "'"); - } - + throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " is missing 'at' value(s)"); + } + + protected void parseInjectionPoints(List ats) { for (AnnotationNode at : ats) { InjectionPoint injectionPoint = InjectionPoint.parse(this.mixin, this.method, this.annotation, at); if (injectionPoint != null) { this.injectionPoints.add(injectionPoint); } } - + } + + protected void parseRequirements() { this.group = this.mixin.getInjectorGroups().parseGroup(this.method, this.mixin.getDefaultInjectorGroup()).add(this); Integer expect = ASMHelper.getAnnotationValue(this.annotation, "expect"); @@ -211,12 +217,10 @@ public abstract class InjectionInfo { } else if (this.group.isDefault()) { this.requiredCallbackCount = this.mixin.getDefaultRequiredInjections(); } - - this.injector = this.initInjector(this.annotation); } // stub - protected abstract Injector initInjector(AnnotationNode injectAnnotation); + protected abstract Injector parseInjector(AnnotationNode injectAnnotation); /** * Get whether there is enough valid information in this info to actually @@ -364,14 +368,16 @@ public abstract class InjectionInfo { * Finds methods in the target class which match searchFor * * @param searchFor member info to search for + * @param type annotation type */ - private void findMethods(MemberInfo searchFor) { + private void findMethods(MemberInfo searchFor, String type) { this.targets.clear(); int ordinal = 0; for (MethodNode target : this.classNode.methods) { if (searchFor.matches(target.name, target.desc, ordinal)) { - if (searchFor.matchAll && ASMHelper.methodIsStatic(target) != this.isStatic) { + boolean isMixinMethod = ASMHelper.getVisibleAnnotation(target, MixinMerged.class) != null; + if (searchFor.matchAll && (ASMHelper.methodIsStatic(target) != this.isStatic || target == this.method || isMixinMethod)) { continue; } @@ -381,6 +387,10 @@ public abstract class InjectionInfo { ordinal++; } } + + if (this.targets.size() == 0) { + throw new InvalidInjectionException(this, type + " annotation on " + this.method.name + " could not find '" + searchFor.name + "'"); + } } private void checkTarget(MethodNode target) { @@ -418,6 +428,8 @@ public abstract class InjectionInfo { return new RedirectInjectionInfo(mixin, method, annotation); } else if (annotation.desc.endsWith(ModifyVariable.class.getSimpleName() + ";")) { return new ModifyVariableInjectionInfo(mixin, method, annotation); + } else if (annotation.desc.endsWith(ModifyConstant.class.getSimpleName() + ";")) { + return new ModifyConstantInjectionInfo(mixin, method, annotation); } return null; @@ -427,7 +439,13 @@ public abstract class InjectionInfo { public static AnnotationNode getInjectorAnnotation(MixinTargetContext mixin, MethodNode method) { AnnotationNode annotation = null; try { - annotation = ASMHelper.getSingleVisibleAnnotation(method, Inject.class, ModifyArg.class, Redirect.class, ModifyVariable.class); + annotation = ASMHelper.getSingleVisibleAnnotation(method, + Inject.class, + ModifyArg.class, + Redirect.class, + ModifyVariable.class, + ModifyConstant.class + ); } catch (IllegalArgumentException ex) { throw new InvalidMixinException(mixin, "Error parsing annotations on " + method.name + " in " + mixin.getClassName() + ": " + ex.getMessage()); @@ -443,6 +461,8 @@ public abstract class InjectionInfo { return "redirect"; } else if (annotation.desc.endsWith(ModifyVariable.class.getSimpleName() + ";")) { return "localvar"; + } else if (annotation.desc.endsWith(ModifyConstant.class.getSimpleName() + ";")) { + return "constant"; } } return "handler"; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java index bd5130f9..9d1e5078 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java @@ -98,6 +98,9 @@ public class InjectionPointData { } private void parseArgs(List args) { + if (args == null) { + return; + } for (String arg : args) { if (arg != null) { int eqPos = arg.indexOf('='); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java index bc90793d..681f5466 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyArgInjectionInfo.java @@ -42,7 +42,7 @@ public class ModifyArgInjectionInfo extends InjectionInfo { } @Override - protected Injector initInjector(AnnotationNode injectAnnotation) { + protected Injector parseInjector(AnnotationNode injectAnnotation) { int index = ASMHelper.getAnnotationValue(injectAnnotation, "index", -1); return new ModifyArgInjector(this, index); diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java new file mode 100644 index 00000000..2000c39f --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java @@ -0,0 +1,222 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.injection.struct; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.ListIterator; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.InjectionPoint; +import org.spongepowered.asm.mixin.injection.InvalidInjectionException; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.invoke.ModifyConstantInjector; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +import org.spongepowered.asm.util.ASMHelper; +import org.spongepowered.asm.util.Constants; + +/** + * Information about a constant modifier injector + */ +public class ModifyConstantInjectionInfo extends InjectionInfo { + + /** + * Special injection point which is defined by an {@link Constant} + * annotation. + */ + static class BeforeConstant extends InjectionPoint { + + private static final Logger logger = LogManager.getLogger("mixin"); + + /** + * Ordinal of the target insn + */ + private final int ordinal; + + private final boolean nullValue; + private final Integer intValue; + private final Float floatValue; + private final Long longValue; + private final Double doubleValue; + private final String stringValue; + private final Type typeValue; + + private final String matchByType; + + private final boolean log; + + public BeforeConstant(InjectionInfo info, AnnotationNode node, String returnType) { + Boolean empty = ASMHelper.getAnnotationValue(node, "nullValue", (Boolean)null); + this.ordinal = ASMHelper.getAnnotationValue(node, "ordinal", Integer.valueOf(-1)); + this.nullValue = empty != null ? empty.booleanValue() : false;; + this.intValue = ASMHelper.getAnnotationValue(node, "intValue", (Integer)null); + this.floatValue = ASMHelper.getAnnotationValue(node, "floatValue", (Float)null); + this.longValue = ASMHelper.getAnnotationValue(node, "longValue", (Long)null); + this.doubleValue = ASMHelper.getAnnotationValue(node, "doubleValue", (Double)null); + this.stringValue = ASMHelper.getAnnotationValue(node, "stringValue", (String)null); + this.typeValue = ASMHelper.getAnnotationValue(node, "classValue", (Type)null); + + int c = BeforeConstant.count(empty, this.intValue, this.floatValue, this.longValue, this.doubleValue, this.stringValue, this.typeValue); + if (c == 1) { + returnType = null; + } else if (c > 1) { + throw new InvalidInjectionException(info, "Conflicting constant discriminators specified on @Constant annotation for " + info); + } + + this.matchByType = returnType; + + this.log = ASMHelper.getAnnotationValue(node, "log", Boolean.FALSE).booleanValue(); + } + + @Override + public boolean find(String desc, InsnList insns, Collection nodes) { + boolean found = false; + + if (this.log) { + BeforeConstant.logger.info("BeforeConstant is searching for an constants in method with descriptor {}", desc); + } + + ListIterator iter = insns.iterator(); + for (int ordinal = 0; iter.hasNext();) { + AbstractInsnNode insn = iter.next(); + + boolean matchesInsn = this.matchesInsn(insn); + if (matchesInsn) { + if (this.log) { + String byType = this.matchByType != null ? " TYPE" : " value"; + BeforeConstant.logger.info(" BeforeConstant found a matching constant{} at ordinal {}", byType, ordinal); + } + if (this.ordinal == -1 || this.ordinal == ordinal) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found {}", ASMHelper.getNodeDescriptionForDebug(insn).trim()); + } + nodes.add(insn); + found = true; + } + ordinal++; + } + } + + return found; + } + + private boolean matchesInsn(AbstractInsnNode insn) { + if (!ASMHelper.isConstant(insn)) { + return false; + } + + Object value = ASMHelper.getConstant(insn); + if (value == null) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found NULL constant: nullValue = {}", this.nullValue); + } + return this.nullValue || Constants.OBJECT.equals(this.matchByType); + } else if (value instanceof Integer) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found INTEGER constant: value = {}, intValue = {}", value, this.intValue); + } + return value.equals(this.intValue) || "I".equals(this.matchByType); + } else if (value instanceof Float) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found FLOAT constant: value = {}, floatValue = {}", value, this.floatValue); + } + return value.equals(this.floatValue) || "F".equals(this.matchByType); + } else if (value instanceof Long) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found LONG constant: value = {}, longValue = {}", value, this.longValue); + } + return value.equals(this.longValue) || "J".equals(this.matchByType); + } else if (value instanceof Double) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found DOUBLE constant: value = {}, doubleValue = {}", value, this.doubleValue); + } + return value.equals(this.doubleValue) || "D".equals(this.matchByType); + } else if (value instanceof String) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found STRING constant: value = {}, stringValue = {}", value, this.stringValue); + } + return value.equals(this.stringValue) || Constants.STRING.equals(this.matchByType); + } else if (value instanceof Type) { + if (this.log) { + BeforeConstant.logger.info(" BeforeConstant found CLASS constant: value = {}, typeValue = {}", value, this.typeValue); + } + return value.equals(this.typeValue) || Constants.CLASS.equals(this.matchByType); + } + + return false; + } + + private static int count(Object... values) { + int counter = 0; + for (Object value : values) { + if (value != null) { + counter++; + } + } + return counter; + } + + } + + public ModifyConstantInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { + super(mixin, method, annotation); + } + + @Override + protected List readInjectionPoints(String type) { + AnnotationNode constantAnnotation = ASMHelper.getAnnotationValue(this.annotation, "constant"); + List ats = new ArrayList(); + ats.add(constantAnnotation); + return ats; + } + + @Override + protected void parseInjectionPoints(List ats) { + Type returnType = Type.getReturnType(this.method.desc); + + for (AnnotationNode at : ats) { + this.injectionPoints.add(new BeforeConstant(this, at, returnType.getDescriptor())); + } + } + + @Override + protected Injector parseInjector(AnnotationNode injectAnnotation) { + return new ModifyConstantInjector(this); + } + + @Override + protected String getDescription() { + return "Constant modifier method"; + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java index 048622b0..0c254f82 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyVariableInjectionInfo.java @@ -43,7 +43,7 @@ public class ModifyVariableInjectionInfo extends InjectionInfo { } @Override - protected Injector initInjector(AnnotationNode injectAnnotation) { + protected Injector parseInjector(AnnotationNode injectAnnotation) { boolean print = ASMHelper.getAnnotationValue(injectAnnotation, "print", Boolean.FALSE).booleanValue(); return new ModifyVariableInjector(this, print, LocalVariableDiscriminator.parse(injectAnnotation)); } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java index d56531c8..f46332f3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/RedirectInjectionInfo.java @@ -40,7 +40,7 @@ public class RedirectInjectionInfo extends InjectionInfo { } @Override - protected Injector initInjector(AnnotationNode injectAnnotation) { + protected Injector parseInjector(AnnotationNode injectAnnotation) { return new RedirectInjector(this); } 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 88a9c429..21c6e0dd 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 @@ -315,6 +315,20 @@ public class Target implements Comparable { this.injectionNodes.replace(location, champion); } + /** + * Wrap instruction in this target with the specified instructions and mark + * the node as replaced with the specified champion node from the list. + * + * @param location Instruction to replace + * @param champion Instruction which notionally replaces the original insn + * @param before Instructions to actually insert (must contain champion) + */ + public void wrapNode(AbstractInsnNode location, AbstractInsnNode champion, InsnList before, InsnList after) { + this.insns.insertBefore(location, before); + this.insns.insert(location, after); + this.injectionNodes.replace(location, champion); + } + /** * Replace an instruction in this target with the specified instructions and * mark the original node as removed 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 67541c3f..ff8bcb91 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -526,9 +526,10 @@ public class MixinTransformer extends TreeTransformer { } return basicClass; - } catch (Exception ex) { + } catch (Throwable th) { + th.printStackTrace(); this.dumpClassOnFailure(transformedName, basicClass, environment); - throw new MixinTransformerError("An unexpected critical error was encountered", ex); + throw new MixinTransformerError("An unexpected critical error was encountered", th); } finally { this.lock.pop(); } diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 3c5bc534..41130e2d 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -24,6 +24,7 @@ */ package org.spongepowered.asm.util; +import static com.google.common.base.Preconditions.*; import static org.spongepowered.asm.lib.ClassWriter.*; import java.io.PrintWriter; @@ -41,14 +42,61 @@ import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.lib.util.CheckClassAdapter; +import com.google.common.primitives.Ints; + /** * Utility methods for working with ASM */ public class ASMHelper { - private static final int[] intConstants = new int[] - {Opcodes.ICONST_0, Opcodes.ICONST_1, Opcodes.ICONST_2, Opcodes.ICONST_3, Opcodes.ICONST_4, Opcodes.ICONST_5}; + public static final int[] CONSTANTS_INT = { + Opcodes.ICONST_M1, Opcodes.ICONST_0, Opcodes.ICONST_1, Opcodes.ICONST_2, Opcodes.ICONST_3, Opcodes.ICONST_4, Opcodes.ICONST_5 + }; + public static final int[] CONSTANTS_FLOAT = { + Opcodes.FCONST_0, Opcodes.FCONST_1, Opcodes.FCONST_2 + }; + + public static final int[] CONSTANTS_DOUBLE = { + Opcodes.DCONST_0, Opcodes.DCONST_1 + }; + + public static final int[] CONSTANTS_LONG = { + Opcodes.LCONST_0, Opcodes.LCONST_1 + }; + + public static final int[] CONSTANTS_ALL = { + Opcodes.ACONST_NULL, + Opcodes.ICONST_M1, + Opcodes.ICONST_0, Opcodes.ICONST_1, Opcodes.ICONST_2, Opcodes.ICONST_3, Opcodes.ICONST_4, Opcodes.ICONST_5, + Opcodes.LCONST_0, Opcodes.LCONST_1, + Opcodes.FCONST_0, Opcodes.FCONST_1, Opcodes.FCONST_2, + Opcodes.DCONST_0, Opcodes.DCONST_1, + Opcodes.BIPUSH, // 15 + Opcodes.SIPUSH, // 16 + Opcodes.LDC, // 17 + }; + + private static final Object[] CONSTANTS_VALUES = { + null, + Integer.valueOf(-1), + Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), + Long.valueOf(0L), Long.valueOf(1L), + Float.valueOf(0.0F), Float.valueOf(1.0F), Float.valueOf(2.0F), + Double.valueOf(0.0), Double.valueOf(1.0) + }; + + private static final String[] CONSTANTS_TYPES = { + null, + "I", + "I", "I", "I", "I", "I", "I", + "J", "J", + "F", "F", "F", + "D", "D", + "I", //"B", + "I", //"S" + }; + /** * Generate a new method "boolean name()", which returns a constant value. * @@ -282,7 +330,7 @@ public class ASMHelper { if (c == -1) { return new InsnNode(Opcodes.ICONST_M1); } else if (c >= 0 && c <= 5) { - return new InsnNode(intConstants[c]); + return new InsnNode(ASMHelper.CONSTANTS_INT[c + 1]); } else if (c >= Byte.MIN_VALUE && c <= Byte.MAX_VALUE) { return new IntInsnNode(Opcodes.BIPUSH, c); } else if (c >= Short.MIN_VALUE && c <= Short.MAX_VALUE) { @@ -741,6 +789,7 @@ public class ASMHelper { */ @SuppressWarnings("unchecked") public static T getAnnotationValue(AnnotationNode annotation, String key, Class annotationClass) { + checkNotNull(annotationClass, "annotationClass cannot be null"); T value = ASMHelper.getAnnotationValue(annotation, key); if (value == null) { try { @@ -914,7 +963,7 @@ public class ASMHelper { StringBuilder sb = new StringBuilder().append('('); for (Object arg : args) { - sb.append(ASMHelper.toDescriptor(/*obfType, */arg)); + sb.append(ASMHelper.toDescriptor(arg)); } return sb.append(')').append(returnType != null ? ASMHelper.toDescriptor(returnType) : "V").toString(); @@ -942,4 +991,52 @@ public class ASMHelper { return desc.substring(desc.lastIndexOf('/') + 1).replace(";", ""); } + public static boolean isConstant(AbstractInsnNode insn) { + if (insn == null) { + return false; + } + return Ints.contains(ASMHelper.CONSTANTS_ALL, insn.getOpcode()); + } + + public static Object getConstant(AbstractInsnNode insn) { + if (insn == null) { + return null; + } else if (insn instanceof LdcInsnNode) { + return ((LdcInsnNode)insn).cst; + } else if (insn instanceof IntInsnNode) { + int value = ((IntInsnNode)insn).operand; + if (insn.getOpcode() == Opcodes.BIPUSH || insn.getOpcode() == Opcodes.SIPUSH) { + return Integer.valueOf(value); + } + throw new IllegalArgumentException("IntInsnNode with invalid opcode " + insn.getOpcode() + " in getConstant"); + } + + int index = Ints.indexOf(ASMHelper.CONSTANTS_ALL, insn.getOpcode()); + return index < 0 ? null : ASMHelper.CONSTANTS_VALUES[index]; + } + + public static Type getConstantType(AbstractInsnNode insn) { + if (insn == null) { + return null; + } else if (insn instanceof LdcInsnNode) { + Object cst = ((LdcInsnNode)insn).cst; + if (cst instanceof Integer) { + return Type.getType("I"); + } else if (cst instanceof Float) { + return Type.getType("F"); + } else if (cst instanceof Long) { + return Type.getType("J"); + } else if (cst instanceof Double) { + return Type.getType("D"); + } else if (cst instanceof String) { + return Type.getType(Constants.STRING); + } else if (cst instanceof Type) { + return Type.getType(Constants.CLASS); + } + throw new IllegalArgumentException("LdcInsnNode with invalid payload type " + cst.getClass() + " in getConstant"); + } + + int index = Ints.indexOf(ASMHelper.CONSTANTS_ALL, insn.getOpcode()); + return index < 0 ? null : Type.getType(ASMHelper.CONSTANTS_TYPES[index]); + } } diff --git a/src/main/java/org/spongepowered/asm/util/Constants.java b/src/main/java/org/spongepowered/asm/util/Constants.java index 45c69f42..4f940293 100644 --- a/src/main/java/org/spongepowered/asm/util/Constants.java +++ b/src/main/java/org/spongepowered/asm/util/Constants.java @@ -38,5 +38,9 @@ public abstract class Constants { public static final String MIXIN_PACKAGE = Mixin.class.getPackage().getName(); public static final String MIXIN_PACKAGE_REF = Constants.MIXIN_PACKAGE.replace('.', '/'); + public static final String STRING = "Ljava/lang/String;"; + public static final String OBJECT = "Ljava/lang/Object;"; + public static final String CLASS = "Ljava/lang/Class;"; + private Constants() {} } From 244303cd3d2bd1d9697bc968ba28d45703277a03 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 10 May 2016 20:22:28 +0100 Subject: [PATCH 151/169] Strip final flag from Mutable shadow targets, closes #124 --- .../transformer/InterfaceMixinApplicator.java | 6 +++++- .../asm/mixin/transformer/MixinApplicator.java | 14 +++++++++++--- .../asm/mixin/transformer/MixinPreProcessor.java | 3 ++- .../asm/mixin/transformer/MixinTargetContext.java | 4 ++-- .../asm/mixin/transformer/MixinTransformer.java | 6 ++++++ 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java index dc6bb192..087fbf0c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java @@ -24,10 +24,13 @@ */ package org.spongepowered.asm.mixin.transformer; +import java.util.Map.Entry; + import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; /** * Applicator for interface mixins, mainly just disables things which aren't @@ -67,7 +70,8 @@ public class InterfaceMixinApplicator extends MixinApplicator { @Override protected void applyFields(MixinTargetContext mixin) { // shadow fields have no meaning for interfaces, just spam the dev with messages - for (FieldNode shadow : mixin.getShadowFields()) { + for (Entry entry : mixin.getShadowFields()) { + FieldNode shadow = entry.getKey(); this.logger.error("Ignoring redundant @Shadow field {}:{} in {}", shadow.name, shadow.desc, mixin); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index a6a03cc9..78b18a23 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -30,6 +30,7 @@ import java.util.Deque; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.SortedSet; import org.apache.logging.log4j.LogManager; @@ -51,6 +52,7 @@ import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.util.ASMHelper; @@ -307,15 +309,21 @@ public class MixinApplicator { * @param mixin */ protected void applyFields(MixinTargetContext mixin) { - this.mergeShadowFieldAnnotations(mixin); + this.mergeShadowFields(mixin); this.mergeNewFields(mixin); } - protected void mergeShadowFieldAnnotations(MixinTargetContext mixin) { - for (FieldNode shadow : mixin.getShadowFields()) { + protected void mergeShadowFields(MixinTargetContext mixin) { + for (Entry entry : mixin.getShadowFields()) { + FieldNode shadow = entry.getKey(); FieldNode target = this.findTargetField(shadow); if (target != null) { this.mergeAnnotations(shadow, target); + + // Strip the FINAL flag from @Mutable non-private fields + if (entry.getValue().isDecoratedMutable() && !MixinApplicator.hasFlag(target, Opcodes.ACC_PRIVATE)) { + target.access &= ~Opcodes.ACC_FINAL; + } } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 65f61050..25f2bc10 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -345,7 +345,8 @@ class MixinPreProcessor { // Public static fields will fall foul of early static binding in java, including them in a mixin is an error condition if (MixinApplicator.hasFlag(field, Opcodes.ACC_STATIC) && !MixinApplicator.hasFlag(field, Opcodes.ACC_PRIVATE) - && !MixinApplicator.hasFlag(field, Opcodes.ACC_SYNTHETIC)) { + && !MixinApplicator.hasFlag(field, Opcodes.ACC_SYNTHETIC) + && shadow == null) { throw new InvalidMixinException(context, String.format("Mixin %s contains non-private static field %s:%s", context, field.name, field.desc)); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 84839e9f..bf61409d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -833,8 +833,8 @@ public class MixinTargetContext implements IReferenceMapperContext { * * @return shadow fields in the mixin */ - public Collection getShadowFields() { - return this.shadowFields.keySet(); + public Set> getShadowFields() { + return this.shadowFields.entrySet(); } /** 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 ff8bcb91..c6f35631 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -767,6 +767,12 @@ public class MixinTransformer extends TreeTransformer { this.errorState = true; MixinInfo mixin = ex.getMixin(); + + if (mixin == null) { + this.logger.error("InvalidMixinException has no mixin!", ex); + throw ex; + } + MixinConfig config = mixin.getParent(); Phase phase = mixin.getPhase(); ErrorAction action = config.isRequired() ? ErrorAction.ERROR : ErrorAction.WARN; From f0dbff5076dcb5d90c6992eb52254e0e7f276b4e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 12 May 2016 12:06:24 +0100 Subject: [PATCH 152/169] Add toString to ObfuscationData for debugging purposes --- .../tools/obfuscation/ObfuscationData.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java index 31f4891e..232bbca2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationData.java @@ -77,4 +77,17 @@ public class ObfuscationData implements Iterable { return this.data.keySet().iterator(); } + @Override + public String toString() { + return String.format("ObfuscationData[%sDEFAULT=%s]", this.listValues(), this.defaultValue); + } + + private String listValues() { + StringBuilder sb = new StringBuilder(); + for (ObfuscationType type : this.data.keySet()) { + sb.append(type.name()).append('=').append(this.data.get(type)).append(','); + } + return sb.toString(); + } + } From 62d84432709867c2e413b7060cbd4c907ff3bf47 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 12 May 2016 12:07:11 +0100 Subject: [PATCH 153/169] Remap field descriptors when adding to refmap, fixes #125 --- .../tools/obfuscation/ObfuscationManager.java | 5 ++--- .../obfuscation/TargetObfuscationEnvironment.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index 94fcb917..c926fdb9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -365,9 +365,8 @@ public class ObfuscationManager implements IObfuscationManager { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { String obfField = obfFieldData.get(targetEnv.getType()); if (obfField != null) { - MemberInfo remappedReference = MemberInfo.fromSrgField(obfField, context.desc); - String remapped = remappedReference.toString(); - targetEnv.addMapping(className, reference, remapped); + MemberInfo remappedReference = MemberInfo.fromSrgField(obfField, targetEnv.remapDescriptor(context.desc)); + targetEnv.addMapping(className, reference, remappedReference.toString()); } } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 5d420a74..56a17919 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -269,6 +269,17 @@ class TargetObfuscationEnvironment { return transformed ? new MemberInfo(method.name, owner, desc, method.matchAll) : null; } + /** + * Remap a single descriptor in the context of this environment + * + * @param desc descriptor to remap + * @return remapped descriptor, may return the original descriptor if no + * remapping occurred + */ + public String remapDescriptor(String desc) { + return ObfuscationUtil.mapDescriptor(desc, this.remapper); + } + /** * Get an obfuscation mapping for a field */ From 13b887621956dbc26c494b1062d9bd4d738a5ba1 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 19 May 2016 18:47:10 +0100 Subject: [PATCH 154/169] Add Debug annotation and handle inject conflicts per-target, fixes #127 --- .../org/spongepowered/asm/mixin/Debug.java | 64 +++++++++++++++ .../mixin/transformer/MixinApplicator.java | 11 ++- .../mixin/transformer/MixinTargetContext.java | 19 +---- .../mixin/transformer/MixinTransformer.java | 12 +-- .../mixin/transformer/TargetClassContext.java | 82 +++++++++++++++++-- .../org/spongepowered/asm/util/ASMHelper.java | 73 +++++++++++++++-- 6 files changed, 220 insertions(+), 41 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/Debug.java diff --git a/src/main/java/org/spongepowered/asm/mixin/Debug.java b/src/main/java/org/spongepowered/asm/mixin/Debug.java new file mode 100644 index 00000000..cfea8ddd --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/Debug.java @@ -0,0 +1,64 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Anotation used to decorate items you might wish to examine after mixin + * application. + */ +@Target({ ElementType.TYPE, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface Debug { + + /** + * Only applicable for classes, use this to decorate mixins that you wish + * to export even if mixin.debug.export is not enabled. This is + * useful if you wish to export only the target of the mixin you are working + * on without enabling export globally. + * + *

Note that if mixin.debug.export is not true + * then the decompiler is not initialised (even if present on the + * classpath) and thus you must set mixin.debug.export.decompile to + * true in order to have force-exported classes decompiled.

+ * + * @return whether to export the decorated target class + */ + public boolean export() default false; + + /** + * Print the method bytecode to the console after mixin application. This + * setting is only used if the mixin.debug.verbose option is + * enabled. + * + * @return whether to print the class or method to the console. + */ + public boolean print() default false; + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java index 78b18a23..0eb44d32 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java @@ -232,6 +232,8 @@ public class MixinApplicator { throw new InvalidMixinException(current, "Unexpecteded " + ex.getClass().getSimpleName() + " whilst applying the mixin class: " + ex.getMessage(), ex); } + + this.context.processDebugTasks(); } /** @@ -875,7 +877,7 @@ public class MixinApplicator { } for (AnnotationNode annotation : from) { - if (annotation.desc.startsWith("L" + Constants.MIXIN_PACKAGE_REF)) { + if (!this.isMergeableAnnotation(annotation)) { continue; } @@ -895,6 +897,13 @@ public class MixinApplicator { return to; } + private boolean isMergeableAnnotation(AnnotationNode annotation) { + if (annotation.desc.startsWith("L" + Constants.MIXIN_PACKAGE_REF)) { + return annotation.desc.endsWith("Debug;"); + } + return true; + } + /** * Find the first insn node with a matching opcode in the specified method * diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index bf61409d..64586be2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -26,7 +26,6 @@ package org.spongepowered.asm.mixin.transformer; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -113,12 +112,6 @@ public class MixinTargetContext implements IReferenceMapperContext { */ private final List mergedMethods = new ArrayList(); - /** - * Information about methods in the target class, used to keep track of - * transformations we apply - */ - private final Map targetMethods = new HashMap(); - /** * Injector groups */ @@ -755,17 +748,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * @return new or existing target handle for the supplied method */ public Target getTargetMethod(MethodNode method) { - if (!this.targetClass.getMethods().contains(method)) { - throw new IllegalArgumentException("Invalid target method supplied to getTargetMethod()"); - } - - String targetName = method.name + method.desc; - Target target = this.targetMethods.get(targetName); - if (target == null) { - target = new Target(this.targetClass.getClassNode(), method); - this.targetMethods.put(targetName, target); - } - return target; + return this.targetClass.getTargetMethod(method); } /** 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 c6f35631..2f5c63f8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -699,7 +699,7 @@ public class MixinTransformer extends TreeTransformer { } } - return this.writeClass(transformedName, passThroughClass); + return this.writeClass(transformedName, passThroughClass, false); } /** @@ -717,7 +717,7 @@ public class MixinTransformer extends TreeTransformer { } catch (ValidationFailedException ex) { this.logger.info(ex.getMessage()); // If verify is enabled and failed, write out the bytecode to allow us to inspect it - if (MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_EXPORT)) { + if (context.isExportForced() || MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_EXPORT)) { this.writeClass(context); } } @@ -840,18 +840,18 @@ public class MixinTransformer extends TreeTransformer { } private byte[] writeClass(TargetClassContext context) { - return this.writeClass(context.getClassName(), context.getClassNode()); + return this.writeClass(context.getClassName(), context.getClassNode(), context.isExportForced()); } - private byte[] writeClass(String transformedName, ClassNode targetClass) { + private byte[] writeClass(String transformedName, ClassNode targetClass, boolean forceExport) { // Collapse tree to bytes byte[] bytes = this.writeClass(targetClass); // Export transformed class for debugging purposes MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); - if (environment.getOption(Option.DEBUG_EXPORT)) { + if (forceExport || environment.getOption(Option.DEBUG_EXPORT)) { String filter = environment.getOptionValue(Option.DEBUG_EXPORT_FILTER); - if (filter == null || this.applyFilter(filter, transformedName)) { + if (forceExport || filter == null || this.applyFilter(filter, transformedName)) { File outputFile = this.dumpClass(transformedName.replace('.', '/'), bytes); if (this.decompiler != null) { this.decompiler.decompile(outputFile); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index eb8757d4..48f6f8b9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -24,18 +24,21 @@ */ package org.spongepowered.asm.mixin.transformer; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.Debug; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.util.ASMHelper; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.SortedSet; -import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.mixin.MixinEnvironment; -import org.spongepowered.asm.mixin.MixinEnvironment.Option; -import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; - /** * Struct for containing target class information during mixin application */ @@ -78,6 +81,12 @@ class TargetClassContext { */ private final Map injectorMethodIndices = new HashMap(); + /** + * Information about methods in the target class, used to keep track of + * transformations we apply + */ + private final Map targetMethods = new HashMap(); + /** * Do not remap injector handler methods (debug option) */ @@ -87,6 +96,12 @@ class TargetClassContext { * True once mixins have been applied to this class */ private boolean applied; + + /** + * True if this class is decorated with an {@link Debug} annotation which + * instructs an export + */ + private boolean forceExport; TargetClassContext(String sessionId, String name, ClassNode classNode, SortedSet mixins) { this.sessionId = sessionId; @@ -97,6 +112,14 @@ class TargetClassContext { this.disableHandlerRemap = MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_DISABLE_HANDLER_REMAP); } + public boolean isApplied() { + return this.applied; + } + + public boolean isExportForced() { + return this.forceExport; + } + /** * Get the transformer session ID */ @@ -145,6 +168,26 @@ class TargetClassContext { public SortedSet getMixins() { return this.mixins; } + + /** + * Get a target method handle from the target class + * + * @param method method to get a target handle for + * @return new or existing target handle for the supplied method + */ + public Target getTargetMethod(MethodNode method) { + if (!this.classNode.methods.contains(method)) { + throw new IllegalArgumentException("Invalid target method supplied to getTargetMethod()"); + } + + String targetName = method.name + method.desc; + Target target = this.targetMethods.get(targetName); + if (target == null) { + target = new Target(this.classNode, method); + this.targetMethods.put(targetName, target); + } + return target; + } public String getHandlerName(AnnotationNode annotation, MethodNode method, boolean surrogate) { if (this.disableHandlerRemap) { @@ -180,5 +223,30 @@ class TargetClassContext { } return new MixinApplicator(this); } + + + /** + * Process {@link Debug) annotations on the class after application + */ + public void processDebugTasks() { + if (!MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_VERBOSE)) { + return; + } + + AnnotationNode classDebugAnnotation = ASMHelper.getVisibleAnnotation(this.classNode, Debug.class); + if (classDebugAnnotation != null) { + this.forceExport = Boolean.TRUE.equals(ASMHelper.getAnnotationValue(classDebugAnnotation, "export")); + if (Boolean.TRUE.equals(ASMHelper.getAnnotationValue(classDebugAnnotation, "print"))) { + ASMHelper.textify(this.classNode, System.err); + } + } + + for (MethodNode method : this.classNode.methods) { + AnnotationNode methodDebugAnnotation = ASMHelper.getVisibleAnnotation(method, Debug.class); + if (methodDebugAnnotation != null && Boolean.TRUE.equals(ASMHelper.getAnnotationValue(methodDebugAnnotation, "print"))) { + ASMHelper.textify(method, System.err); + } + } + } } diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 41130e2d..9aca0025 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -27,6 +27,31 @@ package org.spongepowered.asm.util; import static com.google.common.base.Preconditions.*; import static org.spongepowered.asm.lib.ClassWriter.*; +import com.google.common.primitives.Ints; +import org.spongepowered.asm.lib.ClassReader; +import org.spongepowered.asm.lib.ClassWriter; +import org.spongepowered.asm.lib.MethodVisitor; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.FieldInsnNode; +import org.spongepowered.asm.lib.tree.FieldNode; +import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.InsnNode; +import org.spongepowered.asm.lib.tree.IntInsnNode; +import org.spongepowered.asm.lib.tree.JumpInsnNode; +import org.spongepowered.asm.lib.tree.LabelNode; +import org.spongepowered.asm.lib.tree.LdcInsnNode; +import org.spongepowered.asm.lib.tree.LineNumberNode; +import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.lib.util.CheckClassAdapter; +import org.spongepowered.asm.lib.util.TraceClassVisitor; + +import java.io.OutputStream; import java.io.PrintWriter; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -35,15 +60,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.spongepowered.asm.lib.ClassReader; -import org.spongepowered.asm.lib.ClassWriter; -import org.spongepowered.asm.lib.Opcodes; -import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.*; -import org.spongepowered.asm.lib.util.CheckClassAdapter; - -import com.google.common.primitives.Ints; - /** * Utility methods for working with ASM */ @@ -373,6 +389,32 @@ public class ASMHelper { clazz.methods.add(method); } + /** + * Runs textifier on the specified class node and dumps the output to the + * specified output stream + * + * @param classNode class to textify + * @param out output stream + */ + public static void textify(ClassNode classNode, OutputStream out) { + classNode.accept(new TraceClassVisitor(new PrintWriter(out))); + } + + /** + * Runs textifier on the specified method node and dumps the output to the + * specified output stream + * + * @param methodNode method to textify + * @param out output stream + */ + public static void textify(MethodNode methodNode, OutputStream out) { + TraceClassVisitor trace = new TraceClassVisitor(new PrintWriter(out)); + MethodVisitor mv = trace.visitMethod(methodNode.access, methodNode.name, methodNode.desc, methodNode.signature, + methodNode.exceptions.toArray(new String[0])); + methodNode.accept(mv); + trace.visitEnd(); + } + /** * Dumps the output of CheckClassAdapter.verify to System.out * @@ -393,6 +435,19 @@ public class ASMHelper { ClassReader cr = new ClassReader(bytes); CheckClassAdapter.verify(cr, true, new PrintWriter(System.out)); } + + /** + * Prints a representation of a method's instructions to stderr + * + * @param method Method to print + */ + public static void printMethodWithOpcodeIndices(MethodNode method) { + System.err.printf("%s%s\n", method.name, method.desc); + int i = 0; + for (Iterator iter = method.instructions.iterator(); iter.hasNext();) { + System.err.printf("[%4d] %s\n", i++, ASMHelper.getNodeDescriptionForDebug(iter.next())); + } + } /** * Prints a representation of a method's instructions to stderr From b6e7436d3511bde071c6ba2a6bca94f7d9d3e2bd Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 19 May 2016 18:51:09 +0100 Subject: [PATCH 155/169] Fix import order --- .../mixin/transformer/TargetClassContext.java | 10 +++--- .../org/spongepowered/asm/util/ASMHelper.java | 35 ++++++------------- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index 48f6f8b9..57e36828 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -24,6 +24,11 @@ */ package org.spongepowered.asm.mixin.transformer; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedSet; + import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.MethodNode; @@ -34,11 +39,6 @@ import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; import org.spongepowered.asm.util.ASMHelper; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedSet; - /** * Struct for containing target class information during mixin application */ diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 9aca0025..9fece0dc 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -27,30 +27,6 @@ package org.spongepowered.asm.util; import static com.google.common.base.Preconditions.*; import static org.spongepowered.asm.lib.ClassWriter.*; -import com.google.common.primitives.Ints; -import org.spongepowered.asm.lib.ClassReader; -import org.spongepowered.asm.lib.ClassWriter; -import org.spongepowered.asm.lib.MethodVisitor; -import org.spongepowered.asm.lib.Opcodes; -import org.spongepowered.asm.lib.Type; -import org.spongepowered.asm.lib.tree.AbstractInsnNode; -import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.lib.tree.FieldInsnNode; -import org.spongepowered.asm.lib.tree.FieldNode; -import org.spongepowered.asm.lib.tree.InsnList; -import org.spongepowered.asm.lib.tree.InsnNode; -import org.spongepowered.asm.lib.tree.IntInsnNode; -import org.spongepowered.asm.lib.tree.JumpInsnNode; -import org.spongepowered.asm.lib.tree.LabelNode; -import org.spongepowered.asm.lib.tree.LdcInsnNode; -import org.spongepowered.asm.lib.tree.LineNumberNode; -import org.spongepowered.asm.lib.tree.MethodInsnNode; -import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.lib.tree.VarInsnNode; -import org.spongepowered.asm.lib.util.CheckClassAdapter; -import org.spongepowered.asm.lib.util.TraceClassVisitor; - import java.io.OutputStream; import java.io.PrintWriter; import java.lang.annotation.Annotation; @@ -60,6 +36,17 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.spongepowered.asm.lib.ClassReader; +import org.spongepowered.asm.lib.ClassWriter; +import org.spongepowered.asm.lib.MethodVisitor; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.lib.util.CheckClassAdapter; +import org.spongepowered.asm.lib.util.TraceClassVisitor; + +import com.google.common.primitives.Ints; + /** * Utility methods for working with ASM */ From 36b439257695682582158cf3ac52ebd19f6c7ddb Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 20 May 2016 03:24:10 +0100 Subject: [PATCH 156/169] Revise staticness sanity check for ModifyArg injector --- .../asm/mixin/injection/invoke/InvokeInjector.java | 10 +++++++++- .../asm/mixin/injection/invoke/ModifyArgInjector.java | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index 23d5d651..299c3b5a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -63,7 +63,15 @@ public abstract class InvokeInjector extends Injector { @Override protected void sanityCheck(Target target, List injectionPoints) { super.sanityCheck(target, injectionPoints); - + this.checkTarget(target); + } + + /** + * Sanity checks on target + * + * @param target target + */ + protected void checkTarget(Target target) { if (target.isStatic != this.isStatic) { throw new InvalidInjectionException(this.info, "'static' modifier of callback method does not match target in " + this); } 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 419b9b72..6bff31d0 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 @@ -83,6 +83,17 @@ public class ModifyArgInjector extends InvokeInjector { } } + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.injection.invoke.InvokeInjector + * #checkTarget(org.spongepowered.asm.mixin.injection.struct.Target) + */ + @Override + protected void checkTarget(Target target) { + if (!this.isStatic && target.isStatic) { + throw new InvalidInjectionException(this.info, "non-static callback method " + this + " targets a static method which is not supported"); + } + } + /** * Do the injection */ From ad64bc1d6d3386974bc35af64b73b1745ee24d81 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 24 May 2016 17:17:58 +0100 Subject: [PATCH 157/169] Deprecate/merge stuff to prepare for 0.6, version bump to 0.5.6 --- gradle.properties | 2 +- .../spongepowered/tools/agent/MixinAgent.java | 2 +- .../AnnotatedMixinElementHandler.java | 4 +- .../tools/obfuscation/ObfuscationManager.java | 2 +- .../TargetObfuscationEnvironment.java | 2 +- .../interfaces/IObfuscationManager.java | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/launch/MixinLaunchAgentDefault.java | 3 + .../asm/launch/MixinTweaker.java | 5 +- .../org/spongepowered/asm/mixin/Final.java | 2 +- .../asm/mixin/MixinEnvironment.java | 67 +- .../org/spongepowered/asm/mixin/Mixins.java | 119 +++ .../org/spongepowered/asm/mixin/Shadow.java | 2 +- .../extensibility/IMixinErrorHandler.java | 5 +- .../asm/mixin/extensibility/IMixinInfo.java | 7 - .../asm/mixin/injection/Inject.java | 2 + .../asm/mixin/injection/InjectionPoint.java | 1 + .../mixin/injection/InjectorGroupInfo.java | 1 + .../asm/mixin/injection/ModifyArg.java | 2 + .../asm/mixin/injection/ModifyConstant.java | 2 + .../asm/mixin/injection/ModifyVariable.java | 2 + .../asm/mixin/injection/Redirect.java | 2 + .../injection/callback/CallbackInjector.java | 4 +- .../asm/mixin/injection/code/Injector.java | 2 +- .../injection/invoke/InvokeInjector.java | 2 +- .../injection/invoke/ModifyArgInjector.java | 2 +- .../invoke/ModifyConstantInjector.java | 2 +- .../injection/invoke/RedirectInjector.java | 2 +- ...InvalidImplicitDiscriminatorException.java | 2 +- .../modify/ModifyVariableInjector.java | 2 +- .../mixin/injection/struct/InjectionInfo.java | 6 +- .../injection/struct/InjectionPointData.java | 2 +- .../InvalidMemberDescriptorException.java | 2 +- .../mixin/injection/struct/MemberInfo.java | 5 +- .../struct/ModifyConstantInjectionInfo.java | 2 +- .../{ => throwables}/InjectionError.java | 2 +- .../InjectionValidationException.java | 4 +- .../InvalidInjectionException.java | 20 +- .../InvalidInjectionPointException.java | 14 +- .../IReferenceMapperContext.java | 9 +- .../struct => refmap}/ReferenceMapper.java | 2 +- .../ClassAlreadyLoadedException.java | 5 +- .../{ => throwables}/MixinApplyError.java | 2 +- .../{ => throwables}/MixinException.java | 2 +- .../{ => throwables}/MixinPrepareError.java | 2 +- .../asm/mixin/transformer/ClassInfo.java | 1 + .../asm/mixin/transformer/Config.java | 117 +++ .../asm/mixin/transformer/InterfaceInfo.java | 1 + .../asm/mixin/transformer/MemberRef.java | 1 + ...tor.java => MixinApplicatorInterface.java} | 7 +- ...ator.java => MixinApplicatorStandard.java} | 29 +- .../asm/mixin/transformer/MixinClassNode.java | 49 -- .../asm/mixin/transformer/MixinConfig.java | 151 +++- .../asm/mixin/transformer/MixinInfo.java | 716 +++++++++++------- ...r.java => MixinPreProcessorInterface.java} | 9 +- ...or.java => MixinPreProcessorStandard.java} | 39 +- .../mixin/transformer/MixinTargetContext.java | 19 +- .../mixin/transformer/MixinTransformer.java | 81 +- .../MixinTransformerModuleCheckClass.java | 2 +- .../mixin/transformer/TargetClassContext.java | 8 +- .../mixin/transformer/meta/MixinMerged.java | 6 +- .../InvalidInterfaceMixinException.java | 27 +- .../InvalidMixinException.java | 34 +- .../MixinReloadException.java | 15 +- .../MixinTransformerError.java | 2 +- .../{ => verify}/MixinVerifier.java | 3 +- .../{mixin => obfuscation}/RemapperChain.java | 2 +- .../asm/obfuscation/SrgContainer.java | 2 +- .../asm/util/ConstraintParser.java | 2 + .../org/spongepowered/asm/util/Locals.java | 3 +- .../ConstraintViolationException.java | 2 +- .../InvalidConstraintException.java | 2 +- .../LVTGeneratorException.java | 4 +- 73 files changed, 1090 insertions(+), 579 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/Mixins.java rename src/main/java/org/spongepowered/asm/mixin/injection/{ => throwables}/InjectionError.java (96%) rename src/main/java/org/spongepowered/asm/mixin/injection/{ => throwables}/InjectionValidationException.java (93%) rename src/main/java/org/spongepowered/asm/mixin/injection/{ => throwables}/InvalidInjectionException.java (77%) rename src/main/java/org/spongepowered/asm/mixin/injection/{ => throwables}/InvalidInjectionPointException.java (77%) rename src/main/java/org/spongepowered/asm/mixin/{transformer => refmap}/IReferenceMapperContext.java (89%) rename src/main/java/org/spongepowered/asm/mixin/{injection/struct => refmap}/ReferenceMapper.java (99%) rename src/main/java/org/spongepowered/asm/mixin/{audit => throwables}/ClassAlreadyLoadedException.java (94%) rename src/main/java/org/spongepowered/asm/mixin/{ => throwables}/MixinApplyError.java (97%) rename src/main/java/org/spongepowered/asm/mixin/{ => throwables}/MixinException.java (97%) rename src/main/java/org/spongepowered/asm/mixin/{ => throwables}/MixinPrepareError.java (97%) create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/Config.java rename src/main/java/org/spongepowered/asm/mixin/transformer/{InterfaceMixinApplicator.java => MixinApplicatorInterface.java} (93%) rename src/main/java/org/spongepowered/asm/mixin/transformer/{MixinApplicator.java => MixinApplicatorStandard.java} (96%) delete mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassNode.java rename src/main/java/org/spongepowered/asm/mixin/transformer/{InterfaceMixinPreProcessor.java => MixinPreProcessorInterface.java} (89%) rename src/main/java/org/spongepowered/asm/mixin/transformer/{MixinPreProcessor.java => MixinPreProcessorStandard.java} (91%) rename src/main/java/org/spongepowered/asm/mixin/transformer/{ => throwables}/InvalidInterfaceMixinException.java (62%) rename src/main/java/org/spongepowered/asm/mixin/transformer/{ => throwables}/InvalidMixinException.java (62%) rename src/main/java/org/spongepowered/asm/mixin/transformer/{ => throwables}/MixinReloadException.java (79%) rename src/main/java/org/spongepowered/asm/mixin/transformer/{ => throwables}/MixinTransformerError.java (96%) rename src/main/java/org/spongepowered/asm/mixin/transformer/{ => verify}/MixinVerifier.java (97%) rename src/main/java/org/spongepowered/asm/{mixin => obfuscation}/RemapperChain.java (98%) rename src/main/java/org/spongepowered/asm/util/{ => throwables}/ConstraintViolationException.java (98%) rename src/main/java/org/spongepowered/asm/util/{ => throwables}/InvalidConstraintException.java (97%) rename src/main/java/org/spongepowered/asm/util/{ => throwables}/LVTGeneratorException.java (93%) diff --git a/gradle.properties b/gradle.properties index e2f84d7f..030b3362 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.5 +buildVersion=0.5.6 buildType=SNAPSHOT diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 4bbb8434..04bc68e6 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -34,9 +34,9 @@ import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.spongepowered.asm.mixin.transformer.MixinReloadException; import org.spongepowered.asm.mixin.transformer.MixinTransformer; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; +import org.spongepowered.asm.mixin.transformer.throwables.MixinReloadException; import net.minecraft.launchwrapper.Launch; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java index 35067eb7..41ed260e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -38,8 +38,8 @@ import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.ConstraintParser; import org.spongepowered.asm.util.ConstraintParser.Constraint; -import org.spongepowered.asm.util.ConstraintViolationException; -import org.spongepowered.asm.util.InvalidConstraintException; +import org.spongepowered.asm.util.throwables.ConstraintViolationException; +import org.spongepowered.asm.util.throwables.InvalidConstraintException; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index c926fdb9..f4a071e4 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -36,7 +36,7 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.mixin.refmap.ReferenceMapper; import org.spongepowered.asm.obfuscation.SrgField; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.Constants; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 56a17919..1ec418d2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -42,7 +42,7 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.mixin.refmap.ReferenceMapper; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.obfuscation.SrgContainer; import org.spongepowered.asm.obfuscation.SrgField; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java index 22441445..846233b2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java @@ -25,7 +25,7 @@ package org.spongepowered.tools.obfuscation.interfaces; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.mixin.refmap.ReferenceMapper; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.obfuscation.ObfuscationData; import org.spongepowered.tools.obfuscation.TypeHandle; diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index c7ccddea..67b8c7c7 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.5"; + public static final String VERSION = "0.5.6"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java index 6b542fa5..87da8172 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java @@ -42,10 +42,13 @@ public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { super(uri); } + @SuppressWarnings("deprecation") @Override public void prepare() { String compatibilityLevel = this.attributes.get(MixinLaunchAgentDefault.MFATT_COMPATIBILITY); if (compatibilityLevel != null) { + MixinLaunchAgentAbstract.logger.warn("{} Setting mixin compatibility level via manifest is deprecated, " + + "use 'compatibilityLevel' key in config instead", this.container); MixinTweaker.setCompatibilityLevel(compatibilityLevel); } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index dce86e5c..1de3731c 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -37,6 +37,7 @@ import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import org.spongepowered.asm.mixin.Mixins; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; @@ -213,6 +214,7 @@ public class MixinTweaker implements ITweaker { * * @param level compatibility level as a string */ + @Deprecated static void setCompatibilityLevel(String level) { try { CompatibilityLevel value = CompatibilityLevel.valueOf(level.toUpperCase()); @@ -234,13 +236,14 @@ public class MixinTweaker implements ITweaker { static void addConfig(String config) { if (config.endsWith(".json")) { MixinTweaker.logger.debug("Registering mixin config: {}", config); - MixinEnvironment.getDefaultEnvironment().addConfiguration(config); + Mixins.addConfiguration(config); } else if (config.contains(".json@")) { int pos = config.indexOf(".json@"); String phaseName = config.substring(pos + 6); config = config.substring(0, pos + 5); Phase phase = Phase.forName(phaseName); if (phase != null) { + MixinTweaker.logger.warn("Setting config phase via manifest is deprecated: {}. Specify target in config instead", config); MixinTweaker.logger.debug("Registering mixin config: {}", config); MixinEnvironment.getEnvironment(phase).addConfiguration(config); } diff --git a/src/main/java/org/spongepowered/asm/mixin/Final.java b/src/main/java/org/spongepowered/asm/mixin/Final.java index 1b78a4de..73834c13 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Final.java +++ b/src/main/java/org/spongepowered/asm/mixin/Final.java @@ -31,7 +31,7 @@ import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.transformer.InvalidMixinException; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; /** * This annotation has two uses: diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index caf310c0..99ea0dcb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -51,7 +50,9 @@ import org.spongepowered.asm.launch.MixinBootstrap; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.mixin.extensibility.IEnvironmentTokenProvider; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.throwables.MixinException; import org.spongepowered.asm.mixin.transformer.MixinTransformer; +import org.spongepowered.asm.obfuscation.RemapperChain; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.asm.util.JavaVersion; import org.spongepowered.asm.util.PrettyPrinter; @@ -69,7 +70,7 @@ import net.minecraft.launchwrapper.LaunchClassLoader; * The mixin environment manages global state information for the mixin * subsystem. */ -public class MixinEnvironment implements ITokenProvider { +public final class MixinEnvironment implements ITokenProvider { /** * Environment phase, deliberately not implemented as an enum @@ -440,9 +441,9 @@ public class MixinEnvironment implements ITokenProvider { */ public static enum CompatibilityLevel { - JAVA_6(Opcodes.V1_6, false), + JAVA_6(6, Opcodes.V1_6, false), - JAVA_7(Opcodes.V1_7, false) { + JAVA_7(7, Opcodes.V1_7, false) { @Override boolean isSupported() { @@ -451,7 +452,7 @@ public class MixinEnvironment implements ITokenProvider { }, - JAVA_8(Opcodes.V1_8, true) { + JAVA_8(8, Opcodes.V1_8, true) { @Override boolean isSupported() { @@ -460,15 +461,25 @@ public class MixinEnvironment implements ITokenProvider { }; + private final int ver; + private final int classVersion; private final boolean supportsMethodsInInterfaces; - private CompatibilityLevel(int classVersion, boolean resolveMethodsInInterfaces) { + private CompatibilityLevel maxCompatibleLevel; + + private CompatibilityLevel(int ver, int classVersion, boolean resolveMethodsInInterfaces) { + this.ver = ver; this.classVersion = classVersion; this.supportsMethodsInInterfaces = resolveMethodsInInterfaces; } + @SuppressWarnings("unused") + private void setMaxCompatibleLevel(CompatibilityLevel maxCompatibleLevel) { + this.maxCompatibleLevel = maxCompatibleLevel; + } + boolean isSupported() { return true; } @@ -482,7 +493,22 @@ public class MixinEnvironment implements ITokenProvider { } public boolean isAtLeast(CompatibilityLevel level) { - return this.ordinal() >= level.ordinal(); + return this.ver >= level.ver; + } + + public boolean canElevateTo(CompatibilityLevel level) { + if (level == null || this.maxCompatibleLevel == null) { + return true; + } + return level.ver <= this.maxCompatibleLevel.ver; + } + + public boolean canSupport(CompatibilityLevel level) { + if (level == null) { + return true; + } + + return level.canElevateTo(this); } } @@ -640,10 +666,7 @@ public class MixinEnvironment implements ITokenProvider { */ private final boolean[] options; - /** - * Error handlers for environment - */ - private final Set errorHandlers = new LinkedHashSet(); +// private final Map configs; /** * List of token provider classes @@ -758,7 +781,9 @@ public class MixinEnvironment implements ITokenProvider { * Get mixin configurations from the blackboard * * @return list of registered mixin configs + * @deprecated no replacement */ + @Deprecated public List getMixinConfigs() { List mixinConfigs = Blackboard.>get(this.configsKey); if (mixinConfigs == null) { @@ -773,23 +798,31 @@ public class MixinEnvironment implements ITokenProvider { * * @param config Name of configuration resource to add * @return fluent interface + * @deprecated use Mixins::addConfiguration instead */ + @Deprecated public MixinEnvironment addConfiguration(String config) { + Mixins.addConfiguration(config, this); + return this; + } + + void registerConfig(String config) { List configs = this.getMixinConfigs(); if (!configs.contains(config)) { configs.add(config); } - return this; } - + /** * Add a new error handler class to this environment * * @param handlerName Handler class to add * @return fluent interface + * @deprecated use Mixins::registerErrorHandlerClass */ + @Deprecated public MixinEnvironment registerErrorHandlerClass(String handlerName) { - this.errorHandlers.add(handlerName); + Mixins.registerErrorHandlerClass(handlerName); return this; } @@ -858,9 +891,11 @@ public class MixinEnvironment implements ITokenProvider { * Get all registered error handlers for this environment * * @return set of error handler class names + * @deprecated use Mixins::getErrorHandlerClasses */ + @Deprecated public Set getErrorHandlerClasses() { - return Collections.unmodifiableSet(this.errorHandlers); + return Mixins.getErrorHandlerClasses(); } /** @@ -1160,7 +1195,9 @@ public class MixinEnvironment implements ITokenProvider { * * @param level Level to set, ignored if less than the current level * @throws IllegalArgumentException if the specified level is not supported + * @deprecated set compatibility level in configuration */ + @Deprecated public static void setCompatibilityLevel(CompatibilityLevel level) throws IllegalArgumentException { if (level != MixinEnvironment.compatibility && level.isAtLeast(MixinEnvironment.compatibility)) { if (!level.isSupported()) { diff --git a/src/main/java/org/spongepowered/asm/mixin/Mixins.java b/src/main/java/org/spongepowered/asm/mixin/Mixins.java new file mode 100644 index 00000000..ccedec09 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/Mixins.java @@ -0,0 +1,119 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.launch.Blackboard; +import org.spongepowered.asm.mixin.transformer.Config; + +import net.minecraft.launchwrapper.Launch; + +/** + * Entry point for registering global mixin resources. Compatibility with + * pre-0.6 versions is maintained via the methods on {@link MixinEnvironment} + * delegating to the methods here. + */ +public class Mixins { + + /** + * Logger + */ + private static final Logger logger = LogManager.getLogger("mixin"); + + /** + * Blackboard key storing mixin configs which are pending + */ + private static final String CONFIGS_KEY = Blackboard.Keys.CONFIGS + ".queue"; + + /** + * Error handlers for environment + */ + private static final Set errorHandlers = new LinkedHashSet(); + + /** + * Add a mixin configuration resource + * + * @param configFile path to configuration resource + */ + public static void addConfiguration(String configFile) { + Mixins.addConfiguration(configFile, MixinEnvironment.getDefaultEnvironment()); + } + + @Deprecated + static void addConfiguration(String configFile, MixinEnvironment fallback) { + Config config = null; + + try { + config = Config.create(configFile, fallback); + } catch (Exception ex) { + Mixins.logger.error("Error encountered reading mixin config " + configFile + ": " + ex.getClass().getName() + " " + ex.getMessage(), ex); + } + + if (config != null) { + MixinEnvironment env = config.getEnvironment(); + if (env != null) { + env.registerConfig(configFile); + } + Mixins.getConfigs().add(config); + } + } + + /** + * Get current pending configs set, only configs which have yet to be + * consumed are present in this set + */ + public static Set getConfigs() { + Set mixinConfigs = Blackboard.>get(Mixins.CONFIGS_KEY); + if (mixinConfigs == null) { + mixinConfigs = new LinkedHashSet(); + Launch.blackboard.put(Mixins.CONFIGS_KEY, mixinConfigs); + } + return mixinConfigs; + } + + /** + * Register a gloabl error handler class + * + * @param handlerName Fully qualified class name + */ + public static void registerErrorHandlerClass(String handlerName) { + if (handlerName != null) { + Mixins.errorHandlers.add(handlerName); + } + } + + /** + * Get current error handlers + */ + public static Set getErrorHandlerClasses() { + return Collections.unmodifiableSet(Mixins.errorHandlers); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/Shadow.java b/src/main/java/org/spongepowered/asm/mixin/Shadow.java index d43eac06..79aadd1f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Shadow.java +++ b/src/main/java/org/spongepowered/asm/mixin/Shadow.java @@ -29,7 +29,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.spongepowered.asm.mixin.transformer.InvalidMixinException; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; /** * Used to indicate a Mixin class member which is acting as a placeholder for a diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java index fff9bc6c..551b7a7b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinErrorHandler.java @@ -51,8 +51,9 @@ public interface IMixinErrorHandler { WARN(Level.WARN), /** - * Throw a {@link org.spongepowered.asm.mixin.MixinApplyError} to halt - * further processing if possible + * Throw a + * {@link org.spongepowered.asm.mixin.throwables.MixinApplyError} to + * halt further processing if possible */ ERROR(Level.FATAL); diff --git a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java index 58005a42..a5612820 100644 --- a/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/extensibility/IMixinInfo.java @@ -106,11 +106,4 @@ public interface IMixinInfo { */ public abstract Phase getPhase(); - /** - * Get whether this is an interface mixin or not - * - * @return true if this is an interface mixin - */ - public abstract boolean isInterfaceMixin(); - } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java index fcbfdfeb..89d682fc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java @@ -32,6 +32,8 @@ import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; /** * Specifies that this mixin method should inject a callback (or diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java index a37dc776..8bec0619 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectionPoint.java @@ -49,6 +49,7 @@ import org.spongepowered.asm.mixin.injection.points.BeforeStringInvoke; import org.spongepowered.asm.mixin.injection.points.JumpInsnPoint; import org.spongepowered.asm.mixin.injection.points.MethodHead; import org.spongepowered.asm.mixin.injection.struct.InjectionPointData; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java index a9fdf162..e0442e2c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/InjectorGroupInfo.java @@ -34,6 +34,7 @@ import org.apache.logging.log4j.LogManager; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.throwables.InjectionValidationException; import org.spongepowered.asm.util.ASMHelper; /** diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java index d034db09..3f89f27d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java @@ -30,6 +30,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; /** * Specifies that this mixin method should inject an argument modifier to itself diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java index bfa1a6d5..abec6df6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java @@ -30,6 +30,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; /** * Specifies that this mixin method should inject a constant modifier callback diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java index 6dfbafa0..1579b03c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java @@ -30,6 +30,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; /** * Specifies that this mixin method should inject a variable modifier callback diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java index 5bd3b6c6..0003b286 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java @@ -30,6 +30,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; /** *

Specifies that this mixin method should redirect the specified 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 7dc861c0..84b22bb7 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 @@ -31,15 +31,15 @@ import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.*; import org.spongepowered.asm.mixin.injection.Coerce; -import org.spongepowered.asm.mixin.injection.InjectionError; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.Surrogate; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.points.BeforeReturn; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; import org.spongepowered.asm.util.Locals; 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 1bc1c694..600faa08 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 @@ -42,9 +42,9 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.util.ASMHelper; import com.google.common.base.Joiner; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index 299c3b5a..c53355f7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -34,10 +34,10 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; /** * Base class for injectors which inject at method invokes 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 6bff31d0..cb093bae 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 @@ -31,11 +31,11 @@ import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; /** * A bytecode injector which allows a single argument of a chosen method call to 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 84d487df..dca2f087 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 @@ -30,9 +30,9 @@ import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.util.ASMHelper; /** diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java index 4882d234..49bab166 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/RedirectInjector.java @@ -36,11 +36,11 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.util.ASMHelper; import com.google.common.base.Joiner; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java index 8a0a7ac4..4848eaaf 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/InvalidImplicitDiscriminatorException.java @@ -24,7 +24,7 @@ */ package org.spongepowered.asm.mixin.injection.modify; -import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.throwables.MixinException; /** * Thrown when an implicit discriminator (no args) fails to identify 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 c0f70853..d6a078a5 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 @@ -35,11 +35,11 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.lib.tree.VarInsnNode; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.PrettyPrinter; 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 83d9f3a7..9bb21819 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 @@ -41,19 +41,19 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.InjectionError; import org.spongepowered.asm.mixin.injection.InjectionNodes.InjectionNode; import org.spongepowered.asm.mixin.injection.InjectionPoint; import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.code.Injector; -import org.spongepowered.asm.mixin.transformer.InvalidMixinException; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.ASMHelper; /** diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java index 9d1e5078..8566b356 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionPointData.java @@ -31,7 +31,7 @@ import java.util.Map; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.InvalidInjectionPointException; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionPointException; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; /** diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java index 899eecb0..15be6346 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InvalidMemberDescriptorException.java @@ -24,7 +24,7 @@ */ package org.spongepowered.asm.mixin.injection.struct; -import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.throwables.MixinException; /** * Thrown when a {@link MemberInfo} fails basic syntax validation diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 4a2ce096..956f47fc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -28,8 +28,9 @@ import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; -import org.spongepowered.asm.mixin.MixinException; -import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; +import org.spongepowered.asm.mixin.refmap.IReferenceMapperContext; +import org.spongepowered.asm.mixin.refmap.ReferenceMapper; +import org.spongepowered.asm.mixin.throwables.MixinException; import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.SignaturePrinter; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java index 2000c39f..36e52a5d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/ModifyConstantInjectionInfo.java @@ -38,9 +38,9 @@ import org.spongepowered.asm.lib.tree.InsnList; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.InjectionPoint; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.code.Injector; import org.spongepowered.asm.mixin.injection.invoke.ModifyConstantInjector; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionError.java b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InjectionError.java similarity index 96% rename from src/main/java/org/spongepowered/asm/mixin/injection/InjectionError.java rename to src/main/java/org/spongepowered/asm/mixin/injection/throwables/InjectionError.java index 4c1ea1db..518cf649 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionError.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InjectionError.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.injection; +package org.spongepowered.asm.mixin.injection.throwables; /** * Error to throw for critical injection problems diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InjectionValidationException.java similarity index 93% rename from src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java rename to src/main/java/org/spongepowered/asm/mixin/injection/throwables/InjectionValidationException.java index 8efcbd2e..e9b9c9dd 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InjectionValidationException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InjectionValidationException.java @@ -22,7 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.injection; +package org.spongepowered.asm.mixin.injection.throwables; + +import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; /** * Thrown when an injector group fails an injection check diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InvalidInjectionException.java similarity index 77% rename from src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java rename to src/main/java/org/spongepowered/asm/mixin/injection/throwables/InvalidInjectionException.java index bd0517ca..630a1f4c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InvalidInjectionException.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.injection; +package org.spongepowered.asm.mixin.injection.throwables; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; -import org.spongepowered.asm.mixin.transformer.InvalidMixinException; -import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +import org.spongepowered.asm.mixin.refmap.IReferenceMapperContext; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; /** * Thrown when an injector fails a state check, for example if an injector @@ -34,12 +34,12 @@ import org.spongepowered.asm.mixin.transformer.MixinTargetContext; */ public class InvalidInjectionException extends InvalidMixinException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2L; private final InjectionInfo info; - public InvalidInjectionException(MixinTargetContext mixin, String message) { - super(mixin, message); + public InvalidInjectionException(IReferenceMapperContext context, String message) { + super(context, message); this.info = null; } @@ -48,8 +48,8 @@ public class InvalidInjectionException extends InvalidMixinException { this.info = info; } - public InvalidInjectionException(MixinTargetContext mixin, Throwable cause) { - super(mixin, cause); + public InvalidInjectionException(IReferenceMapperContext context, Throwable cause) { + super(context, cause); this.info = null; } @@ -58,8 +58,8 @@ public class InvalidInjectionException extends InvalidMixinException { this.info = info; } - public InvalidInjectionException(MixinTargetContext mixin, String message, Throwable cause) { - super(mixin, message, cause); + public InvalidInjectionException(IReferenceMapperContext context, String message, Throwable cause) { + super(context, message, cause); this.info = null; } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionPointException.java b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InvalidInjectionPointException.java similarity index 77% rename from src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionPointException.java rename to src/main/java/org/spongepowered/asm/mixin/injection/throwables/InvalidInjectionPointException.java index 23a0b59d..e27ce55f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/InvalidInjectionPointException.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/throwables/InvalidInjectionPointException.java @@ -22,28 +22,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.injection; +package org.spongepowered.asm.mixin.injection.throwables; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; -import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +import org.spongepowered.asm.mixin.refmap.IReferenceMapperContext; /** * Thrown when an injection point cannot be parsed due to invalid data */ public class InvalidInjectionPointException extends InvalidInjectionException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2L; - public InvalidInjectionPointException(MixinTargetContext mixin, String format, Object... args) { - super(mixin, String.format(format, args)); + public InvalidInjectionPointException(IReferenceMapperContext context, String format, Object... args) { + super(context, String.format(format, args)); } public InvalidInjectionPointException(InjectionInfo info, String format, Object... args) { super(info, String.format(format, args)); } - public InvalidInjectionPointException(MixinTargetContext mixin, Throwable cause, String format, Object... args) { - super(mixin, String.format(format, args), cause); + public InvalidInjectionPointException(IReferenceMapperContext context, Throwable cause, String format, Object... args) { + super(context, String.format(format, args), cause); } public InvalidInjectionPointException(InjectionInfo info, Throwable cause, String format, Object... args) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/IReferenceMapperContext.java b/src/main/java/org/spongepowered/asm/mixin/refmap/IReferenceMapperContext.java similarity index 89% rename from src/main/java/org/spongepowered/asm/mixin/transformer/IReferenceMapperContext.java rename to src/main/java/org/spongepowered/asm/mixin/refmap/IReferenceMapperContext.java index 0e54d166..c1656897 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/IReferenceMapperContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/refmap/IReferenceMapperContext.java @@ -22,14 +22,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.transformer; +package org.spongepowered.asm.mixin.refmap; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; /** * Context for performing reference mapping */ public interface IReferenceMapperContext { + + /** + * Get the mixin info + */ + public abstract IMixinInfo getMixin(); /** * Get the internal mixin class name diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java b/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java similarity index 99% rename from src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java rename to src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java index 65b1485b..81199606 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/ReferenceMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.injection.struct; +package org.spongepowered.asm.mixin.refmap; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/main/java/org/spongepowered/asm/mixin/audit/ClassAlreadyLoadedException.java b/src/main/java/org/spongepowered/asm/mixin/throwables/ClassAlreadyLoadedException.java similarity index 94% rename from src/main/java/org/spongepowered/asm/mixin/audit/ClassAlreadyLoadedException.java rename to src/main/java/org/spongepowered/asm/mixin/throwables/ClassAlreadyLoadedException.java index bc0c2b58..375c8185 100644 --- a/src/main/java/org/spongepowered/asm/mixin/audit/ClassAlreadyLoadedException.java +++ b/src/main/java/org/spongepowered/asm/mixin/throwables/ClassAlreadyLoadedException.java @@ -25,10 +25,7 @@ /** * */ -package org.spongepowered.asm.mixin.audit; - -import org.spongepowered.asm.mixin.MixinException; - +package org.spongepowered.asm.mixin.throwables; /** * Exception raised when a class was loaded before mixins were able to be diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinApplyError.java b/src/main/java/org/spongepowered/asm/mixin/throwables/MixinApplyError.java similarity index 97% rename from src/main/java/org/spongepowered/asm/mixin/MixinApplyError.java rename to src/main/java/org/spongepowered/asm/mixin/throwables/MixinApplyError.java index 551700a5..a3fa7bfc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinApplyError.java +++ b/src/main/java/org/spongepowered/asm/mixin/throwables/MixinApplyError.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin; +package org.spongepowered.asm.mixin.throwables; /** * Error to throw for required mixins when mixing of the mixin fails diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinException.java b/src/main/java/org/spongepowered/asm/mixin/throwables/MixinException.java similarity index 97% rename from src/main/java/org/spongepowered/asm/mixin/MixinException.java rename to src/main/java/org/spongepowered/asm/mixin/throwables/MixinException.java index 059723c0..145f5452 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinException.java +++ b/src/main/java/org/spongepowered/asm/mixin/throwables/MixinException.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin; +package org.spongepowered.asm.mixin.throwables; /** * Base class for all mixin processor exceptions diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java b/src/main/java/org/spongepowered/asm/mixin/throwables/MixinPrepareError.java similarity index 97% rename from src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java rename to src/main/java/org/spongepowered/asm/mixin/throwables/MixinPrepareError.java index bcc7e3db..f5e64c05 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinPrepareError.java +++ b/src/main/java/org/spongepowered/asm/mixin/throwables/MixinPrepareError.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin; +package org.spongepowered.asm.mixin.throwables; /** * Error to throw for required configs when initialising of the config fails diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 98ce2cd9..500676f1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -47,6 +47,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.transformer.ClassInfo.Member.Type; +import org.spongepowered.asm.mixin.transformer.MixinInfo.MixinClassNode; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/Config.java b/src/main/java/org/spongepowered/asm/mixin/transformer/Config.java new file mode 100644 index 00000000..0f173282 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/Config.java @@ -0,0 +1,117 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer; + +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.extensibility.IMixinConfig; + +/** + * Handle for marshalling mixin configs outside of the transformer package + */ +public class Config { + + /** + * Config name, used as identity for the purposes of {@link #equals} + */ + private final String name; + + /** + * Config + */ + private final MixinConfig config; + + public Config(MixinConfig config) { + this.name = config.getName(); + this.config = config; + } + + /** + * Access inner config + */ + MixinConfig get() { + return this.config; + } + + /** + * Get API-level config view + */ + public IMixinConfig getConfig() { + return this.config; + } + + /** + * Get environment for the config + */ + public MixinEnvironment getEnvironment() { + return this.config.getEnvironment(); + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return this.config.toString(); + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + return obj instanceof Config && this.name.equals(((Config)obj).name); + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + return this.name.hashCode(); + } + + /** + * Factory method, create a config from the specified config file and fail + * over to the specified environment if no selector is present in the config + * + * @param configFile config resource + * @param outer failover environment + * @return new config or null if invalid config version + */ + @Deprecated + public static Config create(String configFile, MixinEnvironment outer) { + return MixinConfig.create(configFile, outer); + } + + /** + * Factory method, create a config from the specified config resource + * + * @param configFile config resource + * @return new config or null if invalid config version + */ + public static Config create(String configFile) { + return MixinConfig.create(configFile, MixinEnvironment.getDefaultEnvironment()); + } +} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java index 0da51a79..ce7360e8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java @@ -33,6 +33,7 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.ASMHelper; /** diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java index fc0bf2d5..dc438dde 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MemberRef.java @@ -27,6 +27,7 @@ package org.spongepowered.asm.mixin.transformer; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.mixin.transformer.throwables.MixinTransformerError; import org.spongepowered.asm.util.ASMHelper; /** diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorInterface.java similarity index 93% rename from src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorInterface.java index 087fbf0c..3f422627 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorInterface.java @@ -28,22 +28,23 @@ import java.util.Map.Entry; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.mixin.injection.InvalidInjectionException; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidInterfaceMixinException; /** * Applicator for interface mixins, mainly just disables things which aren't * supported for interface mixins */ -public class InterfaceMixinApplicator extends MixinApplicator { +public class MixinApplicatorInterface extends MixinApplicatorStandard { /** * ctor * * @param context applier context */ - InterfaceMixinApplicator(TargetClassContext context) { + MixinApplicatorInterface(TargetClassContext context) { super(context); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java similarity index 96% rename from src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java index 0eb44d32..267670c7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -55,17 +55,18 @@ import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; import org.spongepowered.asm.util.ConstraintParser; import org.spongepowered.asm.util.ConstraintParser.Constraint; -import org.spongepowered.asm.util.ConstraintViolationException; -import org.spongepowered.asm.util.InvalidConstraintException; +import org.spongepowered.asm.util.throwables.ConstraintViolationException; +import org.spongepowered.asm.util.throwables.InvalidConstraintException; /** * Applies mixins to a target class */ -public class MixinApplicator { +public class MixinApplicatorStandard { /** * Passes the mixin applicator applies to each mixin @@ -193,7 +194,7 @@ public class MixinApplicator { */ protected final ClassNode targetClass; - MixinApplicator(TargetClassContext context) { + MixinApplicatorStandard(TargetClassContext context) { this.context = context; this.targetName = context.getClassName(); this.targetClass = context.getClassNode(); @@ -323,7 +324,7 @@ public class MixinApplicator { this.mergeAnnotations(shadow, target); // Strip the FINAL flag from @Mutable non-private fields - if (entry.getValue().isDecoratedMutable() && !MixinApplicator.hasFlag(target, Opcodes.ACC_PRIVATE)) { + if (entry.getValue().isDecoratedMutable() && !MixinApplicatorStandard.hasFlag(target, Opcodes.ACC_PRIVATE)) { target.access &= ~Opcodes.ACC_FINAL; } } @@ -364,9 +365,9 @@ public class MixinApplicator { this.checkConstraints(mixin, overwrite); } - if (MixinApplicator.hasFlag(mixinMethod, Opcodes.ACC_STATIC) - && !MixinApplicator.hasFlag(mixinMethod, Opcodes.ACC_PRIVATE) - && !MixinApplicator.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) + if (MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_STATIC) + && !MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_PRIVATE) + && !MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) && !isOverwrite) { throw new InvalidMixinException(mixin, String.format("Mixin %s contains non-private static method %s%s", mixin, mixinMethod.name, mixinMethod.desc)); @@ -440,8 +441,8 @@ public class MixinApplicator { throw new ClassFormatError("Invalid @MixinMerged annotation found in" + mixin + " at " + method.name + " in " + this.targetClass.name); } - if (MixinApplicator.hasFlag(target, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE) - && MixinApplicator.hasFlag(method, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE)) { + if (MixinApplicatorStandard.hasFlag(target, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE) + && MixinApplicatorStandard.hasFlag(method, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE)) { if (mixin.getEnvironment().getOption(Option.DEBUG_VERBOSE)) { this.logger.warn("Synthetic bridge method clash for {} in {}", method.name, mixin); } @@ -486,7 +487,7 @@ public class MixinApplicator { } String methodName = method.name + method.desc; - if (MixinApplicator.hasFlag(method, Opcodes.ACC_STATIC)) { + if (MixinApplicatorStandard.hasFlag(method, Opcodes.ACC_STATIC)) { throw new InvalidMixinException(mixin, "@Intrinsic method cannot be static, found " + methodName + " in " + mixin); } @@ -544,7 +545,7 @@ public class MixinApplicator { MethodNode target = this.findTargetMethod(method); if (target != null) { - AbstractInsnNode returnNode = MixinApplicator.findInsn(target, Opcodes.RETURN); + AbstractInsnNode returnNode = MixinApplicatorStandard.findInsn(target, Opcodes.RETURN); if (returnNode != null) { Iterator injectIter = method.instructions.iterator(); @@ -603,7 +604,7 @@ public class MixinApplicator { MethodNode ctor = null; for (MethodNode mixinMethod : mixin.getMethods()) { - if (Constants.CTOR.equals(mixinMethod.name) && MixinApplicator.hasLineNumbers(mixinMethod)) { + if (Constants.CTOR.equals(mixinMethod.name) && MixinApplicatorStandard.hasLineNumbers(mixinMethod)) { if (ctor == null) { ctor = mixinMethod; } else { @@ -710,7 +711,7 @@ public class MixinApplicator { trimAtOpcode = -1; continue; } - for (int ivalidOp : MixinApplicator.INITIALISER_OPCODE_BLACKLIST) { + for (int ivalidOp : MixinApplicatorStandard.INITIALISER_OPCODE_BLACKLIST) { if (opcode == ivalidOp) { // At the moment I don't handle any transient locals because I haven't seen any in the wild, but let's avoid writing // code which will likely break things and fix it if a real test case ever appears diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassNode.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassNode.java deleted file mode 100644 index b54c68c8..00000000 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassNode.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of Mixin, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.asm.mixin.transformer; - -import org.spongepowered.asm.lib.Opcodes; -import org.spongepowered.asm.lib.tree.ClassNode; - -/** - * ClassNode for a MixinInfo - */ -public class MixinClassNode extends ClassNode { - - private final MixinInfo mixin; - - public MixinClassNode(MixinInfo mixin) { - this(Opcodes.ASM5, mixin); - } - - public MixinClassNode(int api, MixinInfo mixin) { - super(api); - this.mixin = mixin; - } - - public MixinInfo getMixin() { - return this.mixin; - } -} diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 2f1e53db..67bc5f98 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -34,6 +34,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -41,12 +43,15 @@ import org.apache.logging.log4j.Logger; import org.spongepowered.asm.launch.MixinInitialisationError; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; +import org.spongepowered.asm.mixin.refmap.ReferenceMapper; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.VersionNumber; import com.google.gson.Gson; @@ -82,7 +87,7 @@ class MixinConfig implements Comparable, IMixinConfig { * Global list of mixin classes, so we can skip any duplicates */ private static final Set globalMixinList = new HashSet(); - + /** * Log even more things */ @@ -107,13 +112,30 @@ class MixinConfig implements Comparable, IMixinConfig { * Synthetic inner classes for mixins in this set */ private final transient Set syntheticInnerClasses = new HashSet(); + + /** + * Marshal + */ + private transient Config handle; + + /** + * Target selector, eg. @env(DEFAULT) + */ + @SerializedName("target") + private String selector; /** * Minimum version of the mixin subsystem required to correctly apply mixins * in this configuration. */ @SerializedName("minVersion") - private String version; + private String version; + + /** + * Minimum compatibility level required for mixins in this set + */ + @SerializedName("compatibilityLevel") + private String compatibility; /** * Determines whether failures in this mixin config are considered terminal @@ -187,6 +209,11 @@ class MixinConfig implements Comparable, IMixinConfig { * Intrinsic order (for sorting configurations with identical priority) */ private final transient int order = MixinConfig.configOrder++; + +// /** +// * Phase selector +// */ +// private transient List selectors; /** * Parent environment @@ -223,7 +250,7 @@ class MixinConfig implements Comparable, IMixinConfig { /** * Keep track of initialisation state */ - private transient boolean initialised = false; + private transient boolean prepared = false; /** * Spawn via GSON, no public ctor for you @@ -233,18 +260,74 @@ class MixinConfig implements Comparable, IMixinConfig { /** * Called immediately after deserialisation * - * @param env Parent environment * @param name Mixin config name + * @param fallbackEnvironment Fallback environment if not specified in + * config * @return true if the config was successfully initialised and should be * returned, or false if initialisation failed and the config should * be discarded */ - private boolean onLoad(MixinEnvironment env, String name) { - this.env = env; + private boolean onLoad(String name, MixinEnvironment fallbackEnvironment) { this.name = name; + this.env = this.parseSelector(this.selector, fallbackEnvironment); + this.initCompatibilityLevel(); + return this.checkVersion(); + } + + @SuppressWarnings("deprecation") + private void initCompatibilityLevel() { + if (this.compatibility == null) { + return; + } + CompatibilityLevel level = CompatibilityLevel.valueOf(this.compatibility.trim().toUpperCase()); + CompatibilityLevel current = MixinEnvironment.getCompatibilityLevel(); + + if (level == current) { + return; + } + + // Current level is higher than required but too new to support it + if (current.isAtLeast(level)) { + if (!current.canSupport(level)) { + throw new MixinInitialisationError("Mixin config " + this.name + " requires compatibility level " + level + " which is too old"); + } + } + + // Current level is lower than required but current level prohibits elevation + if (!current.canElevateTo(level)) { + throw new MixinInitialisationError("Mixin config " + this.name + " requires compatibility level " + level + " which is prohibited by " + + current); + } + + MixinEnvironment.setCompatibilityLevel(level); + } + + // AMS - temp + private MixinEnvironment parseSelector(String target, MixinEnvironment fallbackEnvironment) { + if (target != null) { + String[] selectors = target.split("[&\\| ]"); + for (String selector : selectors) { + selector = selector.trim(); + Pattern environmentSelector = Pattern.compile("^@env(?:ironment)?\\(([A-Z]+)\\)$"); + Matcher environmentSelectorMatcher = environmentSelector.matcher(selector); + if (environmentSelectorMatcher.matches()) { + // only parse first env selector + return MixinEnvironment.getEnvironment(Phase.forName(environmentSelectorMatcher.group(1))); + } + } + + Phase phase = Phase.forName(target); + if (phase != null) { + return MixinEnvironment.getEnvironment(phase); + } + } + return fallbackEnvironment; + } + + private boolean checkVersion() throws MixinInitialisationError { VersionNumber minVersion = VersionNumber.parse(this.version); - VersionNumber curVersion = VersionNumber.parse(env.getVersion()); + VersionNumber curVersion = VersionNumber.parse(this.env.getVersion()); if (minVersion.compareTo(curVersion) > 0) { this.logger.warn("Mixin config {} requires mixin subsystem version {} but {} was found. The mixin config will not be applied.", this.name, minVersion, curVersion); @@ -256,6 +339,13 @@ class MixinConfig implements Comparable, IMixinConfig { return false; } + return true; + } + + /** + * Initialise the config once it's selected + */ + void onSelect() { if (this.pluginClassName != null) { try { Class pluginClass = Class.forName(this.pluginClassName, true, Launch.classLoader); @@ -285,9 +375,7 @@ class MixinConfig implements Comparable, IMixinConfig { } this.refMapper = ReferenceMapper.read(this.refMapperConfig); - this.verboseLogging |= env.getOption(Option.DEBUG_VERBOSE); - - return true; + this.verboseLogging |= this.env.getOption(Option.DEBUG_VERBOSE); } /** @@ -303,20 +391,20 @@ class MixinConfig implements Comparable, IMixinConfig { * either the hasMixinsFor() or getMixinsFor() methods. *

*/ - void initialise(IHotSwap hotSwapper) { - if (this.initialised) { + void prepare(IHotSwap hotSwapper) { + if (this.prepared) { return; } - this.initialised = true; + this.prepared = true; - this.initialiseMixins(this.mixinClasses, false, hotSwapper); + this.prepareMixins(this.mixinClasses, false, hotSwapper); switch (this.env.getSide()) { case CLIENT: - this.initialiseMixins(this.mixinClassesClient, false, hotSwapper); + this.prepareMixins(this.mixinClassesClient, false, hotSwapper); break; case SERVER: - this.initialiseMixins(this.mixinClassesServer, false, hotSwapper); + this.prepareMixins(this.mixinClassesServer, false, hotSwapper); break; case UNKNOWN: //$FALL-THROUGH$ @@ -329,7 +417,7 @@ class MixinConfig implements Comparable, IMixinConfig { void postInitialise(IHotSwap hotSwapper) { if (this.plugin != null) { List pluginMixins = this.plugin.getMixins(); - this.initialiseMixins(pluginMixins, true, hotSwapper); + this.prepareMixins(pluginMixins, true, hotSwapper); } for (Iterator iter = this.mixins.iterator(); iter.hasNext();) { @@ -361,7 +449,7 @@ class MixinConfig implements Comparable, IMixinConfig { } } - private void initialiseMixins(List mixinClasses, boolean suppressPlugin, IHotSwap hotSwapper) { + private void prepareMixins(List mixinClasses, boolean suppressPlugin, IHotSwap hotSwapper) { if (mixinClasses == null) { return; } @@ -407,6 +495,16 @@ class MixinConfig implements Comparable, IMixinConfig { this.unhandledTargets.remove(transformedName); } + /** + * Get marshalling handle + */ + public Config getHandle() { + if (this.handle == null) { + this.handle = new Config(this); + } + return this.handle; + } + /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinConfig#isRequired() */ @@ -475,6 +573,11 @@ class MixinConfig implements Comparable, IMixinConfig { String defaultGroup = this.injectorOptions.defaultGroup; return defaultGroup != null && !defaultGroup.isEmpty() ? defaultGroup : "default"; } + + // AMS - temp + public boolean select(MixinEnvironment environment) { + return this.env == environment; + } /** * Get the number of mixins in this config, for debug logging @@ -652,19 +755,19 @@ class MixinConfig implements Comparable, IMixinConfig { * specified configFile, which must be accessible on the classpath * * @param configFile - * @param env parent environment + * @param outer fallback environment * @return */ - static MixinConfig create(String configFile, MixinEnvironment env) { + static Config create(String configFile, MixinEnvironment outer) { try { MixinConfig config = new Gson().fromJson(new InputStreamReader(Launch.classLoader.getResourceAsStream(configFile)), MixinConfig.class); - if (config.onLoad(env, configFile)) { - return config; + if (config.onLoad(configFile, outer)) { + return config.getHandle(); } return null; } catch (Exception ex) { ex.printStackTrace(); - throw new IllegalArgumentException(String.format("The specified configuration file '%s' was invalid or could not be read", configFile)); + throw new IllegalArgumentException(String.format("The specified resource '%s' was invalid or could not be read", configFile), ex); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index f052e937..364adbbe 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -27,6 +27,7 @@ package org.spongepowered.asm.mixin.transformer; import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -37,7 +38,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.Opcodes; -import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.FieldNode; @@ -48,12 +48,13 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; -import org.spongepowered.asm.mixin.MixinException; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; +import org.spongepowered.asm.mixin.transformer.throwables.MixinReloadException; import org.spongepowered.asm.util.ASMHelper; import com.google.common.base.Function; @@ -67,60 +68,105 @@ import net.minecraft.launchwrapper.LaunchClassLoader; * Runtime information bundle about a mixin */ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { + + /** + * ClassNode for a MixinInfo + */ + public class MixinClassNode extends ClassNode { + + public MixinClassNode(MixinInfo mixin) { + this(Opcodes.ASM5); + } + + public MixinClassNode(int api) { + super(api); + } + + public MixinInfo getMixin() { + return MixinInfo.this; + } + + } /** - * State that can be reloaded. + * Mixin preparation/parse/validation state */ - private class ValidationState { + class State { /** * Mixin bytes (read once, generate tree on demand) */ - byte[] mixinBytes; - - /** - * All interfaces implemented by this mixin, including soft - * implementations - */ - final Set interfaces = new HashSet(); - - /** - * Interfaces soft-implemented using {@link Implements} - */ - final List softImplements = new ArrayList(); - - /** - * Synthetic inner classes - */ - final Set syntheticInnerClasses = new HashSet(); + private byte[] mixinBytes; /** * Mixin ClassInfo */ - final ClassInfo classInfo; + private final ClassInfo classInfo; /** * True if the superclass of the mixin is not the direct * superclass of one or more targets */ - boolean detachedSuper; + private boolean detachedSuper; + + /** + * All interfaces implemented by this mixin, including soft + * implementations + */ + protected final Set interfaces = new HashSet(); + + /** + * Interfaces soft-implemented using {@link Implements} + */ + protected final List softImplements = new ArrayList(); + + /** + * Synthetic inner classes + */ + protected final Set syntheticInnerClasses = new HashSet(); /** * Initial ClassNode created for mixin validation, not used for actual * application */ - ClassNode classNode; + protected ClassNode classNode; - ValidationState(byte[] mixinBytes, ClassInfo classInfo) { - this.mixinBytes = mixinBytes; - this.classNode = this.getClassNode(0); - this.classInfo = classInfo; + State(byte[] mixinBytes) { + this(mixinBytes, null); } - ValidationState(byte[] mixinBytes) { + State(byte[] mixinBytes, ClassInfo classInfo) { this.mixinBytes = mixinBytes; - this.classNode = this.getClassNode(0); - this.classInfo = ClassInfo.fromClassNode(this.classNode); + this.classNode = this.createClassNode(0); + this.classInfo = classInfo != null ? classInfo : ClassInfo.fromClassNode(this.classNode); + } + + ClassInfo getClassInfo() { + return this.classInfo; + } + + byte[] getClassBytes() { + return this.mixinBytes; + } + + ClassNode getClassNode() { + return this.classNode; + } + + boolean isDetachedSuper() { + return this.detachedSuper; + } + + List getSoftImplements() { + return this.softImplements; + } + + Set getSyntheticInnerClasses() { + return this.syntheticInnerClasses; + } + + Set getInterfaces() { + return this.interfaces; } /** @@ -129,23 +175,147 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param flags Flags passed into classReader * @return Tree representing the bytecode */ - ClassNode getClassNode(int flags) { + ClassNode createClassNode(int flags) { MixinClassNode classNode = new MixinClassNode(MixinInfo.this); ClassReader classReader = new ClassReader(this.mixinBytes); classReader.accept(classNode, flags); return classNode; } + + /** + * Performs pre-flight checks on the mixin + * + * @param type Mixin Type + * @param targetClasses Mixin's target classes + */ + void validate(SubType type, List targetClasses) { + type.validate(this, targetClasses); + + this.detachedSuper = type.isDetachedSuper(); + + // Pre-flight checks + this.validateInner(); + this.validateClassVersion(); + this.validateRemappables(targetClasses); + + // Read information from the mixin + this.readImplementations(); + this.readInnerClasses(); + + // Takeoff validation + this.validateChanges(type, targetClasses); + + // Null out the validation classnode + this.classNode = null; + } + + private void validateInner() { + // isInner (shouldn't) return true for static inner classes + if (!this.classInfo.isProbablyStatic()) { + throw new InvalidMixinException(MixinInfo.this, "Inner class mixin must be declared static"); + } + } + + private void validateClassVersion() { + if (this.classNode.version > MixinEnvironment.getCompatibilityLevel().classVersion()) { + String helpText = "."; + for (CompatibilityLevel level : CompatibilityLevel.values()) { + if (level.classVersion() >= this.classNode.version) { + helpText = String.format(". Mixin requires compatibility level %s or above.", level.name()); + } + } + + throw new InvalidMixinException(MixinInfo.this, "Unsupported mixin class version " + this.classNode.version + helpText); + } + } + + private void validateRemappables(List targetClasses) { + // Can't have remappable fields or methods on a multi-target mixin, because after obfuscation the fields will remap to conflicting names + if (targetClasses.size() > 1) { + for (FieldNode field : this.classNode.fields) { + this.validateRemappable(Shadow.class, field.name, ASMHelper.getVisibleAnnotation(field, Shadow.class)); + } + + for (MethodNode method : this.classNode.methods) { + this.validateRemappable(Shadow.class, method.name, ASMHelper.getVisibleAnnotation(method, Shadow.class)); + AnnotationNode overwrite = ASMHelper.getVisibleAnnotation(method, Overwrite.class); + if (overwrite != null && ((method.access & Opcodes.ACC_STATIC) == 0 || (method.access & Opcodes.ACC_PUBLIC) == 0)) { + throw new InvalidMixinException(MixinInfo.this, "Found @Overwrite annotation on " + method.name + " in " + this); + } + } + } + } + + private void validateRemappable(Class annotationClass, String name, AnnotationNode annotation) { + if (annotation != null && ASMHelper.getAnnotationValue(annotation, "remap", Boolean.TRUE)) { + throw new InvalidMixinException(MixinInfo.this, "Found a remappable @" + annotationClass.getSimpleName() + " annotation on " + name + + " in " + this); + } + } + + /** + * Read and process any {@link Implements} annotations on the mixin + */ + void readImplementations() { + this.interfaces.addAll(this.classNode.interfaces); + + AnnotationNode implementsAnnotation = ASMHelper.getInvisibleAnnotation(this.classNode, Implements.class); + if (implementsAnnotation == null) { + return; + } + + List interfaces = ASMHelper.getAnnotationValue(implementsAnnotation); + if (interfaces == null) { + return; + } + + for (AnnotationNode interfaceNode : interfaces) { + InterfaceInfo interfaceInfo = InterfaceInfo.fromAnnotation(MixinInfo.this, interfaceNode); + this.softImplements.add(interfaceInfo); + this.interfaces.add(interfaceInfo.getInternalName()); + // only add interface if its initial initialisation + if (!(this instanceof Reloaded)) { + this.classInfo.addInterface(interfaceInfo.getInternalName()); + } + } + } + + /** + * Read inner class definitions for the class and locate any synthetic + * inner classes so that we can add them to the passthrough set in our + * parent config. + */ + void readInnerClasses() { + for (InnerClassNode inner : this.classNode.innerClasses) { + ClassInfo innerClass = ClassInfo.forName(inner.name); + if (innerClass.isSynthetic() && innerClass.isProbablyStatic()) { + if ((inner.outerName != null && inner.outerName.equals(this.classInfo.getName())) + || inner.name.startsWith(this.classNode.name + "$")) { + this.syntheticInnerClasses.add(inner.name); + } else { + throw new InvalidMixinException(MixinInfo.this, "Unhandled synthetic inner class found: " + inner.name); + } + } + } + } + + protected void validateChanges(SubType type, List targetClasses) { + type.createPreProcessor(this.classNode).prepare(); + } } - private class ReloadedState extends ValidationState { + /** + * State use when hotswap reloading a mixin + */ + class Reloaded extends State { /** * The previous validation state to compare the changes to */ - private final ValidationState previous; + private final State previous; - ReloadedState(ValidationState previous, byte[] mixinBytes) { - super(mixinBytes, previous.classInfo); + Reloaded(State previous, byte[] mixinBytes) { + super(mixinBytes, previous.getClassInfo()); this.previous = previous; } @@ -153,7 +323,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Validates that the changes are allowed to be made, these restrictions * only exits while reloading mixins. */ - void validateChanges() { + @Override + protected void validateChanges(SubType type, List targetClasses) { if (!this.syntheticInnerClasses.equals(this.previous.syntheticInnerClasses)) { throw new MixinReloadException(MixinInfo.this, "Cannot change inner classes"); } @@ -164,7 +335,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { throw new MixinReloadException(MixinInfo.this, "Cannot change soft interfaces"); } List targets = MixinInfo.this.readTargetClasses(this.classNode, true); - if (!new HashSet(targets).equals(new HashSet(MixinInfo.this.getTargets0()))) { + if (!new HashSet(targets).equals(new HashSet(targetClasses))) { throw new MixinReloadException(MixinInfo.this, "Cannot change target classes"); } int priority = MixinInfo.this.readPriority(this.classNode); @@ -173,7 +344,142 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } } } + + /** + * Mixin sub-type, eg. standard mixin, interface mixin, accessor + */ + abstract static class SubType { + + /** + * Outer + */ + protected final MixinInfo mixin; + + /** + * String representation of annotation type, for use in messages + */ + protected final String annotationType; + + /** + * Target of this mixin subtype must be an interface, false for a class + */ + protected final boolean targetMustBeInterface; + + /** + * Detached super, parsed out during validation + */ + protected boolean detached; + + SubType(MixinInfo info, String annotationType, boolean targetMustBeInterface) { + this.mixin = info; + this.annotationType = annotationType; + this.targetMustBeInterface = targetMustBeInterface; + } + + /** + * Get whether this mixin is detached super, must call {@link #validate} + * first + * + * @return + */ + boolean isDetachedSuper() { + return this.detached; + } + + /** + * Validate a single target before adding + * + * @param targetName + * @param targetInfo + */ + void validateTarget(String targetName, ClassInfo targetInfo) { + boolean targetIsInterface = targetInfo.isInterface(); + if (targetIsInterface != this.targetMustBeInterface) { + String not = targetIsInterface ? "" : "not "; + throw new InvalidMixinException(this.mixin, this.annotationType + " target type mismatch: " + targetName + + " is " + not + "an interface in " + this); + } + } + + abstract void validate(State state, List targetClasses); + abstract MixinPreProcessorStandard createPreProcessor(ClassNode classNode); + + /** + * A standard mixin + */ + static class Standard extends SubType { + + Standard(MixinInfo info) { + super(info, "@Mixin", false); + } + + @Override + void validate(State state, List targetClasses) { + ClassNode classNode = state.getClassNode(); + + for (ClassInfo targetClass : targetClasses) { + if (classNode.superName.equals(targetClass.getSuperName())) { + continue; + } + + if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.SUPER)) { + ClassInfo superClass = ClassInfo.forName(classNode.superName); + if (superClass.isMixin()) { + // If superclass is a mixin, check for hierarchy derp + for (ClassInfo superTarget : superClass.getTargets()) { + if (targetClasses.contains(superTarget)) { + throw new InvalidMixinException(this.mixin, "Illegal hierarchy detected. Derived mixin " + this + + " targets the same class " + superTarget.getClassName() + " as its superclass " + + superClass.getClassName()); + } + } + } + + throw new InvalidMixinException(this.mixin, "Super class '" + classNode.superName.replace('/', '.') + "' of " + + this.mixin.getName() + " was not found in the hierarchy of target class '" + targetClass + "'"); + } + + this.detached = true; + } + } + + @Override + MixinPreProcessorStandard createPreProcessor(ClassNode classNode) { + return new MixinPreProcessorStandard(this.mixin, classNode); + } + } + + /** + * An interface mixin + */ + static class Interface extends SubType { + + Interface(MixinInfo info) { + super(info, "@Mixin", true); + } + + @Override + void validate(State state, List targetClasses) { + if (!MixinEnvironment.getCompatibilityLevel().supportsMethodsInInterfaces()) { + throw new InvalidMixinException(this.mixin, "Interface mixin not supported in current enviromnment"); + } + + ClassNode classNode = state.getClassNode(); + + if (!"java/lang/Object".equals(classNode.superName)) { + throw new InvalidMixinException(this.mixin, "Super class of " + this + " is invalid, found " + + classNode.superName.replace('/', '.')); + } + } + + @Override + MixinPreProcessorStandard createPreProcessor(ClassNode classNode) { + return new MixinPreProcessorInterface(this.mixin, classNode); + } + } + } + /** * Global order of mixin infos, used to determine ordering between mixins * with equivalent priority @@ -238,19 +544,19 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { private final transient ClassInfo info; /** - * True if this is an interface mixin rather than a regular mixin + * Mixin type */ - private final transient boolean isInterfaceMixin; + private final transient SubType type; /** * Holds state that currently is not fully initialised or validated */ - private transient ValidationState uninitialisedState; + private transient State pendingState; /** * Holds the current validated state */ - private transient ValidationState validationState; + private transient State state; /** * Internal ctor, called by {@link MixinConfig} @@ -269,41 +575,50 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { this.plugin = plugin; this.phase = MixinEnvironment.getCurrentEnvironment().getPhase(); - ClassNode classNode = null; - // Read the class bytes and transform try { - byte[] mixinBytes = this.loadMixinClass(this.className, runTransformers); - this.uninitialisedState = new ValidationState(mixinBytes); - this.info = this.uninitialisedState.classInfo; - classNode = this.uninitialisedState.getClassNode(0); - this.isInterfaceMixin = this.info.isInterface(); + this.pendingState = new State(this.loadMixinClass(this.className, runTransformers)); + this.info = this.pendingState.getClassInfo(); + this.type = this.initType(); + } catch (Exception ex) { + throw new InvalidMixinException(this, ex); + } + + // Read the class bytes and transform + try { + this.priority = this.readPriority(this.pendingState.getClassNode()); + this.targetClasses = this.readTargetClasses(this.pendingState.getClassNode(), suppressPlugin); + this.targetClassNames = Collections.unmodifiableList(Lists.transform(this.targetClasses, Functions.toStringFunction())); } catch (Exception ex) { throw new InvalidMixinException(this, ex); } - - this.priority = this.readPriority(classNode); - this.targetClasses = this.readTargetClasses(classNode, suppressPlugin); - this.targetClassNames = Collections.unmodifiableList(Lists.transform(this.targetClasses, Functions.toStringFunction())); } + /** + * Initialise the mixin subtype handler + * + * @return subtype + */ + private SubType initType() { + if (this.info.isInterface()) { + return new SubType.Interface(this); + } + return new SubType.Standard(this); + } + + /** + * Run validation pass + */ void validate() { + if (this.pendingState == null) { + throw new IllegalStateException("No pending validation state for " + this); + } + try { - ClassNode classNode = this.uninitialisedState.classNode; - this.uninitialisedState.detachedSuper = this.validateTargetClasses(classNode); - this.validateMixin(this.uninitialisedState); - this.readImplementations(this.uninitialisedState); - this.readInnerClasses(this.uninitialisedState); - if (this.uninitialisedState instanceof ReloadedState) { - ((ReloadedState) this.uninitialisedState).validateChanges(); - } else { - this.createPreProcessor(classNode).prepare(); - } - this.uninitialisedState.classNode = null; - // the state is now fully initialised and validated - this.validationState = this.uninitialisedState; + this.pendingState.validate(this.type, this.targetClasses); + this.state = this.pendingState; } finally { - this.uninitialisedState = null; + this.pendingState = null; } } @@ -325,13 +640,13 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } List targets = new ArrayList(); - List publicTargets = ASMHelper.getAnnotationValue(mixin, "value"); + List publicTargets = ASMHelper.getAnnotationValue(mixin, "value"); List privateTargets = ASMHelper.getAnnotationValue(mixin, "targets"); if (publicTargets != null) { - this.readTargets(targets, Lists.transform(publicTargets, new Function() { + this.readTargets(targets, Lists.transform(publicTargets, new Function() { @Override - public String apply(Type input) { + public String apply(org.spongepowered.asm.lib.Type input) { return input.getClassName(); } }), suppressPlugin, false); @@ -352,12 +667,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * Reads a target list into the outTargets list */ - private void readTargets(List outTargets, List inTargets, boolean suppressPlugin, boolean checkPublic) { - for (String targetClassName : inTargets) { - targetClassName = targetClassName.replace('/', '.'); - if (this.plugin == null || suppressPlugin || this.plugin.shouldApplyMixin(targetClassName, this.className)) { - ClassInfo targetInfo = ClassInfo.forName(targetClassName); - this.checkTarget(targetClassName, targetInfo, checkPublic); + private void readTargets(Collection outTargets, Collection inTargets, boolean suppressPlugin, boolean checkPublic) { + for (String targetName : inTargets) { + targetName = targetName.replace('/', '.'); + if (this.plugin == null || suppressPlugin || this.plugin.shouldApplyMixin(targetName, this.className)) { + ClassInfo targetInfo = this.getTarget(targetName, checkPublic); if (!outTargets.contains(targetInfo)) { outTargets.add(targetInfo); targetInfo.addMixin(this); @@ -366,19 +680,17 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } } - private void checkTarget(String targetClassName, ClassInfo targetInfo, boolean checkPublic) throws InvalidMixinException { + private ClassInfo getTarget(String targetName, boolean checkPublic) throws InvalidMixinException { + ClassInfo targetInfo = ClassInfo.forName(targetName); if (targetInfo == null) { - throw new MixinException("@Mixin target " + targetClassName + " was not found " + this); - } - boolean targetIsInterface = targetInfo.isInterface(); - if (targetIsInterface != this.isInterfaceMixin) { - String not = targetIsInterface ? "" : "not "; - throw new InvalidMixinException(this, "@Mixin target type mismatch: " + targetClassName + " is " + not + "an interface in " + this); + throw new InvalidMixinException(this, "@Mixin target " + targetName + " was not found " + this); } + this.type.validateTarget(targetName, targetInfo); if (checkPublic && targetInfo.isPublic()) { - throw new InvalidMixinException(this, "@Mixin target " + targetClassName + " is public in " + this + throw new InvalidMixinException(this, "@Mixin target " + targetName + " is public in " + this + " and must be specified in value"); } + return targetInfo; } /** @@ -401,170 +713,17 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { return priority == null ? this.parent.getDefaultMixinPriority() : priority.intValue(); } - private boolean validateTargetClasses(ClassNode classNode) { - if (this.isInterfaceMixin) { - return this.validateInterfaceMixinTargets(classNode); - } - return this.validateClassMixinTargets(classNode); - } - - private boolean validateInterfaceMixinTargets(ClassNode classNode) { - if (!"java/lang/Object".equals(classNode.superName)) { - throw new InvalidMixinException(this, "Super class of " + this + " is invalid, found " + classNode.superName.replace('/', '.')); - } - - return false; - } - - private boolean validateClassMixinTargets(ClassNode classNode) { - boolean detached = false; - - for (ClassInfo targetClass : this.targetClasses) { - if (classNode.superName.equals(targetClass.getSuperName())) { - continue; - } - - if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.SUPER)) { - ClassInfo superClass = ClassInfo.forName(classNode.superName); - if (superClass.isMixin()) { - // If superclass is a mixin, check for hierarchy derp - for (ClassInfo superTarget : superClass.getTargets()) { - if (this.targetClasses.contains(superTarget)) { - throw new InvalidMixinException(this, "Illegal hierarchy detected. Derived mixin " + this + " targets the same class " - + superTarget.getClassName() + " as its superclass " + superClass.getClassName()); - } - } - } - - throw new InvalidMixinException(this, "Super class '" + classNode.superName.replace('/', '.') + "' of " + this.name - + " was not found in the hierarchy of target class '" + targetClass + "'"); - } - - detached = true; - } - - return detached; - } - - /** - * Performs pre-flight checks on the mixin - * - * @param state State to validate - */ - private void validateMixin(ValidationState state) { - this.validateType(); - this.validateInner(state); - this.validateClassVersion(state); - this.validateRemappables(state); - } - - private void validateType() { - if (this.isInterfaceMixin && !MixinEnvironment.getCompatibilityLevel().supportsMethodsInInterfaces()) { - throw new InvalidMixinException(this, "Interface mixin not supported in current enviromnment"); - } - } - - private void validateInner(ValidationState state) { - // isInner (shouldn't) return true for static inner classes - if (!state.classInfo.isProbablyStatic()) { - throw new InvalidMixinException(this, "Inner class mixin must be declared static"); - } - } - - private void validateClassVersion(ValidationState state) { - if (state.classNode.version > MixinEnvironment.getCompatibilityLevel().classVersion()) { - String helpText = "."; - for (CompatibilityLevel level : CompatibilityLevel.values()) { - if (level.classVersion() >= state.classNode.version) { - helpText = String.format(". Mixin requires compatibility level %s or above.", level.name()); - } - } - - throw new InvalidMixinException(this, "Unsupported mixin class version " + state.classNode.version + helpText); - } - } - - private void validateRemappables(ValidationState state) { - // Can't have remappable fields or methods on a multi-target mixin, because after obfuscation the fields will remap to conflicting names - if (this.targetClasses.size() > 1) { - for (FieldNode field : state.classNode.fields) { - this.checkRemappable(Shadow.class, field.name, ASMHelper.getVisibleAnnotation(field, Shadow.class)); - } - - for (MethodNode method : state.classNode.methods) { - this.checkRemappable(Shadow.class, method.name, ASMHelper.getVisibleAnnotation(method, Shadow.class)); - AnnotationNode overwrite = ASMHelper.getVisibleAnnotation(method, Overwrite.class); - if (overwrite != null && ((method.access & Opcodes.ACC_STATIC) == 0 || (method.access & Opcodes.ACC_PUBLIC) == 0)) { - throw new InvalidMixinException(this, "Found @Overwrite annotation on " + method.name + " in " + this); - } - } - } - } - - private void checkRemappable(Class annotationClass, String name, AnnotationNode annotation) { - if (annotation != null && ASMHelper.getAnnotationValue(annotation, "remap", Boolean.TRUE)) { - throw new InvalidMixinException(this, "Found a remappable @" + annotationClass.getSimpleName() + " annotation on " + name - + " in " + this); - } - } - - /** - * Read and process any {@link Implements} annotations on the mixin - */ - private void readImplementations(ValidationState state) { - state.interfaces.addAll(state.classNode.interfaces); - - AnnotationNode implementsAnnotation = ASMHelper.getInvisibleAnnotation(state.classNode, Implements.class); - if (implementsAnnotation == null) { - return; - } - - List interfaces = ASMHelper.getAnnotationValue(implementsAnnotation); - if (interfaces == null) { - return; - } - - for (AnnotationNode interfaceNode : interfaces) { - InterfaceInfo interfaceInfo = InterfaceInfo.fromAnnotation(this, interfaceNode); - state.softImplements.add(interfaceInfo); - state.interfaces.add(interfaceInfo.getInternalName()); - // only add interface if its initial initialisation - if (!(state instanceof ReloadedState)) { - state.classInfo.addInterface(interfaceInfo.getInternalName()); - } - } - } - - /** - * Read inner class definitions for the class and locate any synthetic inner - * classes so that we can add them to the passthrough set in our parent - * config. - */ - private void readInnerClasses(ValidationState state) { - for (InnerClassNode inner : state.classNode.innerClasses) { - ClassInfo innerClass = ClassInfo.forName(inner.name); - if (innerClass.isSynthetic() && innerClass.isProbablyStatic()) { - if ((inner.outerName != null && inner.outerName.equals(state.classInfo.getName())) - || inner.name.startsWith(state.classNode.name + "$")) { - state.syntheticInnerClasses.add(inner.name); - } else { - throw new InvalidMixinException(this, "Unhandled synthetic inner class found: " + inner.name); - } - } - } - } - /** * Current state, either the validated state or the uninitialised state if * the mixin is initialising for the first time. Should never return null. */ - private ValidationState getCurrentState() { - if (this.validationState == null) { - return this.uninitialisedState; - } - return this.validationState; + private State getState() { + return this.state != null ? this.state : this.pendingState; } + /** + * Get the ClassInfo for the mixin class + */ ClassInfo getClassInfo() { return this.info; } @@ -580,10 +739,18 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * Get the parent config which declares this mixin */ - public MixinConfig getParent() { + MixinConfig getParent() { return this.parent; } + /** + * Get the mixin priority + */ + @Override + public int getPriority() { + return this.priority; + } + /** * Get the simple name of the mixin */ @@ -613,7 +780,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ @Override public byte[] getClassBytes() { - return this.getCurrentState().mixinBytes; + return this.getState().getClassBytes(); } /** @@ -622,7 +789,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ @Override public boolean isDetachedSuper() { - return this.getCurrentState().detachedSuper; + return this.getState().isDetachedSuper(); } /** @@ -639,21 +806,13 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { public Phase getPhase() { return this.phase; } - - /** - * Get whether this is an interface mixin or not - */ - @Override - public boolean isInterfaceMixin() { - return this.isInterfaceMixin; - } /** * Get a new tree for the class bytecode */ @Override public ClassNode getClassNode(int flags) { - return this.getCurrentState().getClassNode(flags); + return this.getState().createClassNode(flags); } /** @@ -668,36 +827,21 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Get the soft implementations for this mixin */ List getSoftImplements() { - return Collections.unmodifiableList(this.getCurrentState().softImplements); + return Collections.unmodifiableList(this.getState().getSoftImplements()); } /** * Get the synthetic inner classes for this mixin */ - public Set getSyntheticInnerClasses() { - return Collections.unmodifiableSet(this.getCurrentState().syntheticInnerClasses); + Set getSyntheticInnerClasses() { + return Collections.unmodifiableSet(this.getState().getSyntheticInnerClasses()); } /** * Get the target class list for this mixin */ - public List getTargets() { - return Collections.unmodifiableList(this.getTargets0()); - } - - /** - * Internal method to avoid synthetic bridge generation - */ - protected List getTargets0() { - return this.targetClasses; - } - - /** - * Get the mixin priority - */ - @Override - public int getPriority() { - return this.priority; + List getTargets() { + return Collections.unmodifiableList(this.targetClasses); } /** @@ -705,8 +849,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * * @return mixin interfaces */ - public Set getInterfaces() { - return this.getCurrentState().interfaces; + Set getInterfaces() { + return this.getState().getInterfaces(); } /** @@ -715,21 +859,9 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param target * @return new context */ - public MixinTargetContext createContextFor(TargetClassContext target) { + MixinTargetContext createContextFor(TargetClassContext target) { ClassNode classNode = this.getClassNode(ClassReader.EXPAND_FRAMES); - return this.createPreProcessor(classNode).prepare().createContextFor(target); - } - - /** - * Create a preprocessor based on this mixin's type - * - * @return new preprocessor - */ - private MixinPreProcessor createPreProcessor(ClassNode classNode) { - if (this.isInterfaceMixin) { - return new InterfaceMixinPreProcessor(this, classNode); - } - return new MixinPreProcessor(this, classNode); + return this.type.createPreProcessor(classNode).prepare().createContextFor(target); } /** @@ -766,10 +898,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param mixinBytes New bytecode */ void reloadMixin(byte[] mixinBytes) { - if (this.uninitialisedState != null) { + if (this.pendingState != null) { throw new IllegalStateException("Cannot reload mixin while it is initialising"); } - this.uninitialisedState = new ReloadedState(this.validationState, mixinBytes); + this.pendingState = new Reloaded(this.state, mixinBytes); this.validate(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java similarity index 89% rename from src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java index 84fcca3b..4fe187f9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceMixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java @@ -30,12 +30,13 @@ import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidInterfaceMixinException; /** * Bytecode preprocessor for interface mixins, simply performs some additional * verification for things which are unsupported in interfaces */ -class InterfaceMixinPreProcessor extends MixinPreProcessor { +class MixinPreProcessorInterface extends MixinPreProcessorStandard { /** * Ctor @@ -43,7 +44,7 @@ class InterfaceMixinPreProcessor extends MixinPreProcessor { * @param mixin Mixin info * @param classNode Mixin classnode */ - InterfaceMixinPreProcessor(MixinInfo mixin, ClassNode classNode) { + MixinPreProcessorInterface(MixinInfo mixin, ClassNode classNode) { super(mixin, classNode); } @@ -55,7 +56,7 @@ class InterfaceMixinPreProcessor extends MixinPreProcessor { @Override protected void prepareMethod(MethodNode mixinMethod, Method method) { // I have no idea how the hell you'd compile this, but we make sure anyway! - if (!MixinApplicator.hasFlag(mixinMethod, Opcodes.ACC_PUBLIC)) { + if (!MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_PUBLIC)) { throw new InvalidInterfaceMixinException(this.mixin, "Interface mixin contains a non-public method! Found " + method + " in " + this.mixin); } @@ -72,7 +73,7 @@ class InterfaceMixinPreProcessor extends MixinPreProcessor { */ @Override protected boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { - if (!MixinApplicator.hasFlag(field, Opcodes.ACC_STATIC)) { + if (!MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_STATIC)) { throw new InvalidInterfaceMixinException(this.mixin, "Interface mixin contains an instance field! Found " + field.name + " in " + this.mixin); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java similarity index 91% rename from src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java index 25f2bc10..19e500be 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -45,13 +45,14 @@ import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.RemapperChain; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.Surrogate; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; +import org.spongepowered.asm.obfuscation.RemapperChain; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; @@ -74,7 +75,7 @@ import org.spongepowered.asm.util.Constants; * target-context-sensitive pass on the other hand can only operate on private * class members for obvious reasons.

*/ -class MixinPreProcessor { +class MixinPreProcessorStandard { /** * Logger @@ -95,7 +96,7 @@ class MixinPreProcessor { private boolean prepared, attached; - MixinPreProcessor(MixinInfo mixin, ClassNode classNode) { + MixinPreProcessorStandard(MixinInfo mixin, ClassNode classNode) { this.mixin = mixin; this.classNode = classNode; this.verboseLogging = mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERBOSE); @@ -106,7 +107,7 @@ class MixinPreProcessor { * * @return Prepared classnode */ - MixinPreProcessor prepare() { + MixinPreProcessorStandard prepare() { if (!this.prepared) { this.prepared = true; @@ -234,13 +235,13 @@ class MixinPreProcessor { } Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_ALL); - MethodNode target = MixinPreProcessor.findMethod(context.getTargetClass(), mixinMethod, annotation); + MethodNode target = MixinPreProcessorStandard.findMethod(context.getTargetClass(), mixinMethod, annotation); if (target == null) { if (!mustExist) { return false; } - target = MixinPreProcessor.findRemappedMethod(context.getTargetClass(), mixinMethod); + target = MixinPreProcessorStandard.findRemappedMethod(context.getTargetClass(), mixinMethod); if (target == null) { throw new InvalidMixinException(this.mixin, annotationType.getSimpleName() + " method " + mixinMethod.name + " was not located in the target class"); @@ -292,12 +293,12 @@ class MixinPreProcessor { context.transformDescriptor(mixinField); Field field = this.mixin.getClassInfo().findField(mixinField); - FieldNode target = MixinPreProcessor.findField(context.getTargetClass(), mixinField, shadow); + FieldNode target = MixinPreProcessorStandard.findField(context.getTargetClass(), mixinField, shadow); if (target == null) { if (shadow == null) { continue; } - target = MixinPreProcessor.findRemappedField(context.getTargetClass(), mixinField); + target = MixinPreProcessorStandard.findRemappedField(context.getTargetClass(), mixinField); if (target == null) { // If this field is a shadow field but is NOT found in the target class, that's bad, mmkay throw new InvalidMixinException(this.mixin, "Shadow field " + mixinField.name + " was not located in the target class"); @@ -329,11 +330,11 @@ class MixinPreProcessor { } field.setDecoratedFinal(isFinal, isMutable); - if (this.verboseLogging && MixinApplicator.hasFlag(target, Opcodes.ACC_FINAL) != isFinal) { + if (this.verboseLogging && MixinApplicatorStandard.hasFlag(target, Opcodes.ACC_FINAL) != isFinal) { String message = isFinal ? "@Shadow field {}::{} is decorated with @Final but target is not final" : "@Shadow target {}::{} is final but shadow is not decorated with @Final"; - MixinPreProcessor.logger.warn(message, this.mixin, mixinField.name); + MixinPreProcessorStandard.logger.warn(message, this.mixin, mixinField.name); } context.addShadowField(mixinField, field); @@ -343,9 +344,9 @@ class MixinPreProcessor { protected boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { // Public static fields will fall foul of early static binding in java, including them in a mixin is an error condition - if (MixinApplicator.hasFlag(field, Opcodes.ACC_STATIC) - && !MixinApplicator.hasFlag(field, Opcodes.ACC_PRIVATE) - && !MixinApplicator.hasFlag(field, Opcodes.ACC_SYNTHETIC) + if (MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_STATIC) + && !MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_PRIVATE) + && !MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_SYNTHETIC) && shadow == null) { throw new InvalidMixinException(context, String.format("Mixin %s contains non-private static field %s:%s", context, field.name, field.desc)); @@ -409,7 +410,7 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findMethodRecursive(classNode, aliases, method.desc); + return MixinPreProcessorStandard.findMethodRecursive(classNode, aliases, method.desc); } protected static MethodNode findRemappedMethod(ClassNode classNode, MethodNode method) { @@ -422,7 +423,7 @@ class MixinPreProcessor { Deque aliases = new LinkedList(); aliases.add(remappedName); - return MixinPreProcessor.findMethodRecursive(classNode, aliases, method.desc); + return MixinPreProcessorStandard.findMethodRecursive(classNode, aliases, method.desc); } private static MethodNode findMethodRecursive(ClassNode classNode, Deque aliases, String desc) { @@ -437,7 +438,7 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findMethodRecursive(classNode, aliases, desc); + return MixinPreProcessorStandard.findMethodRecursive(classNode, aliases, desc); } protected static FieldNode findField(ClassNode classNode, FieldNode field, AnnotationNode shadow) { @@ -450,7 +451,7 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findFieldRecursive(classNode, aliases, field.desc); + return MixinPreProcessorStandard.findFieldRecursive(classNode, aliases, field.desc); } protected static FieldNode findRemappedField(ClassNode classNode, FieldNode field) { @@ -462,7 +463,7 @@ class MixinPreProcessor { Deque aliases = new LinkedList(); aliases.add(remappedName); - return MixinPreProcessor.findFieldRecursive(classNode, aliases, field.desc); + return MixinPreProcessorStandard.findFieldRecursive(classNode, aliases, field.desc); } /** @@ -484,6 +485,6 @@ class MixinPreProcessor { } } - return MixinPreProcessor.findFieldRecursive(classNode, aliases, desc); + return MixinPreProcessorStandard.findFieldRecursive(classNode, aliases, desc); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 64586be2..76b8bdac 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -44,16 +44,20 @@ import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.SoftOverride; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.InjectionError; -import org.spongepowered.asm.mixin.injection.InjectionValidationException; import org.spongepowered.asm.mixin.injection.InjectorGroupInfo; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; -import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.mixin.injection.throwables.InjectionError; +import org.spongepowered.asm.mixin.injection.throwables.InjectionValidationException; +import org.spongepowered.asm.mixin.refmap.IReferenceMapperContext; +import org.spongepowered.asm.mixin.refmap.ReferenceMapper; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Traversal; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; +import org.spongepowered.asm.mixin.transformer.throwables.MixinTransformerError; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; @@ -767,6 +771,15 @@ public class MixinTargetContext implements IReferenceMapperContext { throw new InvalidMixinException(this, "Unsupported mixin class version " + version); } } + + /* (non-Javadoc) + * @see org.spongepowered.asm.mixin.refmap.IReferenceMapperContext + * #getMixin() + */ + @Override + public IMixinInfo getMixin() { + return this.mixin; + } /** * Get the mixin info for this mixin 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 2f5c63f8..c2849c4f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -31,6 +31,7 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.SortedSet; @@ -46,20 +47,25 @@ import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.mixin.MixinApplyError; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; -import org.spongepowered.asm.mixin.MixinException; -import org.spongepowered.asm.mixin.MixinPrepareError; -import org.spongepowered.asm.mixin.audit.ClassAlreadyLoadedException; +import org.spongepowered.asm.mixin.Mixins; +import org.spongepowered.asm.mixin.extensibility.IMixinConfig; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler; import org.spongepowered.asm.mixin.extensibility.IMixinErrorHandler.ErrorAction; +import org.spongepowered.asm.mixin.throwables.ClassAlreadyLoadedException; +import org.spongepowered.asm.mixin.throwables.MixinApplyError; +import org.spongepowered.asm.mixin.throwables.MixinException; +import org.spongepowered.asm.mixin.throwables.MixinPrepareError; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import org.spongepowered.asm.mixin.transformer.MixinTransformerModuleCheckClass.ValidationFailedException; import org.spongepowered.asm.mixin.transformer.debug.IDecompiler; import org.spongepowered.asm.mixin.transformer.debug.IHotSwap; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; +import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; +import org.spongepowered.asm.mixin.transformer.throwables.MixinTransformerError; import org.spongepowered.asm.transformers.TreeTransformer; import org.spongepowered.asm.util.Constants; import org.spongepowered.asm.util.PrettyPrinter; @@ -82,9 +88,9 @@ public class MixinTransformer extends TreeTransformer { */ PREPARE { @Override - ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, MixinInfo mixin, ErrorAction action) { + ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, IMixinInfo mixin, ErrorAction action) { try { - return handler.onPrepareError(mixin.getParent(), ex, mixin, action); + return handler.onPrepareError(mixin.getConfig(), ex, mixin, action); } catch (AbstractMethodError ame) { // Catch if error handler is pre-0.5.4 return action; @@ -92,7 +98,7 @@ public class MixinTransformer extends TreeTransformer { } @Override - protected String getContext(MixinInfo mixin, String context) { + protected String getContext(IMixinInfo mixin, String context) { return String.format("preparing %s in %s", mixin.getName(), context); } }, @@ -101,7 +107,7 @@ public class MixinTransformer extends TreeTransformer { */ APPLY { @Override - ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, MixinInfo mixin, ErrorAction action) { + ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, IMixinInfo mixin, ErrorAction action) { try { return handler.onApplyError(context, ex, mixin, action); } catch (AbstractMethodError ame) { @@ -111,7 +117,7 @@ public class MixinTransformer extends TreeTransformer { } @Override - protected String getContext(MixinInfo mixin, String context) { + protected String getContext(IMixinInfo mixin, String context) { return String.format("%s -> %s", mixin, context); } }; @@ -125,15 +131,15 @@ public class MixinTransformer extends TreeTransformer { this.text = this.name().toLowerCase(); } - abstract ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, MixinInfo mixin, ErrorAction action); + abstract ErrorAction onError(IMixinErrorHandler handler, String context, InvalidMixinException ex, IMixinInfo mixin, ErrorAction action); - protected abstract String getContext(MixinInfo mixin, String context); + protected abstract String getContext(IMixinInfo mixin, String context); - public String getLogMessage(String context, InvalidMixinException ex, MixinInfo mixin) { + public String getLogMessage(String context, InvalidMixinException ex, IMixinInfo mixin) { return String.format("Mixin %s failed %s: %s %s", this.text, this.getContext(mixin, context), ex.getClass().getName(), ex.getMessage()); } - public String getErrorMessage(MixinInfo mixin, MixinConfig config, Phase phase) { + public String getErrorMessage(IMixinInfo mixin, IMixinConfig config, Phase phase) { return String.format("Mixin [%s] from phase [%s] in config [%s] FAILED during %s", mixin, phase, config, this.name()); } @@ -469,7 +475,7 @@ public class MixinTransformer extends TreeTransformer { if (this.currentEnvironment != environment && !locked) { try { - this.init(environment); + this.select(environment); } catch (Exception ex) { this.lock.pop(); throw new MixinException(ex); @@ -553,14 +559,14 @@ public class MixinTransformer extends TreeTransformer { return targets; } - private void init(MixinEnvironment environment) { + private void select(MixinEnvironment environment) { this.verboseLoggingLevel = (environment.getOption(Option.DEBUG_VERBOSE)) ? Level.INFO : Level.DEBUG; this.logger.log(this.verboseLoggingLevel, "Preparing mixins for {}", environment); long startTime = System.currentTimeMillis(); - this.addConfigs(environment); - this.addModules(environment); - int totalMixins = this.initConfigs(environment); + this.selectConfigs(environment); + this.selectModules(environment); + int totalMixins = this.prepareConfigs(environment); this.currentEnvironment = environment; double elapsedTime = (System.currentTimeMillis() - startTime) * 0.001D; @@ -576,20 +582,19 @@ public class MixinTransformer extends TreeTransformer { * * @param environment Environment to query */ - private void addConfigs(MixinEnvironment environment) { - List configs = environment.getMixinConfigs(); - - if (configs != null) { - for (String configFile : configs) { - try { - MixinConfig config = MixinConfig.create(configFile, environment); - if (config != null) { - this.logger.log(this.verboseLoggingLevel, "Adding config {}", config); - this.pendingConfigs.add(config); - } - } catch (Exception ex) { - this.logger.warn(String.format("Failed to load mixin config: %s", configFile), ex); + private void selectConfigs(MixinEnvironment environment) { + for (Iterator iter = Mixins.getConfigs().iterator(); iter.hasNext();) { + Config handle = iter.next(); + try { + MixinConfig config = handle.get(); + if (config.select(environment)) { + iter.remove(); + this.logger.log(this.verboseLoggingLevel, "Selecting config {}", config); + config.onSelect(); + this.pendingConfigs.add(config); } + } catch (Exception ex) { + this.logger.warn(String.format("Failed to select mixin config: %s", handle), ex); } } @@ -601,7 +606,7 @@ public class MixinTransformer extends TreeTransformer { * * @param environment Environment to query */ - private void addModules(MixinEnvironment environment) { + private void selectModules(MixinEnvironment environment) { this.modules.clear(); // Run CheckClassAdapter on the mixin bytecode if debug option is enabled @@ -616,18 +621,18 @@ public class MixinTransformer extends TreeTransformer { } /** - * Initialise mixin configs + * Prepare mixin configs * * @param environment Environment * @return total number of mixins initialised */ - private int initConfigs(MixinEnvironment environment) { + private int prepareConfigs(MixinEnvironment environment) { int totalMixins = 0; for (MixinConfig config : this.pendingConfigs) { try { this.logger.log(this.verboseLoggingLevel, "Preparing {} ({})", config, config.getDeclaredMixinCount()); - config.initialise(this.hotSwapper); + config.prepare(this.hotSwapper); totalMixins += config.getMixinCount(); } catch (InvalidMixinException ex) { this.handleMixinPrepareError(config, ex, environment); @@ -766,14 +771,14 @@ public class MixinTransformer extends TreeTransformer { private void handleMixinError(String context, InvalidMixinException ex, MixinEnvironment environment, ErrorPhase errorPhase) throws Error { this.errorState = true; - MixinInfo mixin = ex.getMixin(); + IMixinInfo mixin = ex.getMixin(); if (mixin == null) { this.logger.error("InvalidMixinException has no mixin!", ex); throw ex; } - MixinConfig config = mixin.getParent(); + IMixinConfig config = mixin.getConfig(); Phase phase = mixin.getPhase(); ErrorAction action = config.isRequired() ? ErrorAction.ERROR : ErrorAction.WARN; @@ -814,7 +819,7 @@ public class MixinTransformer extends TreeTransformer { private List getErrorHandlers(Phase phase) { List handlers = new ArrayList(); - for (String handlerClassName : MixinEnvironment.getEnvironment(phase).getErrorHandlerClasses()) { + for (String handlerClassName : Mixins.getErrorHandlerClasses()) { try { this.logger.info("Instancing error handler class {}", handlerClassName); Class handlerClass = Class.forName(handlerClassName, true, Launch.classLoader); diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java index 4240a8e8..73cb870b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerModuleCheckClass.java @@ -26,7 +26,7 @@ package org.spongepowered.asm.mixin.transformer; import org.spongepowered.asm.lib.ClassWriter; import org.spongepowered.asm.lib.util.CheckClassAdapter; -import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.throwables.MixinException; /** * Mixin transformer module which runs CheckClassAdapter on the post-mixin diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index 57e36828..32ec4cfc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -213,15 +213,15 @@ class TargetClassContext { throw new IllegalStateException("Mixins already applied to target class " + this.className); } this.applied = true; - MixinApplicator applicator = this.createApplicator(); + MixinApplicatorStandard applicator = this.createApplicator(); applicator.apply(this.mixins); } - private MixinApplicator createApplicator() { + private MixinApplicatorStandard createApplicator() { if (this.classInfo.isInterface()) { - return new InterfaceMixinApplicator(this); + return new MixinApplicatorInterface(this); } - return new MixinApplicator(this); + return new MixinApplicatorStandard(this); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinMerged.java b/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinMerged.java index 28e9922f..9af19373 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinMerged.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/meta/MixinMerged.java @@ -29,14 +29,14 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.spongepowered.asm.mixin.transformer.MixinApplicator; +import org.spongepowered.asm.mixin.transformer.MixinApplicatorStandard; /** *

For internal use only! Contains small parts. Keep out of reach of * children.

* - *

Decoration annotation used by the {@link MixinApplicator} to mark methods - * in a class which have been added or overwritten by a mixin.

+ *

Decoration annotation used by the {@link MixinApplicatorStandard} to mark + * methods in a class which have been added or overwritten by a mixin.

*/ @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidInterfaceMixinException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/InvalidInterfaceMixinException.java similarity index 62% rename from src/main/java/org/spongepowered/asm/mixin/transformer/InvalidInterfaceMixinException.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/throwables/InvalidInterfaceMixinException.java index c1fdbaf7..e7467064 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidInterfaceMixinException.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/InvalidInterfaceMixinException.java @@ -22,37 +22,40 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.transformer; +package org.spongepowered.asm.mixin.transformer.throwables; + +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; +import org.spongepowered.asm.mixin.refmap.IReferenceMapperContext; /** * Exception thrown for bad states when parsing/loading interface mixins */ public class InvalidInterfaceMixinException extends InvalidMixinException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2L; - public InvalidInterfaceMixinException(MixinInfo mixin, String message) { + public InvalidInterfaceMixinException(IMixinInfo mixin, String message) { super(mixin, message); } - public InvalidInterfaceMixinException(MixinTargetContext mixin, String message) { - super(mixin, message); + public InvalidInterfaceMixinException(IReferenceMapperContext context, String message) { + super(context, message); } - public InvalidInterfaceMixinException(MixinInfo mixin, Throwable message) { - super(mixin, message); + public InvalidInterfaceMixinException(IMixinInfo mixin, Throwable cause) { + super(mixin, cause); } - public InvalidInterfaceMixinException(MixinTargetContext mixin, Throwable message) { - super(mixin, message); + public InvalidInterfaceMixinException(IReferenceMapperContext context, Throwable cause) { + super(context, cause); } - public InvalidInterfaceMixinException(MixinInfo mixin, String message, Throwable cause) { + public InvalidInterfaceMixinException(IMixinInfo mixin, String message, Throwable cause) { super(mixin, message, cause); } - public InvalidInterfaceMixinException(MixinTargetContext mixin, String message, Throwable cause) { - super(mixin, message, cause); + public InvalidInterfaceMixinException(IReferenceMapperContext context, String message, Throwable cause) { + super(context, message, cause); } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/InvalidMixinException.java similarity index 62% rename from src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/throwables/InvalidMixinException.java index 447285be..2d87c77a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InvalidMixinException.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/InvalidMixinException.java @@ -22,50 +22,50 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.transformer; +package org.spongepowered.asm.mixin.transformer.throwables; -import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; +import org.spongepowered.asm.mixin.refmap.IReferenceMapperContext; +import org.spongepowered.asm.mixin.throwables.MixinException; /** * Thrown by the mixin validator when a mixin fails a pre-flight check */ public class InvalidMixinException extends MixinException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 2L; - private final MixinInfo mixin; + private final IMixinInfo mixin; - public InvalidMixinException(MixinInfo mixin, String message) { + public InvalidMixinException(IMixinInfo mixin, String message) { super(message); this.mixin = mixin; } - public InvalidMixinException(MixinTargetContext mixin, String message) { - super(message); - this.mixin = mixin.getInfo(); + public InvalidMixinException(IReferenceMapperContext context, String message) { + this(context.getMixin(), message); } - public InvalidMixinException(MixinInfo mixin, Throwable message) { - super(message); + public InvalidMixinException(IMixinInfo mixin, Throwable cause) { + super(cause); this.mixin = mixin; } - public InvalidMixinException(MixinTargetContext mixin, Throwable message) { - super(message); - this.mixin = mixin.getInfo(); + public InvalidMixinException(IReferenceMapperContext context, Throwable cause) { + this(context.getMixin(), cause); } - public InvalidMixinException(MixinInfo mixin, String message, Throwable cause) { + public InvalidMixinException(IMixinInfo mixin, String message, Throwable cause) { super(message, cause); this.mixin = mixin; } - public InvalidMixinException(MixinTargetContext mixin, String message, Throwable cause) { + public InvalidMixinException(IReferenceMapperContext context, String message, Throwable cause) { super(message, cause); - this.mixin = mixin.getInfo(); + this.mixin = context.getMixin(); } - public MixinInfo getMixin() { + public IMixinInfo getMixin() { return this.mixin; } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinReloadException.java similarity index 79% rename from src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinReloadException.java index b9f45b33..f35e3118 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinReloadException.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinReloadException.java @@ -22,25 +22,28 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.transformer; +package org.spongepowered.asm.mixin.transformer.throwables; -import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; +import org.spongepowered.asm.mixin.throwables.MixinException; /** * An exception that occurs when a mixin reloads and does something it is * normally allowed to do but isn't due to reloading restrictions. */ public class MixinReloadException extends MixinException { - private static final long serialVersionUID = 1L; + + private static final long serialVersionUID = 2L; - private final MixinInfo mixinInfo; + private final IMixinInfo mixinInfo; - public MixinReloadException(MixinInfo mixinInfo, String message) { + public MixinReloadException(IMixinInfo mixinInfo, String message) { super(message); this.mixinInfo = mixinInfo; } - public MixinInfo getMixinInfo() { + public IMixinInfo getMixinInfo() { return this.mixinInfo; } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerError.java b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTransformerError.java similarity index 96% rename from src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerError.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTransformerError.java index a0f81384..103e6660 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformerError.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTransformerError.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.transformer; +package org.spongepowered.asm.mixin.transformer.throwables; /** * Error to throw for things which really shouldn't happen diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java b/src/main/java/org/spongepowered/asm/mixin/transformer/verify/MixinVerifier.java similarity index 97% rename from src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java rename to src/main/java/org/spongepowered/asm/mixin/transformer/verify/MixinVerifier.java index c1af764f..3e0a93e8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinVerifier.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/verify/MixinVerifier.java @@ -22,12 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin.transformer; +package org.spongepowered.asm.mixin.transformer.verify; import java.util.List; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.analysis.SimpleVerifier; +import org.spongepowered.asm.mixin.transformer.ClassInfo; /** * Verifier which handles class info lookups via {@link ClassInfo} diff --git a/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java b/src/main/java/org/spongepowered/asm/obfuscation/RemapperChain.java similarity index 98% rename from src/main/java/org/spongepowered/asm/mixin/RemapperChain.java rename to src/main/java/org/spongepowered/asm/obfuscation/RemapperChain.java index b0aed8c0..411adcdb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/RemapperChain.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/RemapperChain.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.mixin; +package org.spongepowered.asm.obfuscation; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java index a8ba90b8..86891539 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java @@ -28,7 +28,7 @@ import java.io.File; import java.io.IOException; import java.nio.charset.Charset; -import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.throwables.MixinException; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/src/main/java/org/spongepowered/asm/util/ConstraintParser.java b/src/main/java/org/spongepowered/asm/util/ConstraintParser.java index 23a27b8f..4ef7af17 100644 --- a/src/main/java/org/spongepowered/asm/util/ConstraintParser.java +++ b/src/main/java/org/spongepowered/asm/util/ConstraintParser.java @@ -28,6 +28,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.util.throwables.ConstraintViolationException; +import org.spongepowered.asm.util.throwables.InvalidConstraintException; /** * Parser for constraints diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index 1bb3aa92..81603529 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -48,7 +48,8 @@ import org.spongepowered.asm.lib.tree.analysis.Frame; import org.spongepowered.asm.mixin.transformer.ClassInfo; import org.spongepowered.asm.mixin.transformer.ClassInfo.FrameData; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; -import org.spongepowered.asm.mixin.transformer.MixinVerifier; +import org.spongepowered.asm.mixin.transformer.verify.MixinVerifier; +import org.spongepowered.asm.util.throwables.LVTGeneratorException; /** * Utility methods for working with local variables using ASM diff --git a/src/main/java/org/spongepowered/asm/util/ConstraintViolationException.java b/src/main/java/org/spongepowered/asm/util/throwables/ConstraintViolationException.java similarity index 98% rename from src/main/java/org/spongepowered/asm/util/ConstraintViolationException.java rename to src/main/java/org/spongepowered/asm/util/throwables/ConstraintViolationException.java index 3c3a8e8d..581b9a0b 100644 --- a/src/main/java/org/spongepowered/asm/util/ConstraintViolationException.java +++ b/src/main/java/org/spongepowered/asm/util/throwables/ConstraintViolationException.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.util; +package org.spongepowered.asm.util.throwables; import org.spongepowered.asm.util.ConstraintParser.Constraint; diff --git a/src/main/java/org/spongepowered/asm/util/InvalidConstraintException.java b/src/main/java/org/spongepowered/asm/util/throwables/InvalidConstraintException.java similarity index 97% rename from src/main/java/org/spongepowered/asm/util/InvalidConstraintException.java rename to src/main/java/org/spongepowered/asm/util/throwables/InvalidConstraintException.java index 2e6c1ce9..9e821648 100644 --- a/src/main/java/org/spongepowered/asm/util/InvalidConstraintException.java +++ b/src/main/java/org/spongepowered/asm/util/throwables/InvalidConstraintException.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.util; +package org.spongepowered.asm.util.throwables; /** * Exception thrown when a constraint declaration is invalid diff --git a/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java b/src/main/java/org/spongepowered/asm/util/throwables/LVTGeneratorException.java similarity index 93% rename from src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java rename to src/main/java/org/spongepowered/asm/util/throwables/LVTGeneratorException.java index a9bc5348..012bac11 100644 --- a/src/main/java/org/spongepowered/asm/util/LVTGeneratorException.java +++ b/src/main/java/org/spongepowered/asm/util/throwables/LVTGeneratorException.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.util; +package org.spongepowered.asm.util.throwables; -import org.spongepowered.asm.mixin.MixinException; +import org.spongepowered.asm.mixin.throwables.MixinException; /** * Exception thrown when something goes horribly wrong whilst summoning the From d83548aca085f3c480c27ea5b3e4dd7aa46b848c Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 24 May 2016 17:19:48 +0100 Subject: [PATCH 158/169] Mixins is final --- src/main/java/org/spongepowered/asm/mixin/Mixins.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/Mixins.java b/src/main/java/org/spongepowered/asm/mixin/Mixins.java index ccedec09..397f7103 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Mixins.java +++ b/src/main/java/org/spongepowered/asm/mixin/Mixins.java @@ -40,7 +40,7 @@ import net.minecraft.launchwrapper.Launch; * pre-0.6 versions is maintained via the methods on {@link MixinEnvironment} * delegating to the methods here. */ -public class Mixins { +public final class Mixins { /** * Logger @@ -57,6 +57,8 @@ public class Mixins { */ private static final Set errorHandlers = new LinkedHashSet(); + private Mixins() {} + /** * Add a mixin configuration resource * From 76856fb41e2a47b23a61416bac1dd62f2d5b8105 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 13 Jun 2016 21:46:11 +0100 Subject: [PATCH 159/169] Additional flard --- docs/images/flard_00.png | Bin 0 -> 39517 bytes docs/images/flard_01.png | Bin 0 -> 54171 bytes docs/images/flard_02.png | Bin 0 -> 73082 bytes docs/images/flard_03.png | Bin 0 -> 34849 bytes docs/images/flard_04.png | Bin 0 -> 40083 bytes docs/images/flard_05.png | Bin 0 -> 40410 bytes docs/images/flard_06.png | Bin 0 -> 29581 bytes docs/images/flard_07.png | Bin 0 -> 41110 bytes docs/images/flard_08.png | Bin 0 -> 32923 bytes docs/images/flard_09.png | Bin 0 -> 37930 bytes docs/images/flard_10.png | Bin 0 -> 19125 bytes docs/images/flard_11.png | Bin 0 -> 77637 bytes docs/images/flard_12.png | Bin 0 -> 34684 bytes docs/images/flard_13.png | Bin 0 -> 36426 bytes docs/images/flard_14.png | Bin 0 -> 59703 bytes docs/images/invoke.png | Bin 0 -> 69023 bytes 16 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/images/flard_00.png create mode 100644 docs/images/flard_01.png create mode 100644 docs/images/flard_02.png create mode 100644 docs/images/flard_03.png create mode 100644 docs/images/flard_04.png create mode 100644 docs/images/flard_05.png create mode 100644 docs/images/flard_06.png create mode 100644 docs/images/flard_07.png create mode 100644 docs/images/flard_08.png create mode 100644 docs/images/flard_09.png create mode 100644 docs/images/flard_10.png create mode 100644 docs/images/flard_11.png create mode 100644 docs/images/flard_12.png create mode 100644 docs/images/flard_13.png create mode 100644 docs/images/flard_14.png create mode 100644 docs/images/invoke.png diff --git a/docs/images/flard_00.png b/docs/images/flard_00.png new file mode 100644 index 0000000000000000000000000000000000000000..c92ca86a728c2a9c4eb8e092bafa7805ed3d2ecc GIT binary patch literal 39517 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 M4bsynxo;ExU-SF|7XSbN literal 0 HcmV?d00001 diff --git a/docs/images/flard_01.png b/docs/images/flard_01.png new file mode 100644 index 0000000000000000000000000000000000000000..74b349a57b45ea9d03a0c333bb6ac242abbb67a3 GIT binary patch literal 54171 zcmbTdV{|29zdd+jt7F@?laAA|ZQHhOc9M>5+eybAcWm4CoWA$IcV^c5ulX?bOy2>YHn%APjc1SOG0F6!cU^kF3TkAAYy7^De2{8s_Z4FV(evY%xyvK^j}R}tocd)dr=y)3Pd9IPNqcc3{3RK zOdL!^9Lx;NtZbZ|oODDiOw3G-Oe~DdEcDErJgh7{OiV=obC3XMb22gGQ4$sZpSgfn z{3I4GE)G15jPCC44DPH9_D<%E%-r1E|Hfcpp$E30clNY%G4!Cfb0+=I2%@IW#!i+F zE|&IoME^!KG_rSf;U@vE^uHg$)ilL3Dy|JsU zsh!IYQGOEOHw-40COn*?%v>DeEF2X7R@Qn0=(wn<`Q8d`JcWf|9^Ij5x5w} zf2Q&OFqQw@0@~ld)BiPm;Kl#Cj;S5cUz~uB5s``Y3jmm&{2?l&;<0+34dsEi@bch3 z{zy~ZG*_XnotCwZI}E{uKM$WD3NB2P03hB+BK|H(6oR}h9WWzpfyg|BzSg$8X`-EG z^RVf?qF3T$?p7q0W}+R?AL>mYczb#N$ClOE|Ek^DJnWm8BJd^tJMIUgC}h9?_c=i3 z|NSZYKQ~+!BlxH6`-zqoPT`-qqY5OYQL;6GLsTn@ug1VnBrFnY8Q2uiY|$tv!PlNYecrv&X%2U0>Y0>8AZ*wXgGXD4Te^36i;CoV#Yj+=&(Rz+jVV-7o-pM&` zgsceQaU6r@eVF>w^tD$=F@ekpZ-nW-l{Anlif@_~o)wE;FBi(6-RgqV$C5P4(dlyY zn;3{cRTP1E8k+2UfzOsk8U74|6SHtAW|$0k^PAdL;dwO?$J0wU9wytd?0$FJzwI(_ z2dk;IUTrD6QEK!Q9NY09=-I~{Pqdojj<~f|@BmvgI>~8VNncYB2{oOU9mdslmh&Z(S)8Pu z`tQ4#*x1;mb(hEKR@TT(0U){zx!PA#qRW^O*9qH~J*VZty_t(@o}0)NRs>K7UsipM^8juoSMBJPAPMJoKEJ7qcIs77#T;BfIdL2T;lU` zkZx;hyG7Ff{_bPrU8S$Bt^M`+)LU9oGL^w9QM;78+Tq>3+52%}KP~w6-e5YRR->~r zI~y39Oet@si9sAOaqx;^>Gys!;{AA@CPne=E6=`T4qt({c@Ryf1kQe;??avk*u|-jM+F=m|>QdwfC=V zl*8lk%mO0Jh-Pxrl9({%A^B|G>Y>!|ARQ(O8o6zV4BzMSu9mXuMwp==F|x99qbcPp zxYV3!!EM-MD?y{Apb8BYiYKTF+lP-~Z9mc4hfcF96EGPaU>@1pRFPNC9Me?^`^_82 zqO2C#)fd>+h)B~^&593x#$ebSKfOs+!gka#T2qQ^=(K> z%lsH3j$bNPvy?ktii`+jM0T7j`VlYq$rWT10406y_Li!y*KRVF#6$`76%M;~kLT;1 za^+GzhkgjIHyRomHXK=5S%j{0_9dO<)YQ-gM0}nm-?zuEF23M?hpO{B7@b4g){RHq z@%6udLr4~umI%2Vwv(h85)sI|&ZE$2w>2^8wZIS2(a?&Di^pP)xDZYBY8tvqZ`A zF8T=)^wXlUyR);qrd&xS!jwInJBJmQq$&+7%&efwt*UAX2c&3ykaruWk(Hu^GQP&X z0(3}-%b=m6rl};KZ8PT^ZnlP+FP5Yl^@3fzv3@^Cnqmp1IoO{7uhE`HS6S7E$py{w zJ&B?i2)G;NXLxWH{3(X+#ef5+TJX8SEs39ncr|u$a0Yjaal^xDr$x^($D?h7LvL2N zG>VW+J>RH(=&j-AYAZ$2Pu!}m3p5c`D)YqDiz8b zg`7zFy~%ha&OF!Gt;{bDv@Wm@Xg^a^a@c+Oce>~P#TaoI)FZ>g0{1f_rlzK&mw`|O zZJ)1aDByrU)BI0(i$ct447xakgh<~e)^-O!Ki=%SZiYcJHk~HuspOxn6%|pUGPAOz z5yf@`4v6)oh$GrNZ>6GX90)QeOYRtW)GHT8B`D%1SMJP@o3soVsmXgf8m0~$!p{p$ zP$^{yc<*$uj7o~is!9qT$Ilq0r)5CO{#rf6(R;tj3-nRU{UwV65lW;Qg+-=VR+cD= zg_u~0`E~KuV{>IC7bQKIL~06EFWg#az52|JlS(m+qpqZiY+64wQbMG>y>fDz$$O!c zy$CJf%FEMt8?!$&(LMmky+ zHkvqBVG^}v)KWk25_9-qapzp7;?^G+)HxZitFvQSDRm8+my1}y-=&JBw%f;7jl5lq zinwWzGrdDY`waj>!wzQFs3-{fM95xW{$Fofe!YY?0fV?*h&uLOUOWbn&hQmu#=?c- zv0mr(BY21-z&84T^9}c{j{`=37@Aiu8 zS(74hi$S)H=F?%;Bbn2DckuAc6#={bdBKH5oCSe@|Ekb^?M5>uL<|}I`0)d~ptjHw z&G_MTp-e?dY0lp7E{izp_(<@J+lIdYwOTFu)kwB<{$)P*^FGJ>QiyqcV#4rjCn=p# zKW@8yJ;@qFTnCQ0@I44qvJD=@i2T!+Oj_Ac5OR}Qq;L4Y2!%T{o8w0 z(!!Z5bi|;@JRjzAho`%*ESTiR++PgS=oEQL=MZXUa**QzAq1L68dDXOkPyyLi}-jL ziS+IhDk}dz+I-p&HXFpx{;!MG-oW%Un9n?NGmkk;*=-m%S{5-JLKgugkrk>jw{uw3V?T;?iEMQ1M@#kGxvH2r64)htQq zXX)_~G!P5dH#fT8wo8sBy`6kY)GE*XZ=<_8A@I>fBwNjXq&s65S+i+uAA)H8R1aPZ z>3{~M)YmU5+6=#g>W-yvMl^4AQBEHnG=$=6iVYARNH6T0lLQP();^;`grY&*_-t7; zQiUCQCia^bB-8iVtTtIbZMYL6nmsQuWxUR#cx<-V;$B1E!9q@8V4wFxC6BorWxIoV z151kU(ZU@?yM!#HRi2aVOD1M!Bq%dy8V8XP5t1@8zsEx7L9*bvGh^51=jQe!(E>=) zQqs}}PHHq8A>&?tIZuI*B8A;AsOy`Wn-4aUgkk-P^9j;-973nUn#1ce^8^5Xe*j-` z$S??_;Zv#GJg%?vg5C0V!mjJW@532TxNm_M(b8`F^OR(9VV6jS*Eth ziw9rxa-Vq={MWBDa^KX{O9>+?7MSSceK0J(h}c*JMvy@O5|?5|IZrlX&E+95?cUEx z-`(Ar_JFbyDSMz+q2l9r1H&*1sd%5u?pb|T6EL_Z2KruV$UMjz{KCgCo_&DA86_aZ`Zuv|Nh7U>hT&ENf1k>wh`*-qJ%hoGcIFp zl;1rL`&>^)Q`w!sp9m6!zGx6&h=#|8K9gpwRUA>^Z;0}IT=-#zb$I0u`p@gm(}t); zFRRwI8yWcafy0uG%C`rl5vEs&GiU-k*JLkf`XvH_d& zf*<$&P=x2XpTLUJ))nZjNCMB>8Rj{}5~LswjHXZ^GC0?&Aq;EVqiemCNMsgP z7M7M4KP2lWIH^L_5}+d5eiyaeTV7qConK((dW4UKkzQ}myl@x<*5Yq) zEmvc2<9VDQVgbix_cwO&sA+8Ge_gy~oZRIl98G&xY#_q>&XdO9?Ib!UaWGNQ?VEp} zPi$qH$fFiblnM0Ni=O@jVWk#UP3l=KOtw0mc*L}cj*4*g&fbWVt0c$iU0g)(^ks;q zuBa|V=?_%258FXZ=j8WHnb^qA>K($suT`@ARdYF2vsiTxGmFC9kO4UxpR%7RnIq3M{%1+xXaki3=I@JzzR{$K|T~3G~}{mO4t_ z?X%im0^0kn)7uF~LS8pI4v>)7tUVCnabUf6?M`>s<#~7bC!-L0W5N0DqO~yL`-!qV zzpAn_DX!N$o7tbA>3Uu;vw(4UXKoW2K@wpwVtnJZ?(?ZKXv4KJ&@Hwk)eT|n4 zK67%7=s{wZ=ezk`?{{Y9{>m3PfAXVu&Qxi6>p4WDaAk%Ufa~>>gfZeKvYzYgThh6% z?nbrjMZKH$)IKv$H^ZD2h)ZDRvuLMMH5x=>L3z`?N!(E-?b*2_bK{{5yH*TLHZUGLl z>c3htiSU&vIyUZ=Le_Yx+{`8oy(Rc9QO)EeyTd$otzdM2rhb{Ul8>JeITm5#W&;Fc zam>u+z-H=VReA1&AY?=(Jk8}Vqk|Nj)ZZVnd zlXJoCrv}#aBb5Ux4L%*>@QyghxP!jpOvM?=z|hO{$!=Ng5*eN1BO_t7ow-ThqqN|; zci=Wa7qJx*%Muhc9TcY^R{G5c-*#!8u$^f4LA54mL)MgY%$iNczKOzX#I=Fb0a6E% zb}ejd-p};EIxJ>MLKycI-g`RAjS<3)98DFC)w7(hMQG%zEi#kLKj68X4Przvtu3*+ zZy}@=kJ&SKv|R=wM_sSnS*I1#(9Xc*(3?Z&oeo25TB7oO#5_^UoiR<{=ku%g&ni-u zpGFbuuQIJIe6?~67Pbs0UcxXRzi75n=zK3b;n!PxQvANwp?=jk(UHh*7Zr6(AQU{m zs-h|plQD#P#4{C?R}-jt5C6U^ATcUBu@q5HI91=?gdJ~AQ$FzY^SDJipV7{xg6l(UzbNO?3HcWeK0=y8R@9zi^0`ZYohnQNU zUQBd&e1B2x3k3RwjW|RuMIq?0JM_1(X!LGI>El)nxpxa5Db$dm{*&mD*Vl(b307Vm z1IIE>{(B^%BDCNAkeNjV|p-0C-2=x9)AL^{@V(EN%;i01Y> zHn)~y`XnR;J1-fvFFXd@nO(;*faesL7{!M1deYJmGrk;K3y}Om(hIfd$#0p~kJaIE z5P_{ftCNSPlpbYINdD^p2*Au)K7fUlOs8E7H;E5Rx_^fmaBp{@om5jk6ER-hXNMQv zO6S3Uh_xlRN)=$YD-hhSvEnH+`FjGRtZ|6j8{2nr=GLZlp-9>zay=eCoZ#gxrw0wm zEg0wDEHyGSZl9^;s+==q(TZg>K#4XDrJ;u30`i%cRe;s3w1j!-b8|&r>9iKJ@t7 z&L+ForK=RoSA%TaJFU)&xV^0YuB266(+6+gz)dKjxA&>r*Y3&egIo3Z+R_H%*79yT zY!weRPBG3o&j!uMp+++*yyk^y*{`G|qFQ((}6%7gWz!mWaLB zNa}VBH7kp=%9Q?MvAYH0GNWBwly@Y}QeKj-(&h&(T}TM8Ws#%|^_j(QKdGZK1#gb* z?A1;8J{@>0mJj2cYPW>qWOf50Bm6>=2$}}q0+Gq42Ku2Ci7T*T)ogE|_%AltjRMl&)Cx6}& zrw+lsA|oa3Z5U(OMi4UWCFDQSx{yd@9lztZghHG*-~#zc}buIV>a zRGa{&?<6%VS#-EQ2+|ZYU0N)pVLwwBEij{-?>cvtloR+h{Klt)`d2dq@MnUuuh7dv>f4(nJ)OQtg3U@X}{$(qOL{+&^4x|op|tKTz^ z?}fpJfpvU*#yzn7S_add8V+kQ;!>xpmx$+6=#rW|#gOTQBhs(GAbhA6V@|Zx*jfLT zr5JXtVP`8HC}$1hzfcC>z>MD|Z>VRRSgv?jltAik%YU!vI^XYja@6>zj)8kH?+BxI zR4#jPMoL9=*uIF_PJZVog3_ouenB*`kpRNr9aCe2e=*r zSYAA}19{P1Hj7|4v!r7$|FvU#*IflOCl%HwG$)U2V^5xy8uSXkXDS-&8%V66pvo6A zFl9a#UVUpV{~oU7PZWp%4TESsO9*#mT{FWfHxGJJ1t-@Lgvg5dw+_pmfPLS}PFWVy zuF<>8FHa@XZ>61l_}X^@A=uezzN#U!o9mi858Q4TbTHuLBiLTyQ7))_vXS{k%QNZ~ zBMUxlMx+X{b2QlOKJ*^c+8P=%_I<^wStTaAiRwLbBCs3H5+bRr_D4UFxsTG zHny@8`EaG18*BQF<^SMkJPz7g>y|Fc5zVyp(k0^v`vix2uNj~cND7e zh+GyP+n$jn()-OA2FRDqRsxW8xg<0me~Rs~ zFa)d&_0mpx&Q!HxH=zVD1O7BvWs7&nsulnB0@K$A5sQmtHpYMcPT5swyV>*M){)H z1Tb`(0@4>R#7Rxbr*RtC4Sx%*?`CFy7a)PZM%Nz%gQ3uE5Q4=*|9KbI`GN%q~aEh{>p`ed?Y3r zW!c{bFe($9)yDd@7uHhnc)5DLZduxDJb8&}C<0c+Z%?= zCSOhZhMF-32U4iEJ1I7Q$xyvjXu<~cnD9-)ihw2fEiPJXV8*IG^awmEHP@ftvrEMc ziV)=fDt|89OrMkZxf`7CIkd-$LAG2J>SldN&U$HmQWets_h|zT*LpHw%l5QvCLI1| zv?!y?<1fCiFKvqD!mx_v6dL+IT4W0|QOA&le01S+-l zCS)>49)d=QSeKAfxOf+n)+;dn*a9+EG5@bU$p}1+uQc>9Re>FMs#y?1A zH`PNaR>et)5-2tLm6Tz51Xe>lgwdS_BXAW)(x#%ySJVyjyXXfZfVum`xCWuLL^Z3B zL`k(O?VgEpgc5I_L~=UF?$qL97MGm{LE49DHiJBubKCKC`q*4(sp*iz4Wl4ewsks& zjV#I6D{bt=PQUxD*by7E&)4rvRLaVopk_TK+0)VMy(n3mFAmA4{RmxKlqRO93tY}? zqW_C2#!6~YI0VxK$uAyJly^Z<(nS}p54t% zW%y_+F#HgzG+%h)UBxq-4{J>QOf(llwz9ISQmd3J#l0rbFCZotyxr|Q*5*UB`DtWf z`geAykZRRRipcvS9E=GlDnMckZ(X=JQ)zs)kcJe?W>(G?Q{?k`W|E!XSy~*gEu`d4 ziLj7NlmIf~*>0zf?BLwBLb#@jLphq{;Wwd3c2-tAF2^&Q-QG{M0kQcJLjQLz+NRdlLMt!~0wCW9gpWSnw!S`r0M8gxZ~|i5M6N!N z(&4@8YHVqFOq3w-1fmN)&%4orUoX?6aMxgWIUc((er4*7Hk)18lYZ}@M@L8hs2)j^ zz2VsT5?PUL_V@8m;E+8phgpi}#nS1ZxwT!luvURVzR_-jJv~P`-unTC9UZTiomY@y z(=h?5_wJ&irKv$(j4q^6O0@!w`d|{_MG1O-Bl+Q>s>1Pv=;-LEsHoW3mTWljf;bOvV7Jh*KjG)n)6+@&fdnG=2oPcdL^5jB5p~6l?3LHn z#z#l9V!<0OK~EPgo!xMf7#)|0kAe8v1hG8nM|^JBwOX@v$2Wc_4r~RY97S$;$x&KG zB_-qJDYBGv%;99UjTW;7{lw5w**|}lsYpE;v2$?r+zjIaxeLT4P*4iSj^hH}%Qn)k z{g0=u@YJr0mbL5lvNGtI4~gEO*MDQSf(rMsvkUb=TqM{)Uz;wi?rCUqME@MZM{Ms;HZLagNaM5s zuH5+91IaD#)Fv^2f`lZA4Eh(56Ps9L%;9-i;=1>^|Lhe|L1*2p<&vjXiOx41PMpgI z&~`qa$^VBC;-#ho3jQH_zE2yN`1lAeA3&S(zV3$tk-TpSAn^;$29*V}h(kaZF@kwc zOip%Q(sd_RekY4h`~;dKA*bCs5E+8C0T3L|&rXm+WXo}4ePir>XVJmOa#&DR&({vm z`nn!Os#g^f0vUe?+9p1?6SzULc`k9Nd5))<1CIuf?s-8<2y-ow$++zULkhs4B0ELw zBKG|$2!M}6&OsM&dUZL`Oa&60+o+OY(ojy@O9vC_r0zwKK_pLEb{&?xzau3pfIsN} z{?>1*kRsnWgp>bg;^XaEG885t?iP(J-%VAlfOwV$NLHSt!Dex~UetmDM-z+|lIzQf zyg!fU?S4}eTb}#dXLg(T(N{Rm$YGB(N`xF;n&7gf2||9ZuY%h=sDVncM(^znI5B9}&1 z%3F3iCbEz2(0AW(&2thLzXBI;BK!0Dk2+uE>JCzw+d@IfR@(&^WCW*z>7zU{Lt-X7 z$%xx3-M>HR9q|NUdujaS{)z6=&-9y!+y=W3@{7$tRzs%mw!AdQ3#i$c-7$jU5ao;# zz|8%JBYXb5$#&laK_~D!&L1K0hTouFC;LU{rDuTK{pfj=9qzj6_h!3dESt@Pz8@Su zm~?-CPp{n)@csB8abUZkMyLH-C=m9e6siJxH)7eK`m(Gj{6A7((QKJrL+KqngzxM9 z&OpQCZ)>lK&2$DUl(y|^6E!C%Wr!raqt7{c$WV=eTyDGf=P+ zCL{_Sgbd~Zg_98D;`g?;C2%`RN-FW#W4!}ZD?n`yESYlJ zECUEg1HN+wJwlxWr7Q!2A1Cq=;eB1eQ0V*<^>XGp;urF7Aa;qmTvt_PbIoJb{0gL0 zhHJ}+R)HxXzp1wS5hoKg96XMM4NVL8kYHz^*8ju$Tw(=8#L1%-2)sI284t%`3;K28 zWg|lYb!;wpdO5#3KfenpAk+n>hTz|a-FFKtAkuMrToZi`loS;e<)!msL@L62%AivP z`GTy?z=7pDSZ*`eNGieL!L>4loL{GvwF-4l zTmFO;bjZ+sk03VcI*t&q!RP|7$A!Ot|7N#d9Q}kB{OJ99`U(gnK8x;Bkn;(s7B#$V z+e7@Rz73__FFIa=EtuaI!88C?2Q-9BpzjTI*hR-7~3f&Gn!tWnzTc2U4@SY<$7(iC9u-XBdnA9@} zoha(tF6}vECXNtLJC(336cPBUKQ=rtK0bcE6iS>OM#<~g2bApPZ)?ri5A^hr|6N)d zv~hKJpAhlcsuZ5S!8}O(W9a&wIR6Zs51B9^j>_EMX0Wrbanog9*1`T6){eNyk z2G`$seekE>Q0h6TUPss@Ty#JY?X-C5ED?<_SI2-ZCMqgOU(}eObS0fmGssQ+9;~O} z0XbbJhYuSP2hATy()Jx*XR7OY7TZ+4>C5(g!p5T`VTWI=G@4&0i2J)+Ghr!syo+TF z%0|(IBo8^lEfyS@Pv^v<@B3sV?9Zam35h$g^AjN9wDf-2Sy+5$!}!PDscUF>;N+D4 z1_6ppbV---)RmN!bafH5^5UZrVKyOjalO{|?z1R|K!Wv-vu6hjIQgc&H@zpnV}^o< z7+4srDolO)9s?O7fELlw-LzouaY1w)a%I0?zIB>JYCe!u0__sAhg-tU0SD(9AnO7E0skv-30Vd!)^T&TMQaFEYNA>jNY zVq!wpMBo#%vk`csdv9w$CJ7Z_85#7o@f&U?#>au0IGC>wpsd9Z9}nHaE#-PNkrY~a zcW-adxP1ngI$(t-l<03-Xc|1}AIg7J6?^(~tIcL+40 z1d!I(?O>$cTAk7B=V}r*39qNijb&I495!JLNsKqR&=l=&6N*^pq9G_lLqmw+q}0?u zhGAL;td=L7lq3leK;Z=ZKi`RwzRjQs!Qg-_{GM$9MwGuz6%|rFMX@YfUT4)i6UAlf zz;bf{6a2dc8yiIsZWEXVX3rnK?-tVtxEuz9(hTkUTqsydKRIkO*X@=W^GInTpaE}~ z2V-Mn{X#(`lRufkng^%EN|r19l?%!0-j;=&kEVuDf=-FP_unp5s)O~puRBUCqZ%Xq z(?W#L)CVOg7aRA)2&L!^&n&N;GW~4EslMgaPbq-NEDi-sbZYdAM0P2?dJp&3h8^z{ zg$v1#gJb(9Fp~%rqW52Up{FQ$==!A(x>NMT^q<($+Af2t#LD$ZR=z?ea~OI8cPP3? zreun#v?xckAH5oAQj+#$xU%={eP9M*eyBG>9;>HJ5K{SBVNYWAaLHaJ=L*Y=%Ui$< z@dY)3f&dYr=Y7%4x$ZFNE{_2CeBO({>Nu+bL77Vk(jFSOUaIlEpOrvae7~;NRZ{v_ zs{!M!~FYjc1u|58g{E5f{)ygtsp8^`<6&Q-c8WiG_iXrrzSX#Xv2J z1-J&5#~w;;x4|$u&0l$!NJPQ?*S}Ha@BP0mx}(Guzg>3PKcAaxJ_3tZUb;7GOIxgC zU`fF*qc3J5@Z!3p%L%lF`RneEty(Y)bhhg4hd`d-QsJSezGtII$yu~pa$O3=T1^Ce z8ZHX(K&5NYA@CLGaE`&ksF7J=>Ja<%IC3HJ)B)bU7E%Hg4*>KL=`hwfZ2&5()dH3}%JQm8jFjZC6K0Pn5*Ybi|I?uQoxzgat=CzCZ`uftH$#h^o z;|>suntj0~*?6J5I?r|$OVmp_ZmUT>b*}vuMs1s?Io8R8u-8@5Hsb=~bdRSzIXRh~ zolTJp0}v?oPLPt330Z+~hZ01N0t)8C0Zb8E(3SVW}!-jL7jot$pVo3q$tpK@2Efpt!h^5NTcPo{x&NM`^B7>Sr3 zgw%aCa}}}(>rr(LANvvm&1gMalaGMDghaScb7~VL%4|GlU%|fCdSZZG!g_ZT6urvMnk$A85t=nxhOUEM0=%(^ME^d!JbSuRRp->Uu zzvAg>NsvWKt$b+3uT=`A>i+- z%=`HQil+u`zbS}cg|Q!+E~wRNH1Ag|<*Bk$UdY7w*!_6`?l`!O!E5)R8Mf)(w%hKm zmfs{3Q5%daTW(^N#Y5ol_`}v2YW~VnR3r=>%zfm-etu+EE5FmY%gWIG5N3CsX}|YuQ6l$u6CD7q7bPvC8;=6?nh?rYSmUZo-^&v zB1+0}J>}{o*vRvgs+2^{-s-&f`lWOTG&C9#Ree00d&?AL?RuqMsh92wwuw5Rmxy%&ZL#sd2Fhu>4Q`-B8(ETRN;!Wwf4s5_p8l(G%B)H z;Z=yL`$MjBC7g4_a=>US_BCz7ELJ``9@gnS)7G=NnVvM+ zh~XDU$J)u5phib!9tp>s%KW+^`&ns>6v$7`3u?MDi$8MBxvT>CT>%%B)|czQw0Cb_ zC{4*@W#T4j%QTw#{dY&n3Ngq`%wi`1R)`pCS2Sf!VmL>#Qw^E-K~w|`)oc1X+8Qen z&0(ikCyNY6`&B7l?q9Cx2)0i>*N$pYzK{2_K(19Ep9&p)cl`$`YmyO{zr)8=Q27e= zb1EFT;?FcWbMN@d_QKM(j+b?q4CDDd>1eAo+tuFEIOyFaJvw5;bUB=E=@swe z@8bY5I26Y|2~Sih_&HEYU!1?PgV3PGy&kXKTiy3COn3dO{JA#crYhs+0ve6i`Tj?# zi|DGHg0HVEp>lU~lv$fv_4ty$2Y2+fjBBS4P|nd-cy{)lB4<4XnYXWM%c5-y>4G0o zhGj^Lmww(uZsLVCW%l0JL-MdRXCFc}O*IJqaN}o*#?s-Wtz{i~1t1ug2AUhnS2eH> z{Tt!5xnAbz!XdsA6`xlJ(`y~N1peDtq=O_zF!b1j4ahJp{PwTNjtH*e{RQ>%+pK<}(7X-7S5YpCDYgTte# zoTjedg1Ho?dtLI_6waj`nu>%vzed`Uh#b# zY|eVb%vX`c=g%h!w6nO-YbO25Il_>}(5b%l0BaX(-e9md72(yYt*U`&cJ};$*7SSY z{l*3j7d*u>!Fed~Hp}C2BhPUt@OcOuI&^(_Yr7=)$TR+OkV87ns5f#0I@plSe<`7- z-D32XUq>kr`lxP2)i1wk^aB`^@U9g%NXea2f|3OhA6OyMVW1w9wHaUD{m;^E1soQB z!Q`E+|3Zmh_ce94o|d3(eQ0v4-qgGvCT%T=mCNSg*qinD_c~f|{<``+LsDhibY1v0 zrrd}gnAbRea}(x!M-kigkd)!5cDF|BzV0)7Ki$h?!EEt$Gc);()fa?#bmK01!dd!k z3Om>FZ4#5lM`-in!{;t=w%oB*-)-tMX_azQ59H`+%hlUVe$?ms^DOS1*6Y35R77q7 zw0$QYlX0!3F%LA&_w{E}y1>S-3=8kwe%v6rEBg4Z$CtF=r}d_7&fX51VY`i>bCxyPoXj)=QVw2Vf!pYqvV_be zH=Ctf>2q+9dqyM*de6qQI}!bxtR&(mtl8&bn9~^b+BjEjwu4Ha4+4y? zz(E5sd_b#-j zMB6=N4B57kszcW;8pLOpJIApN40(iFhhU#5Hj$%g&)!hAa19qLnIQi6j(cgGY&r#3 zyYI48htk~y$MMa}nO5g&r>?(;Yx&w4VIo$cB6Su|HtUEf&ALGRh<{bP zqKd_JS9{^nFGp;+>B-qLja)%44px+W04jXYYu)rW34XoVqj2ohTH8W^qasFZQZeYS zvAkrx{=)}|bv=R=kB@v#HrU`nG#d!OS~W)KQmqR0nzzE7ft60vYM%1*`z$j`84HKk zi@V^<(HF<&>wagw+Wg%U1B(T_1zP_eYO$vt+c!+GU!bvvNRlG!47H*Fu7gtOG$^C!CS#=PqovZ4S07!tjE3xA zf`oxvT+oQ#7Zk)l)krDC0_Z=u0j*hkOplR^j*eu52=eJ8gh$W>gH0LAJ9G3z+*kjT z!F3y*{bE2iD5)#pM^j^!!$QN3wcliQP?oZM@3B_cs*eHh0Qfe+!a7o1yPW2K2Lz}b z@~SqhKr4)^4;wl#rZ62mKQIb8XjeA#uDnj%If>8!6!{j>I|`Z`0}LbMw&CkNeF`r5 z0ev^vFi3skaDWV#F^;(+?QT;4*{;au$!zvX{PZa-Qr&CB+fO2-ZIEf4Zb&jXNKX^8 z2)2$eeKkX*rSyHhR&4cD_`R^zIY;9}PUv4!%- zvJEI{R2vl7Fbt2I`ds}e(COZz(A2d%`*s_Q+egrjf&onEES1PwF;&^Ra|<_cp1Ewp z=L}3_`Rlpm1~%#QLdK^}--|BW_948H6_QvXxoe1^IcpFx#h&$OQH8=0eNDfc7-nb6 zxZj7R*OC{$wsk>=)Ck=6K=IEM=>M&W^xE)CWpjNAS^6sa(b@5xl(r51zAts>j}F1s zt*vK!C_C;G294&cJ14`8waVEO`mlsHMf?v`P&^*rY&qk<Z{t7ZcBYfiFoV7 zWtTceVjiQLS6^UuU-4}_1;$CzB%6treczsg?TU*Rz)pxFHH_jRlG>G4Z!OkIVS@Tp z2GzAhw|%%`Lnu0e!}L+yG@z-7dyFkL1FMm>_qK8Jt(Ql`YicMOW*+ego zg4WucXIYb-n;Y!9o2&90IqPsi2`?N?qw)pJY}&J=vXIzdlI$DjL7K*7Sd2>NjQ=-` z3AQE|hK$ zOm>|%X|qNC56P2+zU`&Ojiq%Jkr>oiYEo#EUX#H1ZNsmiweVMfocG|n<0Ptm6;-u$ zXzZm^Td5hjDVeB$mw@|V&Hz3Hy1OnrB`L4#(r41Kq_Lcul(93^s`KG8e6~1*_Sa~o z^xgQWeUFXW7ijJ`(82b*rp@vRu6mdfG#$VWzIoJ47Rgi{B^eZ#e0U>df7oPFzR6!o zo!;u|>hA6hqx$6wx4A+frY}?w$Nm~MlqwdRU5yy5SvgB1@A6gQ;>oaDuZ(GdEIgfm z&RCpOZF~8Az)GmYYd^=mH)m{vf+Eh}rRNt4TMZ#@=M;sU%}kHTf+> zFb#tR{lQjOj+4&G$)-rE+REm_%Hm8s?b`NR5jw1X0&TS=;%(4|RamQdu?9I@5xYB2 z6OE~tPm_3I5Vtt9!5%Pg?EjQ}Ht@M{@en5)A`$?gL9szNoH@L4<-{|c4)oT+Z|vQw zakLBq^;=Pf7O*YNRXwRC7VrB=;H=3;->u28@C`*(=1v^W*sTy`s3zL@{J=4u(VH7H zA3iA2Y1u3Ap`<>qPv=Jb{4{-1xY@bY=r=0JAR+RrO0a9#NvRjhmcTy(D~8=XyljF> zA{wv~q0_iF1p4OokP6CRIN+qB#Vf1q&s;hty>z4azY*11p0b^?UAJkl4%w+%svt~e zTZpr%D+xDYZO@!XV99vVTZI&eXFhz-5ya}ck++}B{rRwl%LtvbI??xkG4_qol{8Vi zCpIVc#I`fR#I`54Z6_1knAo;$+t$RkbF%?-x~lrwdq2DC*>m4? zz+1}0{4L4kAz zXWYFRF!+v@T|#c4l(!NvpM^{hc}MqRK4Hyg`CDJ71m2891d{PLZ$eMr7xCstHU?o* zG8P?dp7i#N;CGT)^6vz2Tv>477Yc`*=@9%dURNVE;l{%;((w*|Md%v>;T-fF1+5B* zS&87?g#X+tpg@WoThJgOI(pS@{=vf>bOcQuK&W$7M_?7?dhwaUT2F&t3(Jr11*08S zi{+$9biRW9nU#lT@>{iQd;~*Zn7d|LT(?@~AW}NfV&DeM_5_3(8k7SciYCuj5f$JWkrVvhTK-zS$SF|eFxeZ$VwjcPj=@&dAsQz(0 z^>Q~R0c>&rGFIxEUx8Z|zel772;-AApHpFAt`A`S*+)&N@GnFQ$Zx2Co)CZU3WS(3 z$`NDowa@2zsYXe%Bc$L?&JjAi3m&LuB#woVYd=xkI`0<$3lgu)QdUPP{khWY*9SJU zn;fU&rBZ_OpJ;-$J}RstI`twz{}SM({6z^1!X984X<@(9K0ljVo-`)0O0}VPBu3gV zhphLfI8p*)d~hC;5tKMAmWz*$^cF+~Z8{cP9r$n4Fxk`fShPf;bb4YL3rZmj=`raRtWqld``o}MDlmQl5RO-bcEm(oE*Xy} zn25ijdW(TdP46krY_>7+6(*sMj==s$HQc;PZ8h`>5#eR36_r;|v7039MDk_S4|` zzWuv3Qa?n0m(!V;W90Wfr584? zrN%U}EBJ3@-lMQ5ps)?w_3KnKt*%w5TL}tx@&f(d&&}f8^od2>@&H~{;f9kSOXmwk zZ`hW{&)-R=|Lf-MO3w%C{7y++8cw!eM7>lDF3tOSgV=KbvA-$|Y@q-Z*qC_tJtG?! zI_#$SIP$+I%SM9_(TVNB%7~QkC}P-%9vO!V^En3;VFd-Cpf^xBd%8g4*3IEaM%?R z$_4C@<`FE+*%+*@xw~~r9q7Ld{ggM$7iV@Jnrj}^*2$4>XX<46FZ3sHf-|^I&YWc% zpV0#)Fpx3}FdQdNOCImq+>L_;B#6M#1f(7}pvfo&*d=cl5%Xi+dbV+>!J{Z5L*!4H zEUoqYU|iX|viDeT+l-3B7sIt&<-B8+x zVP?5@!U7@sA}$qK*rehH}$6HbkmaqyhWfxz4(I zlkxBh60B5k{6Pp0{>G1i#YL@RMTCsj4R#l+=bOw(OM)ab_9`ktr6O6qK2GiFN;u98 zKb{vBoq*^^7ru=-!79YI<|;x}xZ_U1ri8a?Lt!Zvkq7v@Mj|?>F2Ix2v5_a&bBm~E zEhGjauC>}hLu22iX^w?4E3&m~?d+zhwdGPXz&yMNUE0iM8HQjMXWvVO&U3Tt z5?aVBktyk32H5G{F|WJ4leMpAjiL|lN>@oq3jm5+YVJ;tqvVb^pPMHrpO={T-^Lb= zsBkLO#wsGfl_(Eh+SV+SGyM`T&wR`sD12{T{=n_XR}Z@9%vjF4n9`MHr50|VrB6JX z?fnzDS`1b`8Gk^(+cb0FG4;5kqbn0^sHy9&_c{LPpBpX<%5eA!(#$kDC{E{pG2`t6 zP3vlJI^ur_S>B*W;zQB^RIF|-T{yTyqTLpp%iBGLh3IIs8+d++Cal-H;{UmI^O6mD z!@VG?6zz20`^5aJ#lpJm&X)@ZS12%NA7p3S;%1lL?!uW>7)q>ob|4I6Xh-08DyM(2eu-kZCrsjMs; zOv-?ySB!B8C=GbH_i);V7U4|9tq$Tp3OBe#wx zCY=OZiZ_j zxfre>x9%0sTUjCiBr z_Xrw6Me@nn6BK*JDvN`%qNu8(T8Lr)pH0IdQ_{krs&^-;*-r{<+i?55n&*{^bSmAgm3-FZBVoNRWtY;MTC5Ly?yeE z$;b95>l*Qy2-L-W(GNfk2V}y8=DxU{4xTvWt zm_~|YxG5AJPSHW(Z_+bvUBPL2&VyPu97OqgYueRJ99*LjR)t4LWq9_Y6~>?V!f50x zT&+8=oZU?G`Z@?{pY?A1)o^r>kK5BV8IrZ<=3T+xAq#+K#o<#$Z0mTn{JNCi%^(>*WvJCZzF$#yzPw z^YM3Ct^595>?n&LJ3EFSSw;#BB7AoMA%L>PT&cr(;zq6hcrS0lTqZM!ZqwMrTWfm; z;^@Aywc~>KlDxQD8`%xVIElbWf{?+qR2|F^niL|?mGex~bL@AATsbqDh+HT$aPvJe z@n1i=EUe^54=;uf!<)G;YrGVeys|v|i`$EyMNiv`ic+hQ1Du&B3BwT} zDb4QFs#d-1AFzV)t5T!O`va4QLI#)Y`Um@!*;xQgM0nUrXD1*K%yUNx>4M>98_LqZ zEpCir}g^5|oI={X2*)uao)5CL317@cUI?j*id2#Uyn~e{gwJy}N=;%#2|3 zt?IDy3`ur=LM=n&LcX81SJTq)DF$sS|5^mc_3neKR*W;_9>a)hhs*7^DV=4tD7aoA z+}h#VvS9PQf5g0~)Lvl|t^XNrWrY&Q4i^v%LMc*vX7Oj+>x3m{9nQh`dTDIvmAwMv z8cG4~e9xOFrYD6k!KT58Gn29G!8*zKVfZUVy{xusup|tBim_V4(vWiL;tExG>cqO# z9GG0`ZmqEYC36N6(yYSWWd1l{l9K1<4`z(Z1Bc6v$l-)nYCBG2yQZMkUD~o+J~RbN zN?&OO8o3@KNOWQ7iQWG_Xb@s2mQa`ft#I40}vRif5mX_lp zxT+Qxo1xGG)6aYM={qoZ8OD)ygG!D~m(}P=_uN4A95^jQ3(>wxSNgzGSV*q>H8ErQ zP>>Sv?UD8uLTgSx2c(ScsaEjoV~p_&We&$u*i5+%fV)5DM*B;pqehyJFN*txTK+lM+<+%;wI#i|zG;7`XPV6~6lPz^M&{!q zG-U=ELj#h7lSx!}k$V@kZ*_c5;_9K<0P%N`E0K`H7uMzGsL@ej490*7`GiQXErF>4 zlwEr=M$jVR37+yY{ZsK6SUxR<< zbd;o)yY>InzN?eBG|yt;Q2F`g5n)Afmp*j(7>~r|lM=*WHYOLf-2G6+(!-hUU~)P8 zXA~G#!Bc*i2#N|i(1Iq~K^F#^6L{DK{d`w;YLOh13ImfaR-~3=G=!6py9pf)CgcrB zd>ol2@GYKSKfG~;;*v8nz{|(F4AP0q!>ZpZGFsG!q%lttwT_+{wp1pcL-;Q;%qH1P z9LSn-5mRyRKV*1{o*eZHsTam6r@_s;rOT$*NnztwF_0iy*;oN-zJKxMh{Q_*y*hC6 z$l$e!o!Gs0u*jG_un z(5YpGgtm!%(vy&~s7mKRz~y5idz80VUDf%7^v$+%IX)ZQbT!N7H;szd(|RuU1j zUrFE3RXP5b%K~!}!##s0E6OzI)gSGY9ZZKMdmXz zTKT~_jyijSN*CpTtuJ7A2N1XIHvyx34D&#Zie5jGprl=RN>QEEE*4n)SWF zUkRm#MbmzDs;&pJ#hos;N-FM|>w5rdupJ~%QF-AOtIK_;D^I*|MAvQKC}fn!?i_L- zIf==K=E+lU=kUiG`9@P+Qrf=u#H94U4r`Mbj?+~;-jXWl!6|Hp1kw4DXhQLLwP~BR zRgs)(MP*|@b4jqwAAurs_KqO?zscdz;>3g6_u?e<%ZMxC|fuj9#*ejp*27Ni-DtmogqObA$#gY7Z6xIy( zIg>Sqlg+@{!pUFFh`;jEo35)kUs^Iq0_)+5A8@{Iww=lM7SIs@&u9S_vVXqOW!l?; zzNmuGyy3nYs}J#ODW&5%+x^<|m*vsrMG_FMr$%Ho8?DCw23Z>J@e0hp=h5!yPKTTM zrB%~h-+#09{X99%{Pm>eGnv?tH*p^+thd|Ij9IPTV7^|&Ohn^0R{ zGfbj(l*(QO{Q*-N%YsvChb$0D*uQ?MYJ=V3Jg3|?1BBN1ZV-a7yV+ljN7KZ`!P@!THRdH6d^*Qg z{c*i>1i$X`>Lo6B9`d;Z2k0)n-$6C+6P578Q|NP@=t?&r_0M$mbaE#EiDIEV1z*W^+H2p2n62rRW50;QV$$>ayFEjn{Vck zk}p=;pu*YY-%nQ+rsN$g-p2}mVMT4cbe8Xiee1Nu3hdV3oJ#L@marYG#cQr^YR#=$ zylm);K*2m>>R<@;f;azDAo^{C>s&#N2O!AdoD7*)Svw`2Q?0YzqbZG;LN~ipyLcY2 zq7V-e)g)39h*t`S^)ORgCCy^XkM7$KOk@DXpO~1KsHmt?^K<1*oU}98 zrq3`IQDC*Oi825IhadxkhOMY49rZ)d43i1jXJ$o2#2t2w7r3BO7tQZ#c10|oh25fD zkq$QOc@8*Yu?Q3LhaMnwS+i12mK_H0Eb0;EAt}~jA(U$&RTnK6vB=l>SrcJo1`De8 zs0wyGBIPsR#255@2=4A=`+DC^y&Yo2PzOi__AA(R*y+X!>wVIy*5?(&yRihRmRk4%~RLP|iL*a8J}&*{N`GDH6Er3>y47_>mmLv>p^`h4hB;gC*uxmno)utS0n#+%9V zTo_3owdD9gt(+i0>7i+es0#Hm=EtlBtY5u|_JSab8+woH68P)_XFQwz8l?jA_dqk@ z=MSN2=?w0_bLABM{oLns$Zo5b7H*BqjtOv(Mx|pg6JvSil8Vy$E^{mSc=ISFNPIBQP{HvtRnm1j@{GMlv9aF`$hVyJZlm~wf;kC0 z8VJ6r5cVx>j+tc?He0apl9aj%%zFqU+4z2GW4Q{4u<=wh5s(ugh6V?HCxJcOV)R~| ztE|aASsd?FOy?k9W*%dGBgu(DVUDkQikh)JS?n7Mt3i+}sBE=d&5KHz%=A*wz308= zM3iIgWB$>PD>ok+X76k`V3$n=V;nJg=Gy&m+ZVymZuhq#PC)ndxUwioilf+sbgIP& zucuut@I)y>)NH&hBH2^csf@O1QO&s7;~Ou8w+}ul_vv~wby=dIr+6WL;k9|Q+iw0K zB7*Sxhm)0}CFL6Z7)tW)y^8@FY|!f=9;4BKzqz~+T+ zT(eKGV`{YH6mAYD6G|0@M^VkskE~AT;lk}&j{|x4r6ybU@4cY)BnE0k8*A7W(4v|u zGXBVu z0)-jI>o)J%bZ|9uD}Q}$*&AXHEu$lgtlBg`R-ka9oYt371Ht4)P=+a5Iel=FF@p%w zdl#~exSE>B8fI0(P%gA9FdCkns}kl~BAg1fKu@fuidS8xe7JTcOfXlL-!E!H8THM# z)X^}0znTf+p6mAd*|9A68?33fEZ1n=hW>pLS!-iqeOnobkCbE-OWJd_LM5oFeDpUu z>eqDP?%8hq_wphtj0Bo39->UyZ`NF4DGBu&Kg==YEH-xR7EBK-Q#W(uOKbr>A2B-7 zbsT7s!ubIU{p`6@?!90!f%(8-P%p)BZ_^w*Y(j!IWdILPM>GuYY|Ke>??*IgG2PAc zkt5#_8T4Mw(9UlmAo6keJ-noak&aD9UBp6!2r8_oqCtRoeTpY51L%hxB}!}EA+SyA zPmI>s5W6_J2U-4x@KoqX8v&;QfN$a9wETM`yX(@W^{s1=U%LsM+|eBKugEy|lDof2 z2kIf?hf$8hLxVMV^WB}W*CK+s^3XdvTqMKc0m@3NHPuxj*=wVy-;Tl}9M?11>(i>* zL#A)v<7#1pw&FC-u3~GcA%X$N}3S zm^&o|Uox@zr&hyS;LYJpp(16wxC8-llu{3V*$+Y(~PSqpY zkl*gBlQxlcFmR|4EXL@Aa@{KRlt)gyi>}`gjZAWl`LdoZo*pOw-pdrzk1hE6dN$N( z_u?Zpf{FH5Yqdn&>cBut$NP^gLwowlyM*pCaw+D_>Ujmwa=&?A0EvdwZB9e6jDl1GSV0_ zbs-2hZi$_lT~HB4+bYFiyzk^4I^T~AC3?wc$_l(M2;8ek(yu|q2@=eV0xYozPma)N z1YcnS?(nu3Phv#DV}>&m6AMZs37Aj4z!`;h3_Db=89ebAuncL5!i+?6<&S>&A(7mS zf~Ly8(2Q$q`-mtQ8g_Ps4ckl~)gpT4vj*UU0Q+s#hHh#lb#`!zOacue+EAO`v|Fy# z4><6YXrL{&{s&2<*y2`AsW%G$j=+L=dEha|C4m9h)9s@L{*C2#Ke=xKVZn}fdH-|1 zE%M5p54&%<-MdY8k4k+sWRFve2>Rcc8vwuvDpVu-^_y2KhR0^G{{b}q=v$x9Ge(ac zdm;09pUmn7yLezeAQ9k9JB3EiydBc@0%NA7Dd*xN$+? zUs@lyVPl=n28F~@pxHWfzFM#w&#~OlB&vOqdF}w$h>#zpuyHJmCdy^ zmmlz#3=Vi0Q~I-fhZj(wy>k3I&o?1(K#e<~=kNKq-jvf$jG_B^h@{&yvCt;@!kg=v zD%?QhBukHI#T#(WnkIAA{Wcpy=+$?p#lOWoZ9mQXcKdea4e!K{UK;-28>2*%6EJ=C zwQl&8@pWSghw1ge&#~EPv8Y+|JGK%`gj51l3~pV|S|b{a{kPmgy&E?VpV(6>nutH| z=3?$N--n|4C_%_3i05k{$a(Xre@U4K)(_c+W58~YoQeujG!#5#6jGoS8i@yvDrcQ* zE#O#P4Y)DS@N1*Vd3gTI3-0*rg5LrS!{*)4*%cy|I=H?dvml;caU9~Xu8Q6dL=v2# z6YANaDBQPKnk!}1^9#h`mf`wxNYH;HD`5X`?{Qq$nH8L{V8E)yUzy<%YwW%i4 z$3`c)X_*Bo5YE_D&P&1PTc68~&CN?;U~W21W1BRrWz+jDYWtu#DMoMglePeByay_F zo6eT(9dC~z0uvqYcrD9OxJ@08bHCErtz{q!N$FlK%)PWK#xKChU%WpN&NzC!*l-Uh9j1&3)}_ z)5?Sgy)MsU?^Wgm`{W+RLX4%|?rJ=x+J*bvCI*i9YcWNtQwIr+ zZwFXdf}Q?X(`mev=}!fiF-0HW>ug_N(d7M&j`MkT29ExkJUkfD_0XZU2G+w=2(jRi zJYv|o^)oxqi=)SFJD|h>P^cZKj4vq(duT?9#;rG3O!LsP32*iNz)VBNOsQ%7HaD;mFj+hdQ{&b(Jo99g)= zud?z2KQptAme3>s-{dXi?(l2Jli#roFP!-6ASUMR!>6D2F%-Vt?WRub^LmBw>%MuL z|Ms~1^IpB+Xs*43_jCeM5X7vE-Z&R~#&xKG1 zRhn?E#nl$gkq%CHuz$X4L}6>`14s9#5Kwqj$=A22E^p1I8Q*b@GNk|WrUODR|3dX` z2qFFJ@tD6aj*?WI6t(p-xD{EP5&EPbD+pe^?e-Qnz89Uq5K zJ6gW?32(|W>y3_2<+eZ4<6}X{AD+6s8}joVZwFw0Lm_|@R+OB6!rWsY-qIXxcrRb< zSV~Eb0buw)XP+cpQnYCfRE-XA=950(c;f$OaQrLMh(PrMGK-%bTE^5mEkYL1-!mNxG&GVyCKwe+t zPNvrYX=*7g#rAU7^ax)+z+*M?TeGY*sEIEmJK*=;S*D|-V^6<$wB5X&?U3ue_x+uWmdEhZb;SE*yFnLAtb=uAW5js0PEq_|lvIhnTnOg4V zFF@IYgcK#TIPV@SJ^taFR(CEx>lRf`yw;Os%iJ8hW&9^yMjxPXz&64GmW-|$l1>VMqrw~&UYH&XKbiICgsIy7!DNaUrolqxDp2CbnLpO7S{OOCdtJa1<=) zyCr)%mS8%IJ{SNwG>}vR(iY0|Jr^J^rbsH7mq+^O&ZQ@0qS_`(x;5bVWBJH{bBDxR zoA0-TJRcxr4VNOkjFf_GtPC$oc*2CGr>?XWTehOC0x?KXP0Lwgwx{o6-Ni<|+xV#p zRYhfOo##-;QRJ#>#12L-63Xt_fm<{ZCkrbZ8Ac2>0aYchhpaaj$3B*oix^axjncXX zo(|h>!zO7qPjbeJ`E0UkR)7-v4MIX*Tshf%o-P~%nP6tX~EDTJ8fUBMhzMA zZ&h$WXIh@ZSVnHzn5Z7ol-=ZfMCwp0BR(D;zGk(8FZ=4mG`o65>1D|Bs-Tb@So)#U z(^67ujGM<>CCSqgr;O+>ML5mCk1?D$BEG<)YDGnVD~Xk5LV5Q|)G9x~r&z|_u5zXyic!oUE9SvU(>pl}F7tY!AMz~0YM;AF7A zNY`W4ic)(2@X!yb%Wa8OV4)1%5@Mab8jxyXljJ*OhEG3A_F@pjEhYD)B0=aO(a ztb?c5*l_8AH76vJ%gf7pKi<4Sdbl_}Ls5Dbujd0Ok9QUf_B#BA&}me!R$9MV(Qj}M z{0tR!wOO}zf(3K!GP()p(Di+ii{X2p?SQ!I_~P5agFicz`DNR6Gqu?+nJes2pg32d zF`xB(#;?*BNx-8R3M;w~_NhmNH8vs%76|6*&G+Sc^}Y*)Q(NX6b+9O4|C%;{LHdAP z1jFM)TOs?Ecnp&7oKo4&UxDPbV(t_?T`? zTg3*dcVgjXBg;8@^#Mw3+78xy`5%Dh`0J@eq2H$K0Wu$H_B-IPb&+QI)!XO!lmh7! zumjcfPy_n&rlyxf4B^ZrYPQ5qohY1~f_wlsv{s$Y9fFIz-n?(%=4{#Kb@@OQr_#a|S#iD3sqh-#aodi8NGaoTO-(ak2-6xd~b1 zq57SE`Jj0j27GV@d--aIZ!p5hSZ`WmQ>KItRnYwkty*$w z=mZK~v*z`vHVpt4QEO#mWq$qqi4&+MBA8Caxaal($hL%aTnI66jfELpm)uvcuqr-u-{tZ#pD z+UezPSn7+ZEK?AAKYn@=@;>z`A$Atw(6T)r^7Gy{i+w%5MNT+z0%q3d=3d94zHDD7 zN}IQQNYEl>k$g3R;Y8Qd+ay_oVpN8i_toKKSx8aQ0zS<=WCb;4-&;R8Iy|2)=jP_l z&(GsX#0;W?1#`hJll&d5th6Heyj0KFGkY|vIfjTR0gx+(&Fg-pZ*ux+(b4ohQDr5) zddMqa#el)Et!Zd4eOX!dbEfzE?^8*XK+%4nY0+3s3n230eZ^q{KLxucS_2RikHg%c zk)`dW-bb?T0rHWWD99n%cT!uPIrS8;?0UF`fc12gOOG(}fevd8J_@mDE-4jNE$$XK ziFpu>Nxu6XT*NKDvdbQAwBbC9;&+7c zvB!>^)Aerm=cC_HNP$j#w88RA=2ljpPfF9tiHTp&{%=3Fu-x$Mc;r7*pFWE@zNVes zAzBqWl~@bDSianE%F2PFH)C9OFize7yon;79YaiTX|KVova&HDaxcJ_nvM=k1_5Ku z%!P}y7_&(7364g8gNF)IiE#>=gUx}Tw-b*lR^LiClU$vi z-guRsBX{uay8F7t)+>uFY&H!<^NEd~ zMXOK5g>%ATW+He}pf`&2;(eT)Pa~(}Jt|{WW#c?&j94@{v5cML zD&qS#S#mSf{q0{+836*XcXoQty!P`!1fl@=<}Yn*7(|BqOK0t^4iva`^Ve97h6@ml zI5^!#M^4=P3qj5pHvG=G9`dkuS(k_wf_N3ppIz2*_gt<*{p=aRQ&DJd^9rGhy$1S# z=^QppMPmO$Y*>LZ>Pagk4S&5>(`Rp6<(8ko1YGa$eNnBd9M-i)f>Z#yfq~FUx7RAQ z0NeD<(7Vjg9B8m-QN6UCmsLjdkw=gR2^pBD2Yn8>slPRws{AqE#C6?JVgjD^IU44~ zS6)|>|K71aa_uyR*UcJ@Em!8$Wp7>0-Q6^1rDkgt4`rKZz@YTe0cVY1TrD3+>PbSz zAN#LxxP?SVUR&_h7@)N|%90hst*NazFN*rLT%o~le)}B!3JIuOG;wat&L4COWJ)-a9|o2L&RZNGf|-6v%x5sMAS zhpc5L>C~n=7jm49MHcJGXyC$chocA$0d+-fF2JY{a3PUEVRU37+81})*|`03iT^tU zp7oV+`MgrQ&a9Omd85f1%8SQN9wo5b({$8%Sr-C@9Y@T+y^^ldE_Ku(%X?HBU@x!6 ziKfwI^+1-Qoe_&weUGzmSYf&FQBErrGMNkk)iZT?h!}c`35OZeZFipY6Ih?l50`3H zyQ#WsH}52&mKy6{U`v)6y%;-Tq9h~p;W*vVVm&?;JvD`J*36ml7|_?Drt4#QG=-|7 zbkzA3HfVsuV!}#v_uZ6kOZtdkuGhiTJ`3z`?p{}@UaO|E^;0B=wWDJ|Iox4 z4F3JEobP*i@z;kJCEjX{jiZJ+P*G&+<+Pm4_qBhIi79LP(6`l7?W6%)smW&RbHtWV zMp_mg;X14b$nOvml!ZFHDu&(b#CPTM64s>u?d6|^dc(F|O#?sp7 z++B6|>uow6opp*1yOc^}IByca@3nr;LsnflP_)Q)DkBZ3g!HxhOx3u)=e#e)_ z<~gKa39R8}xEEac_Q#^(XLXi{&z+VSz}>D%Tu>yW;9yJl&NM8M6+ z#FaYFufSqayp*pZKcyvQ z-|v7P+)8$KNks*@2gEav?KDtt0Cp@LY8(5cCgDuFmJc#ey)9fG2inY6rb+(VvoN_ z9p2{@Z}W8LD>D)6RA=OW1kyJQH!&val5pZt=9!de6h#%gl2UUjR2X+d!yY9I4=9>s zV*qx2Z<7)==sy2S!$~)}*Vb zECR#S93nYlK?jHUevp<2xh(G7+}x7~wQcvC*5%9hsf+rf34kIhG1Y6^lgE(-cf8o# zUJ)|4Uh;Xi#cu+kbrTpvVb7Tz5awJKfx+S7pG=^a#PodZL%3iHmm1R>bc|>8DTYhu zC!#5~EyDu?&s%pP$Wegt1f}?#fxk}NmSvXkf|zKBNI0A`gz!7#|Jbslc-d_O_#IA- zXdsCLI!px}P$b6(-vc%SdQk#J29Kq?(tp>190dx$OWVH5?m2aDyXjp%Xra?-L6@`k zZI7Oz{CSaqz{cF1rA=uTyAJfbL}HhE3zi-?5FZ$;D;n?w*PEO}kP97u38pS@+AZe$ zzHO$$iFQ7Y{X*u4m4L|*y?bZ zg!~!V)ZECy(QIT=6wyZ62vg`xC^1o&EAMu2%Vw!s`K#060vK1Mr)#G|91I7{{D95)!@C3Nc0y7!N2`?jMcR3p2rId+s8KuTv<`+a5%`>*ajzl zxm<3105M)J!%P4492+2_GLPZ)DkA17X09=qx!pOb@2cgvnZ&^Nb-FaUes=bx?RbIC z)v7_GR^k3K$T2ssWNCRyA(ypN!#zerqvLV82n2~nHs@(ahV6&Vb&!3a>XgR)!JO{r zxqjA>&t1E&>UpWh(Uer{jRIC2FYMA7T9|K8%?XTm9zkk2Slh)!@ z5)d$zx&2LqY2JR}2NH&S-M&lb=3K3-z`)eep)MQ}4LTq-Dbsz@Sq%i=RF~QDIn+RR z25BUl(Y;TEr6}NKNep>5$iKdhg~0a~iHyt>(1UE{CAhJGtzbFUIc`!Pm2LOaMAhS_<~wk; zQA3*!uw1KMx4GXE>R5bdMquqGoo?RDyuX0Sg(8anFg%@E!sX9)h&X z6@4TfHX3$tfPQW5V4>(?@@MNqGCb)KO4q3LxaO<(&YKgjCzaE!tn#T@2CFH&nr`UYI3*OGWA1EwRyl7>k=D#tqV8$KDwY_ zd?mOZk!J{+8jrh0X=zdBxH^S7miBi9)aOg>_AU9hf%%p=Gg5A^{h8c;ND9&c5qn6J ze+dmhwgm`I?;bbavlJ@MoOrRI z;=2Dl$0sLEOhcj&XL$pzInPVcm3{|-OdtYYBFcp4wei}dbZIGG$v+qeFMbOJ>(3M* zjY)MtegP|m!kri`D$oI`y59=x_x%SAAYOC#7v{PuK@Dms5}e>}HFTolVwpwM5~HJ# ze&(in-v}{rrG{a%_njjBM$P=37UaDiGYM$9vZQLr=M;Z>A#l55&uRW_JB2YFdV&E? z7hrBMX($bM#6%76A znU~Lr$_L^)v9j^KcpF72^POzA%F5c< z6JfPA7F<(&Kd{bsYlzFgRL z5-$J8xs=@fDlYtnVM|PxWHice-gu!Vr&xxrD+pVRszPq5OU90LQbM70MdrRIF-lx# zOfYzz=((DqzyuR^=q$A#UnueWb^*b2^txQ)5ZWTs6Sk%0nUK^Q3;RbzgGyW_VH{UC z>Dd-h`P(*XAh$x@&z#)9n~ zef&wS+%GD265kUP1x~Xd?hk+}>0cQVr7IGDcIFeFflP5rdzGL$CST&TXY0DZ?uxJI zR2jl`q9|f`Xwhaz$tMf)ZtQK9B^bR+2604|n2P77~7feR4Nan1k&2f{2v2a&JB-JGTE~pQ2 z8vGOviRzn1XCV!_u4^9!<^HsvJQDcQu;d9-9`VY;dsGBikp<8L=|9iryeCQB{bY@k zFqk8^ba+oZ9pE6dyYsZ~u<{`U^Q}RKWkorqS*ZE{O|o|gM&!_D`OARHd(ya6=lEO{Gja7paKhC-icFErqKqBKl&;%jcMxBGoxCbWZlm&2rEAf=&c7JGFW~vX@sJ! zPP0Sf<-n~s)Gn3%QVd4Zl`MrXXyy#D9@AqJzl;?m) z0em40LNEz)XqJ~KKq|?`>{2%6f&-jl#^)>xkl<-mRmKcMxq5!hGl6h$9*VZ%BM{6% zBYc%}<}NPp0QZ2E%|gYHQ45_BL@Sg6LV82kk+BYPSt@`0tTFQYmvN0Df-;h62tmW| z>{oC!XhF+C@dC;{Y&(oyxJK!@Xe3ZS8^VbV9w8VHiXuc-P$!IT7h>C%WHyZ-%H<`k zU-JOa`)WB$w;`xqoBKdx(#Oq$81=B+B-A8##DB3F^JjpnZ?32LIHdd#&-`vM zFxL>0lxH?Bi={4qs3=m7mM0}!iW?K66P`y+KDcJ1N`i4AZ3*g!*<)o&OaE8GcsH{* z8Wfmzenx`@m^{U%vfeI!BdrZBfS)P1@YEFQWOF?doKuzrt!!XPL{kW7h_cogYf?7T z`{T}HO$S+%W^MFlaofu<8s$p?W-8yE&KrFG8m`#kb@F*RCNNW1xB&Ech}|*gEYYRE z|KcOsl~wG@Al=8iFLhqOCo#q^q8`PT;(KF>A~ox47JoE*y~s*xc*PMvmnlRMrzSen zA^F7k8(NscNb9DA4bwEwD>?!I`ku4gkG7rChKQI3SOV3h`B_YDVY#yM@~rjP5xQ}~ zhHKkkRcR&qGB8>02-l+9yp;PI8D%8NGT39}7&|1QKyzL!Z4fx|jYR@*X*n9$?)Bh)kw?kNarz=q&HlN2f;}p zj=kV_MIR6QWo0Xd#I5<*Op%K*6qi^UKVe_`qlEX)H6L$Cb0{ell_SF(-M?v>CW96I zp8XJpFYjfiJDumYNUZXZByrWbI)WZ#WYkG-9!xN(mdd*6fT%+UcHc;by9e`B&jCS}>N06F)f@%Vv>jEfiQW-GB#M9dN)z z{dkcHKY)TSsIL*-@l;PUf&jB4(|gBNTQeSx42a+sBb3z#?8)#4Ylm<;)AF4d zLmoX{cRYp|+voyoS}~o^)yC3#kh+9R)vMUgmCKfy*ctXFdyIYpS3A`n9a@`fcF(7{ z?3lO*>w{Ar!vW(dn>(n}w2!1k&=0%{Et3+G6nhww1^WmVNB4x(XDw6&YELywLF5GR zAVDavHIjk5vZ@3KJKxrC-po+Xy0JpLc52G^V#3{&3YM0;7tf%%uUCuBb`VO5CAxPU zWpu_`LzL2}|0qfRIBCrBI=_`mXUJW(gp-}>9ANH$VfljP*Tj(Q9<5=%DQC{*x2SBq z;hQ3%v2S?OOuFTeE1{*kHpVKqL4O__uL9*Fs{1f468E9uOj4uOhE9!@yFa7Ud98+^ z`)V}%WjjT{{;h_2``y)}Sw2ZE926ZbtH*fWph+7!w6M&9g>~pIiyYX^`>3n}Tx!k_ zm;$YE3DHBwL~K$&S%3u+G&KnShp2Ooj_e8cc(So=Y;4=k# zz*#mO*Ws?a?+qMo;|vDFsx;ft5xG6ahg_`KlajBXz=gHgZE)On!JfUZrSzS-Pk(=;nP04gajecQ41kE5`a%U7@45-Un(WCh5{s)7Z0lo7`GLRp$Wgb`~ z`9IfwOmhCaQJofn$NjtNv=IWHs-kusBN|dFwW{kNAzcciwoY9d;KcLdKPNlU`y3Xt zmuR!x?pZX7(4sQ%1-I!{bNlcAM)oL>S;swS%O0$MgUtXtPjTGvgdyUfRj zEZ|E&>w7HN^mcc#x6zbnw-F{lY$| z5zyw4PBC%Rzk?B=yh%okB!H~oJ3;4>(blFRgtm^tCl4s*t0GOKizE>37qAgDUBU?kYH@cU3b-n zyO9lbNKnq96cP}Y0QOe&NX*fb zR4xEETKUncsUFv9^j@Q7+sTL<;cnF3CsetZke&Fr3z3UGHG%>%PX%d_xoly47wL8T3VAk0N&X2-3LU5ngM_nup|r0 zC=eX~A`wRf<;Ue+<%%L(-v&$ULqp$-0Puip7Q^ljBiQ;)TZn5dRYlu^d+?t*^|x8W z!vH=GDiJd-$wK1{UWgZnx?nZIdi0WF<)VqwHSJs#$OmVLMMvVy=9Y|->{bzkIqW6j%$|&ZZfMz{Zs? zR~_7L-;Agp?Y{+e{kf&HlR3Ei2gzu<4ps(~tFwtBByi4k?OOwkO3EIlN%JkdM?KQ% zaHz9U8T7^ixUL=(MBzpK@y8Pfx)CHqq2N!QC_+~9E9YM-s>3BQ34kt#?%7#OZCyz) z*)72+gYCTvTaQ>PdcH5LQJY?q`)-$ODypg}iHXdHLy+Do@)XW}-3~R6Wa+v(lj=50 zS4QSvq!YLkj;d168h}WA_=ZjP@2%<%v-W;WYHR;hOe{bG$g}Dq&%-%HSS%(obV%%9 zH1yfZ%b9wt%2g9)FP2nf^bVl{ImAx|N(yQsFMY+BEi(|GIpExwXEAybJWOvHa%|q1 z48PB!`7MFI#-oQ913E23oAVNZqUr_<8HF{`8_VntY9S~z$t-}j_BJ5e1?(*Xo_it- zWF{k{Lx4y@Gs*tpkZbn%vDgP7liy=nB`ogq+JZvqbC+pt8cGpct+G9{}vI-k6W~K>D){^`j@Qg2RfvJI*i%- z5IrkfNIS>`0MA-ebOa8jAK^_a{q@tZnX7}R%&JT$p$cLt>p4jWw1LQ4m9;`i#HD-4 zGBPqd{&?_W*48v+9MCSVr%}2HFOz+l@ZTV$K$*jU?CbFeOr%emHUn#*UwA4KIRmbK zF6t*|unVLfFz@X45((JY*vcx=k&%OJ|6-swoOBFB5mb#d$4w)vwD@okz=bhXD0Yu4 zi7GNsBARbLf7}5>T3J=jpVClJ^Z{~^5&Mo|LJ6gYfyK-A6{@Hcjbse!mErZr{%Uf7k*N3<1*8Vqy>< z&|9r-Z7a5|`{x1wj3&JZA~WL>H)q#H<>jk2jUOaWp1h_oH3&}lKhgk?TXhe*%weGB z)a?`)?JVWsYu*s3?4V7rA?Hu>O$e0{&bPcW#V)5-*O70ic{sJ z3~WeHP(gDmtH@u4JN`O!YO1QLf`a|&3S9v7cueH~*k1alFCc_0r?$G<%GTDx)^>O? zY+88k(SKM#&HkqXCxlDiD0m%(_+0qP)}gKSy>}2$$vKCGqm5KCK?rd*ch(ZPic*Z` z(vC!(N_B1ieMQ7NX5_p&-cT9hojZ?&ghYCJx@;-RHuS$0SAiw16$k-`AD5OjySNJz zBJ?sjtp@ad=?evDw#^g^(I+Gl1sXEMV(0klg8j-LP0B|E*0|KT18?kX4v%5N3b?ai zDd6_7p%GIHc5{b=phhZn(Q^11_}|e$h82lNN=8C5G)!F)ICH_1RFAEwgwZC(r;6uo z4a5w3g7Y9Y?}Yr<38kmsLm0TPfvSP=(IDT-erX3&?2M5J#B>>hys^0ny2G7fKb(~; zpuYy;pEr(k-yb0~7a6U4Ozp3s6IH_4M8D+VJYa}$f>Vki?4`u`#-uapAPOFHh*`k& zzU?YP|F6_QSUl?A99sO+sSEsAvU}DT^^!l2vyiT7Ipf1mHj5v*MV|`fj~kl%Nd9BM zXBV!0usVO_Y@XGOywEEA!0eJpU~XLN+dlq-vd<kW{;4r-sfO8gJ8%a`pV!UN)#0EPq&{4XL0_#6Jkga7{u z%JARkDE{yI&%XHg{{LO4c^;2NaIp;_gG9u#g&0R9+y4PKAU<)u(16MK)Sxu}0@?Vy zVDfue@NN2k?_8xbJ60S(rLGj2!T|!N*-WC+5;`&Y>VE(QACNmBh8((A_K+@F$a8h* z*e;esh{+11xjuO#H-G+(3&dw01l)~1f%Nj*gZK=UFs*;s9{`enw7DIL+qZN4H?tTi zb)6`o?E283-#iNc&6>+bk)&We_%M7d;`hHLs8Gf%l)xFA`tjIcLEU4W$^wMJ4Y-s{6-b5n`hO8J?{D`LOUMYS(EY}wX6K*#Y9|AXc3%Ew zl*lWecpw)x7O@v}xDA|6;e8#+ej6+sdg*KqIdMO;Z9I;u$)L|e?IQARt|wG&yr1C6 zb-fmk8D7P-k68o68av+QYEzWi`=6jlk>-gL$tpcAYr6T}KQ7BC`bmvNUk~T+bw9mn{fO9oHH*cghy!pqD#?8icz|ML zCXd0V6lm*B^M_GZ=gpSQ&vG@o!^^2i_LOj3$JdX?*0cT1+L$~tWd{Bz_U z*QimlU}&8N*BXQ(q3iqked~NH_Ge6pU4Tc|AowU|3q+5ihir=R3pByRX!}p! z-FdmCi-SGhhXUAYTUO4?gbGK0?LNZGWnul;afi9GgE3~phCdN=eL2i#h2g$VV| zkQ6Bb6>V2>QcVyGHo+G}7VYf%3{eGJ%jY?9A*KP*DQ{&&kIrOtRT{EY%db`bZ3Mx< zp^ktCdlv!vjSNUH8nP6!_>o&{2E?y>>fB8RqoxU473Ia7=eQy8(`hHGUbB~QJ*-DTyQxv0m!H%I9KbvFZzKkevN z-w(9(NWEKHD7aszC&)#F=Sp>T#F<{5CnSK96 z*7|)7XJkK4;hCsJ>!x0gvQGo4z24#ISyPn9L^^D-I9-JIb1I6se{G6pN?M(3aW(4( zNkzXMupiYsHnt$a&sI94QGZLmp*9t`Bvma=y`-+vT4=-AJKep6t zE8X|1>FF~W9=O$Hsix(e)F+)r;HG8dFtZY&N1TsV0(PEy)O)=)ueuR7SQ9$~P z@sZ888fdcv?5)gpT4(%zkS6DDa#=}vTvl9qVdH3iKimZxgq&_?b93^JRnF_+WM#UJ z7Gr!p97P6f=hmz-5^%ppNDNcn=0wtCdS5Oe4SQJhtu3S11Off*@QF!3#`m$wCmAOp zvZbrdcIhWz==?QGy+8Ue2SWIWz2=SUWw~mk{54o?qQQG4mSAyBJ(B5xyXzQ59lxYP z0j!$HL3#k6O8TBk`nF6WUab3f(yHLsx?8NuY%l?8I;du|e&vzf*(ky-yHZ;Pv`!Jp zf<)k@rdsz}o7QHl%qpwi>RW(fJ2KsP8_Fv%b9~P~*!G2CTxJ2a^;4VQXQ9X-`tmFF zxYpLsU6O`8;rX+C9fk30FjlxJv(p;LO@ zg$*rGRrle64|~8G*I(~Jr-cyG8Ol|l1K0Gc4c1bxX$qpkV(2ktRvPWaSveL=)$1zB znJM;j!3K{mQ?i|+r(B456 z=&CJ#lnu7u*cB}Mlzk>Zn389@)8V4YmA@8FtrTd_FKn$`-G>#7&OK^6snaG#n&Qof z$VV+!JEH4Ck-esB4Yk-7RwKz0j{0c9mi{JeH#YcA<%5bRWP-vU&`PREwp3O&f3^+J zko3#AsA7(np)*trWy*rOC;sPIP@S!@#286?dKHyb;EoEFz^0=xfCHU2WE@Ll>u%3N zM}Z1Upo%IrfAZ#nNu;2zIY}m*DoSDhj&P(vwgG5x&0cj`7mONMUEW|Alg?ZDFE7}j zlZ(U7y-SQiE2#KqQj8%fSXw?)R(QUX?gKh<1Q`GWA&|cY?(%gCOa!Vcr*WFfKLsvw zv!yKPvU*^~i729GPD#U{0yLG~LKD#1ShPbH{Zv%;>N0k(2(IGG{yeFiOLm$K`sRc& zfQ1+NTG@+rT@4pD7_!crI^vK(jsn?&>{76n2R;mvZ%xZY(@#n#kc8;!C=8di^+KSN zAXRgd2NLw(KGJ66m%;(MG1`WBwQ5Nd@#dLLfr5kyO3MN=HcDraAg?Pd%}-&=9yDn- zGF+olLrSU({)|3bmfy@_@>$EOU{;FS9w#%1e*E4{1gA@{AC3FcwMbjlJBPQc9bYlT zL@7*#qlp@moP=M>o^)r1l;!*lFk6hj3G%(Ly0I&F@AsV*{ zbS7~ij55&sv>9F{?S6aOL8Xa9W6DH6a`5Tavl5O#1r(9Hi^2W5fEKY$W5nLb-?VI5 zt7f0Zy?@6zlEY8=dF{~jDue+$4$K8VE}_v??|c?MATNRo4(_SG^`XK|m&t${ZrZx8 zP4_;#0r1AIuoDvR21+X*d=ePv)m>ggb6%t6EWgz)jb46lz{Bg4zpJCl-zPGw%T@qg-8*SQ zI9!aAfXX-o6qJ}Juc^x{fy{HdKa7}B6l>UMf1w&i&RtsY|45rt{%xTyJp`1=neI?z ze?x6Xwvj&f4k)hnaoWT8ec2`USzbjC4+dpE*e1JDUxl5hGze>pHTCd$crod>pjGd7 zvhvs*NwC}*+EkNGAZZ8ahEs4;kgFtHq(Hnf?Oe{QaPw*Qpqby!;-$)Cl$8ZJDeZ2| zEMJ}7gpI(B;i)7w=NG+A(X;j8x7pwJ0RjOWH~sX}dfnFd_?c5oruuAk9_G4lBMBLD zsscybOywMY?t-2!!tWC>OWqxhUKB)8_-VWp+#ZKd5u!Mf^zHVLS$rPq0c%#X3?elA z#P!B@`!9s;Mq!841=?xpxKSc{@7_8lKI`3Ta_#o+zD}9fZZm$Gy34S?TnDetklM@l z!;Y`5uDs3Weo=tJQvabCmzI3!fQP}|!A2{_;L`xRp%$0R;GpTH#(Z^Nbltga;eCA8 z<#qX6R`8lqRMU3?yvkYb@OlbGmNF&z+v`5^ zQHnhkq=*nM?5L<_OW}2TPbRl&;VDJ$mAL7kRo6j9U^1tzwKBp3a$ z(k1gZF5KE32_N_tL`Y*~7rUjbg<67e!m!~{pWXavjq;egLhO(?_=owp{>YxOyA!`J zq}>un&9E9F<=jvkuxe#0U47r(zicj-p`O~h&WfV^!r|+Ol`6LRIk*Jy^oWHFMD!Wv{{CQG?1helGP6lL7XaMw%3=v2|4xVs}@Fa%XdoP8wX& z8olUvYeU#(bKu%kh8w945xy4SMEMjxGtR&cB`Tv)x+=DNYSuJ9C#N3Qe0O*hva^&T zJ2by?Wkq`Nd@2y*O#falaKNxdJt^~sj>J*CCC<;Ae@~rpTO_$(z5DqPFCD%N+ceSw zv`yTv_LC=ClK3AJak}ZkoS}hW$B4$q*RoY?dUorn08M%TMDBH=S`EMqk+^_VvjY zLf}d`_}n#*gWWOYmBm?cmUP1dAXvxeVuWDgM~-uS`LL2AA?^Y^Ukt>P8N2MqNeJq^ zS$)>bK%{(tfzz*L=4HgID8fM+!kwqDj7kD90QygIceIUQH+mZExa)`Opk96ETMat@ zc4h8P@{J0lJK=Xwfh6hf6uLPxd95xOCNKrVxtRx`uR*m}=1dO&!OE(?w5)Gd&2T@sR8K0K7dlp1WpOpJSzaLsw zT{~5v#pD!RDAKHf>_y^sH0i<~gO9UKIf=v;d8NX8{pc0c6QeUnbm;9MkO6_|^@AF%LgGe%B-8QIUd6`n3p{hiD zCn)_1n~W@4cDAfsvki}ih8PrU3AOIXbroV>@_Sz|3b@VIrBRh#0=o~Iu)16FvTQDp zw&Pg!Rz(CrU$OlyXzL5II&QFzv`^*@S*~){aON@x-&d}#NBbSErNRI@QXt;;idpaH z2$%V2!y+gkno7SFkY+5I2JZ?ux9q54HJHs+?w7&HjT{)tg;y8yHS1(x+!#1;0USHq z3+U?lBO5nsKCT5VL0&}Q*>Qvi?-$~*s~_aaIf599k#>9eExFA()~1pZ_Qd;SNCBtn zPB-%LUkL0+v8?Rdn|?DuKnk%>3`L9^(<+dp)dh?&>>4^)r2wzIl<^EF{??zx=SQu< zE0$`cgo12`caa;j8s^%eq(L>T!doQ3y8Z{}Von^j351T_D*$c)l8A~DR%lHP=(|VE z@Tf-#YJ$39t0uBx78sTUI`cNd1F!N3EKb_=e|&PS!KJ0Axv;6EoEj0B{lH}n@I0r2 ze4yFwal*_Pq}`eHaRL+;LGH|xYQC3Qm^8~Ay3i`zey?&P+)!0q zUdr*C$;ttG9U=nhSJ_JaZ{EmgRNW?Z{JPFKXh5WH}2N_84hhN3N84LYfdwg3#ey8&pudT}Vi_%wcneomu)o0?5E0 z-n(FF1Ym+UZ(XROp=;Klzpo(v{chkM3Uqa3QH411h`*=Kpd+h*F9Q5H`WP^DkuiEm zREaYVcrib~3=mOwB8&PWh#*FNC?iBbq5$8S2lS0_sxVa~&Il{P-q}^=u#-x%o5c(Z zGRT|xsnlqpQ#KOV0m17s?evw=L~$m>gI(SY`KXiC*8V2lPfUK8RbX-Vp;)S(qS#3X z7&T6cx-UY=F^gh?L^P*>)HHGP>c-tiUXPu77N(hBMnSf7@c16g&4fS>8LICmBug%l z_^>DzPv|5CEQo8jLYeZZVdn285v-SQozqV~Jpsf&z22(W5?pw)VViX3><}Un4a@7h z;`@{hRU8+xuSMj%`xueO)Z^6fKe>c<+2R2YOsc9sWw-6)nTuO2ri~j%5IB65ijB?Y z3kG?#_g*`Op3lAdmIL%d0~F0fjdrWWnO81T#+9PyXO9nr)C85lZXg%?>m@=;jV8<} zjt?P+VeK-z^TEEAYHeXuD8ER237~xl_$?&9TB5&`EZ2&?N+L0woS;GiMU0Q{-h*5( zkxSN5FlFj`cB6}!{0Me~F`L}C@d(Vm9`|Y&__dQHcvEJs=$3e*!|ix8y-W`HR1E)l zP*CjBLQJK{k^=<%VN5o|;q<%Mcb7Ss1&fdsWpAGO#e`BQ|J!6>F?CQe9EQ)!VO4DJ z2l|(!!huHDHNy4`&g;Q_=QAD&X37xO#lOGcFR+xNqoH>${_;A_Q7BqB`h5bxiISw= zO6T$YV2&LY5v2;8RYpBOzto$`S?|`uV52AwycvsH4RgGQ?ACqkXX*a7xAl;rCH##a z+nPUYcLmV?JO?)%@QB= zvh7C0DSJWtk|GE!v)R@FL>L_QN-x3&gj<9NBB(`4NtZa+%(+vGwN8hnj=MUfyHdAq zZA2KqyoN@0PDTr%p4CV=fP)SXwRj-5EgvhL}b8E-5?rn8ygj$e2 zg%{Y<4Bo%(m@Ot{Oy#A*@m~7&Ufkv^1;(2kF1z3W7Egragp?F@&ewAI!sJ5;Oe#PD zpvh()T9X9FZ+)%zIof_kosWxVVZ?F(wxWEWgZIOhmDygTvzrDo{bm8g?$dMn1O9UD z>@jQOVhg8Y-c+C$D_hp~Zh@ijr|)_ngO%Sd@u`3nKE^=b+`1+kIEIkOGp8b?3tc`Rux=@O;m92R;r8?n0$46* zf9rjW-B%uBdw;ycu%YpNcNrgMJZ3_H)N1^_(BS{zd1?6)zG_3m1{Rs`-t+iONVd{T zdrwWw(^UbxpjbLp&q65N7O-|=Kt$x0XIZRDa>-pM_^>XesJ>Yd~7LOud z&_POGI2if}+*{@UDyT_TL`|GSG;9o{4b>tY8Fl0WD83T06cttN?bG+F(`wXT_ZbB8F6Z#GTsnG{$fiF%^p3=M zorN&Q^1t7Ag_I@}HaQtZrIx#2ks$<&96#Zi@S5hz_o4q_VQCPb)`H0`ga#fK)~az z(-)Zvb=HR~mnxE5h}Nr8M#bR5FBxrY#7ZXn(gF-jj zT?bRPK0O~hUeO2k{i*N|Tm`*zVY1c7qf zJi4$EyNhwVUIXLVrI%7eXfM>!)SB?hTzf<+23rtXtx?Zt+{Na;NDe1hJ~ z%mSs-HmL`1@zc~enh6@P0_=2o=!8(Us!ScJAgVySKo+ci0}j4FGH85kOxEkL7yG9D z<#D60yZyro3UwffJa%1I#X9)J>0^X$?i)!QuY%=G{tkU}FvXStLlw#IF5REr6jSw; zFxeKNbNGLya!jTY*wnp*m+3Uug-kVEzjrreIJte-zur@-xdFRXW~Y3B@uIEq00M37 z4i8N=cL15YQ}sL=?j#vj=$=QY>B8%J6qlA3Uf2=b&hnz-;<;Q8GY??DHlIJCh!|Zj zzE95WVfGlU@mW+^M3wCYY$5GU@R(K!|Eyk7GXNdBb@&?@ThN8sZ#efaZ!)t)(f zq>snxY3(-s^qA>rEOGj`d@z5*NGi2jQZ9-=DN{{XW0Q$krL1ObD=Rxbhv{HiYx~pv zSKl>+0e4om)4@*s-@9>}OsBPG+hGOe^AxP+=It8ou0W&JCpF`MWu7L3i2z|Ss)`DB zyOpH$oV8-5Q4M|?^y z(J=)U&~(3JBW+wqlz_%Xl}8OtB+ymVDvC-;gY?}rTW#OMases4C|or!>cFU)4jSzQ zkYNpeQc@PX&K&o?+e+GsBlVMCHr$Dc$gn(ebr<=Y?|>6DV3|Ey7G1jA<`|wUo9^1( zz}=mLumB3MskDp0tGmdubYI(Fbq!Om8JkqCCpj^&Bg7yE#$_a|^w_8l9_$_gQCg-h zI_@?so;?`Z5Yg?z@OXdAOQZlwCwq;a`QoPN@M@)HEP>fLshB>_;4h&P*%7vl9hDjU!K8mMp zbMNjrB8HJQ61QC(ERTs4uvs?eR@TdKqT%@(?Yrhe@sz@$8!yX;T#di9-ict2ns z&{7e>+Hyaqk|vO-DKAcDygPYYv#>a%e0TI;K9$)`<>|F~t5im@{Mp4SWv}GDXJX-l zgvJ0Sh78OS#GO$N8`w31kg}r2Bcpzie!75>Kuwr~QbCHb&PWcQ!<%!Gsl^K;i)ijV3QT{7RH~dJnR47l|{N@B8H3Rk&>*pbk&wX+{X zR<}=_%kw3Z2+7ZWgy)zy-`NeHxSUhnRotO}yt%n~!9A|1RwK6w35f^hKafWiy_vVi z&Jxb%+(1hbu)myt?KN#X{y3ey{$lo(w$!Zf4n?Fuok76;*qLH?>2(tLsU`gL>w87s7}YF9u|Z0C zr6Dc{dMt;SjYGm+$2WBlBNrDb71!6|J658hj@|F~sNQym=+8<*aB4hILF|u(VF~av zXL&rEg+v1P0*4-z{fN{??Xml}$J2CWuMBLE7do%W4e)f6a-E4goC!URJE&dBf&141b|Y<{{OSgj&oPm&=KbGJk3bo1cMB!CSK$e>3H?G!8iHAy1?mXOX*Iqk0or+qm z3E4HwCFGC@{0t9`>D&FJ2%G##@dc293vAu64J|jTlmm zGmg^(c5kmu3p1s&d3g8N^|3*w6Y$3x1O5V7PnYZWC0CmZx2B77g>OWVf!bWaU*Cm< z8HFTB@TFAX(eZfwKfV@klhc?%3(1YJ7#H3kcn{Aa`t(AjY zLLY-g9IP!IR*$zQu^2CEhJra>2h>hbC-C`GdVQUyvq9d@I5vAW-#-H5Hi!thC>0z! zrspda!3P6#F+93@@Y5YHD~rcMy|oepxoGT6g7b4%{4(gnqdmWlc6ES=IK2 z#vPDKsVXlnL}T)$z1)8u0~}h4J`D9^3h3a=L-sGP867w0%eiPo5kXY;L+f*oP1dtL z+&a&|yroT4T5&~P-*_Pw&|`vT0%SN@IW6jqtf0?9X)C8ZW0{+i&>Cf0=)xAa0jOST zE3t)YM2o=XR8>_U*7s3e-WqBuP9}gA&)s6DC9m!X*ji(wv1Ki7uMgf?x*OjD_9e%u zsHrLgc_)ix)#6gWhuNJ%Zln zvtCzZyg4I6N@78aHbmw8HGdmqED{?R8veGpD>gwHmSSkuh08|4gNn^cblWaXUN6~B z<2$cUi3s?^4*e4Ic{sdSqMfhp=qO}!(e~Qc1UJ^EhyuVgWY4{!-)3)GI?eOvPfngG z1~bijAw`(0Mh_TDMM9xu19sm(&(59O*{#RYneFmd%^$dRVm!UVryAT}u`7oYGE@By z%ymsYsjOzzQq{hC-2B$7CfTZ)Fl{K|ITpI#;k`dM<S=hAK&I#)RpucpSOax zKOZLSwA@0~Y2z6c2>9Qh@IH>-J-|YS$DnSx3X!aBb+UcVV|4gw)iV$=P>`{IsG*^w z&*Zk6FLuZT62P~$AAb#cm>ecw_b}G0`~ol=ADg{b)n#oJZyLX&i=WRI{FrD+rXiJ( ze|PPD0bYHBiq#{Rj<;h0O}LleHb}-+xzGB_iTG^Y2CpUx-171ir}&pA^hqM#eWjkws9bbKKMGp`{eL;k2Yktv9U zq(kfNyjU-Miasknw1rE z(IYbDJ*4kLl)5MTo!Nk8ExRVV*T(Cv{WmAKE7F9iRov_#bM?0@ey7a z4c;{O*VOZUuAfWAcA+iyN!|LWOjd)>Gk&-3^NdEcoHHBuoU#tJV5-bS!*y z3=o-wXdJ&FvtZMq2t7dKux&ZWN}H_#lh)1mKgW$d5Dwl4>8W{1N3@!ZMoY25!=6n= z58M0Xt9a7`g`*=qJfwVdNA7}iPPIJ%8Vukx*KN;p?4^FzjT*T=hf|*r2q&=mam&Z=JCPa$V~PXH?^Cw|dw`EEajZk8}o-@N&5r1x{Y-p)1nak;&d%34cH$hsLnvl}WbB`hHu zFPuBNb#vp7uY2vnxAfz9bAIiw>xWSOJw|BTz<>Fi4gi@n$PZqBe0;u7&?52w5fZYZ zoAKc~w-rP);d*92{4z$bg3J4~umVMwYBkrOvRQM*a#Wn!VyoWiwJpf{0Ve$2!uj6l zMi!*5IdudP3h(*)=(g56&O1U5-w<)gol}nklk80gGtr0Y=qk+UH)Q zoc3b3+C+<*1^^ckbbCkz1KwJm zMA!-xD&&N3r2#NbyqjW>AwVHVsuU{eA{!V_e|jH*PJR7c@aX7x1Ya9e4GBtvnj$;D zK4eB<$NMz*n+)djP;4&^4%=RRabyaZ7&;{@w#r~z?cURd`z9;>hu6bM)@4v=bjJH7 zLhu-D$^5A!tuAm!OSRn$j`S}OabkDXfzyKpJQRQ~o;)DsPBxqzQWGAse^u9Bs&Ed7 zKYOj!=W&?PS)^_Lw4=c$h0B*Nz`{VF4G4efoP0yqMh!~Q$GDcgjT+UbO{V5k26Q1_8ixG!=fP#BjfMz8? z^ZtAV^`(_m#HK+@OGdnV%lFX7V85tlYNCkR?eyG3TIqYaxX&e|3jdSy$gvZn_QT~f zC2Naa*N&~6a3n!+WZ&rUY#btN1HjBcGJg2xZW}XY^(adyz;@AL0!PmpCJzmbjtq(H zV*+e7ioR6*6azsXc-(Q9B$WjfRU}QC6Mt;)AVkuaykB(yN3teCv2|TZMQ6XNF=%q_ z{H*3|#r7_^o{|CJzvi|eeE3*gl*QG z!k+P2zU;(5Z}7hL?-J4?^XT?L5P=u$J-!N38yXQkU#^~0PH%R5<&Hx55eaB&niOr` z{|OQf+rYv@lW^yur2Gxw*OfGsl{_hW^6FXXDMTxms)-gCCBiLFm!AkFpy9VVniJWX8%RODu1@*3&cjhmLuE7nVU zgJM)L5q%3Slj7Ai9KA!? zGyK`(XKpOghHaskRAuU%4WnjJxT7NSG^WgJ}2G zLGD**m{datd!24AgijzW+{N;7$nuu2^#*lb2rnQOpiD$V!@@+9g!rTXu%(D1Ff=(? z?en<$S)k8T+ii;W)AJaA{PXDjHBTD8)Jp%mhZZ3ARZ+41dQ$m!96F<9%lkR8)9!k? zS*-OTsc8Cgz2|A^ofdij{qf9q6Hcc$`*kx$$IBu#=V>=pj-RXGK3VOd{r2tK_anK# zZz6%mdKM^d82xws*|?^JYUl68vh=eO@!16Pc+63Ar_yQ#B>E^1>ycKc)~}xRLr4DS z17akD{293nY?|G@ggY^OOz2qtw|=kOOcs|jh+IXIMJ{F^5lu;V@$l~TX`v!gwSoD_m{DG-R!rVfMxQbQ9jlq#>lY+BEGAkCi6?G-0KwG&0Npj z#fot%cc1 zk61FQVvx2lP_W6~v}6+v4x`m;luaty;;kudLSr(`T+}tArvNyM53k;;kx&bj9UU!I z1<3eAmW<>jBw%Xo6eJqjiqLC=RyeC`c+(#PhA#NEt63Q-H18k!UD~#8TXRM?YK^N| zSxM>|`JT4+aW{4zCTNhjW{jz+DoN<*tz+ZPTsoSumD*-*Ln9)rBS87)nsJ99?+92P zK8mVj#NoQFrFCtfQ57*JT16yS?px=Mhj{eUO$As;tLCCNQXv( zgI9KNTbE(r;O$>2Y4>&w1a)H%k6wQSL`6Bv&OqS<26qAAq9Pd4AqHoL4HkDd#P_r^ zaSa^UlF5>Uz`e7EyR;(o_&KD8c@<4v4J|zcvtPf&M9GKxkt9niYs-TYKrdktV4|ac zhZ>@aGBOceB;g~c(9+Stg%#|mU#g8<-r`S%2oX<`p`c=;O8Io-K_3`nNS(Ib()UiE zwyBZv(RXg34z^|2%PCm%`UZJf&Awwiu((W zKu1cBk5glX26XUY1~inkT;0qW*|wJ2sG7Q)mlfC+5-^>8-9#-~%8J|OtF8kJ;u)Bn z=$9O#SV`wYgGVcXD$FG%6j3JZ2hQd8TZ83lcE=SjW>s|3gNln|@Ie=J{7Erd#EjTk z+{xn#tbFpN?vK~ZP?ZfX;*0l?)M>9ov@El95u}xIl)eFF1t}kSv)_-5Hc`!ga_dXwTRRNquqA-Pb$X=XaA}`~@^gaN zP+U|T<~<#dGXARh&ggFT-O&1WlL>xazFfX_&3a+!Mi%@YX2y3AQu5&n@=B__oS_or z$@IpZ#?hVqFlC&NH?;9fwG*|}eIl6yjGxM&+UZzItx9`nOzVd|azmb))Qz@L1cySZ zJ*w7PtW29CrMe=udS$cK>&zxDny()E2_t>t&kiiR<2va2mZB&8CHDRH)<#J7%WiYC z{mHm&sP*5S;}Wk${TJ%Fp5@{D(XV<;dZ@jcG72cK;+ys;u$6+^1McUK{H0|g2AS~q zmQf=wOzmzBf0li)pZL#H7e2aO3XPP~*i8iP^;XwR? z0Ki?aEkjb!C1etqpE_O+4P@q{ytPxXN+YkZyjM17T}eg=Zt3G4nkY$A&df{~ozRC3 z=X!ob+y~$aaJ5-iqIA||N}cyk42DD^q1FVaSvt#46s+VwGrQ#Zl%saYMen(+)csfe z+*XvdGAmOc>Pz8$5s21y<6+uZcG!ykf^5oHTBvNS(1{bp!}aI?to(uUB>H(T z^~wgIIs!ykowR?DQaO9|`rY0VWV*ZhhEj*(d7C62XY70_SXW(;Ge^{R+?MYjT14+S ze(-_rbrg(xR;>wcXc=%Gbq2+QowqBHkp(^yRiI;-)4y?(>&hGxH8Y)2NwV&5j!}AGtN44K+Z$ zE`*U;n>?7r2c;Tw^l)R->GEC7c}*T=8Mg`fONV*Gi?|)Q|EGD1$hMuyMH>zh1TVtx z5H7>i0F)o3gzu^AwD9pm?>tx3b z!h{VQ#z|GUw_k|Fj2B6`R%?!qtx3(oeGcxEDH}i~43?NBvvHQGXbCZxD5`p7Koou9 zed*o=v^*!E*CsGz`w|2Qm)}w)ylmql=x_zT%Ikg6F)=(UZIcFyQs9BBw!sF8pq#IK zl6oNaqgtzYBLW#wj<2`YD)p1$F&|8^;vZ);A9BQ_Yg{ZpuNYZVhUcq`I&gLbSA?`5 zy2uixPcD4n&d==nFPkRqiiOOJchw(ytAA6&UjsjzM_=B5_uk2eI+g zotziUb6?TK$$RqWjw9^qRQGz^ii?XCx|I-tHBj^9jnNEBNH0U_+}JmkZ6HPY5#?8j)R=?6I)0xGCIuN@tmtv&pGhf7oA1tPgLP4;&wn zI(@rZS2*+xxi)v9g3^Gg46!7~SMqFf0KX9clE;y;o%K&u5{11#1aO{{L!LCc*X}8w zD(vBuT)F+jY~_u-O})rnn&$UyNNb+y=U^M+A}g|2Nm@|NWo=|2k1&1??N_sGDbCMH zYp)f*lf>?lsfBqm!&`D*{Af=~L2cbrBXLw#z)4sz!LTc1Cxf3Q*p z%?^$&n1B2EP+s#)*q4$}Z`-bfVT|fReN$b{->!l{Q6LE+XKdCn;0n>cy(BK}K`#vz z4m(43Nb4o)DSOS;B)}m^^04pcjomD)32|X!rY3!|=c=ohOw=d0?*I{T;a0v!!AXC{ zZIKna$^i;yElQT(WyA{L4%`XSn~Vj1-H3EwJpMY)Q1WBX%o zGNaUe<>aXwO{TtbI4Ds{VB@2VMs4!3_l(y`i78^5a9t^$$~5__)cbt&$H$eFLC!G8 z@`lly!+-H!Lrr2j<*f}6&uIy>8d*2jRhvZgy9(ZQu3?@X?dqd$M;P7 zg2&>Tmg5*r!J(yncdx$cvAf3k)$O&QOqQ(FTvqP`m}Rna84BE_xx|Hno!w>HoMJI| zGn0LR1T_^ApFL#S1>u}$LKN?byb74;eYvJa9?CUXDq`9Gu@{s>lDrwRmIbypoi-dp$zl0ute4H=hWW_T6p<0>=tz_P-xiK>5!Vz0{O+C$_EQw zSt2s+ZW8PT#!CdgUtunkGl#uzq%3Sid&tJ-@3Vphe6||D`MC<;`k_O3lsk*?=vBXg&bzh7<|z_}DguGbzaSVrD^&c$vt?>nYRpPTY5_XL z704(Q!01eJcmLasrF0Mh9%akkX;{%M*Qd8VQH#_Z`+GnQD#%x06;Lo=cv^7feP7(B zaBo7~L$SRB)ccs;gPVq-bu+Dn!U>FN7o>+BgHy-mBts6M@DjCWzI|(zZq35?iE;Cj zg;F^mYP0BhV$Bwvovcr|X!S`o9XLmU`qeJpSlf&%v3b`JBPtFAqjLIp{6^5ePmEGG zFAqOdRE}Rg{E3#Hdb^8<=5mSNNj$9Zce`7C| zH#GnTTB!9!#PXbz`)v!tAeU^yFRYcc&tPWC2_@9oYu3`Syb!~_GK!@@T1qk^xUR_@ z%@*M-uY`dGN@8%zGsNtGYrM5=U0lGHrG^2c^E~ZF7CmPCT-5S0w`^jgfza=qp|#wC zjd}8j6+P(v(tU)70vXd0Bb#!H04JrvdYLE3Q zgpx0-#*6TSTiZ=!5D84cH~~`ES~I9xV5><5srU>;&Kyu7{j*E3EH(vKCnj#4I?p|O z$fl7&0PX?=cQiA2&=D95WK}>#=BNiiy!)^5kH;V5Zx4|cO>t)#&aqvWJJ{KBP{S)A z4fz4$SbvO=H8N-^=}+onw`-%w16U^TdO;4;Ik#%jmpbMMAdFLVBS{>vXEHoOIIAsY z-aby^@lS6?$+uUaxqx26xHM$-TD(*{a^uB4I_9w9aJ;jOyRi!jAg8xkm61u3>@>_# sbgRRWU5Q7F^#9i7_hQYiP9L%=Gj!^^_%(++Ffjm!Inv6w)W`|{Z+9>#_5c6? literal 0 HcmV?d00001 diff --git a/docs/images/flard_02.png b/docs/images/flard_02.png new file mode 100644 index 0000000000000000000000000000000000000000..2fda987d6437efa51c44fc25a68f31ab8e235f3d GIT binary patch literal 73082 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 literal 0 HcmV?d00001 diff --git a/docs/images/flard_03.png b/docs/images/flard_03.png new file mode 100644 index 0000000000000000000000000000000000000000..592f09567d74f65e6ab1ea26faf813004fe700ba GIT binary patch literal 34849 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 literal 0 HcmV?d00001 diff --git a/docs/images/flard_06.png b/docs/images/flard_06.png new file mode 100644 index 0000000000000000000000000000000000000000..da241cbd15377b6ad77e8b49b29166fb2427a133 GIT binary patch literal 29581 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

8ZNDGUw1oRoaGsA#Ob7#a)e_gZk-Exc=W>&>~S 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

<=ye_;1e=7<+760oMYdFj>kG8u&J>LF532 zUK|Nk2$_E9Fb#^n5Otrti=DD>7}R_uwai;VDnW6%H@y%Nv86o-K`;dn2}ROcUpwO| z0Cc@ee&9!8AhCPt1u&e!NCv3}UfSQ0gRf~|8X1#@O-ImD{RC~5V?09uE}%-AIAqgp-TFB~-xWEiFAq4gr;POK zL%ZRoxX~}!y58^bpWk^z?eb-kt|9_jZVvaysPiMubOjJfo}2t)Fz6JbKJe3YX2dIo6F5Xb@obfPC!^wa(0 z_#6?*_#q-B)Ot zCAFvNuJ9dhaTtz*eIp@xQcljHq=Wd=J@P~Haf$)4df>#3-dnmm;VJ29)C{i?A~6I= z?LX0N)5x>;QHQ)lz?49!;YJ42?iX&JqyTU2v-8VTvyxv-o(;p^f~5y`hgyk3kdXll z#|Q$h-%BZheXpKv#}DYkY$8xZT5&24-^)(RWVjJEmooPEg)+fIuFHIU1dg+|Hat#l zln7oIQf-qiie)+Alrqj1M+!RwTJjY-v=ez>2mxY6&^EG>J90O}$TK;-y!CbQPU&KS zEX}f^wej|H#(C45EoOPAyyN%~K(ZOOqB4(pLw}s-2R~bhk2c-h*b#xQj+#zwZGiAV z`AK=N_P_~_oJ#v_pXMkvO&RrV_lT)p-5^oK{rlaGa@+3D0jF8O*C4r}8brXyf=J-! z`NsO29ysWco0#Te85S|3ZoO*lVog~jDCQ1L%0k4&X0+YZ3F%DQ zVyfFZtlh^wJBQF9(eHP>9u5FQAsGF~RASY3YTFa7 zbrpBHp%4WiAH4K|;-!*gzi*u|Vak5L)mVYYa9{}q1LJZ#nhK>U(BNrJ!LURC`{XY2 zMV=uThAfc)3Hg!)69!Qc-d8Y>2sju^j$=d-%cyAp0|-(Ja8TOotsua1O*9wpF9&04 zERtgxWbxH^iay$2F(R(8EIKfv6+x&K<Li~EcR~w**z`qh7Z0eqh zKluKdka*6Rssz8W5G8+lGf^Sh21|nR5tbk$H_j;J5Rp_(hYA6!5())REHpSbZp*c| zkl+{e>3`VD*jscHq4kye2!`N{Ee01K5KE40iom-pAogEFncx}c%RAv z4E1+Nq5nODn4N9>d;cUh`077MY%wO%Y-(zR?V?HS%KyV|Y|m%0phZYiSn%poN!b71 t?u4M!m`G3a8<9>yg3qq>PkbYYes)nO2)1~)|NbCTMnds>wU|-R{{tkSle_=` literal 0 HcmV?d00001 diff --git a/docs/images/flard_07.png b/docs/images/flard_07.png new file mode 100644 index 0000000000000000000000000000000000000000..207c857e1238c9093647e25825a5fa8a9f32e402 GIT binary patch literal 41110 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

Y5=y^M8D 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�Y(RtSGeeDb5jhNEdE`h59?Y7B$3vPO+ z03AnVj$T7w5#R04)z*B!i<8;WUfLF`<@LR5jDJfsvkkqRhc+Q@Fb%4(^fxmSk!zZAWuEIs&rh}?nZL$wyn;-e7|<~f^9Kv_@?0G1wa}m4@GH(EpGa5u3fhf!65TJDC)T5t)Yd=GOp~k>M9#6Z~K1^kMxiH zZXON-dwN(#6E98?^o?(#aPrYndZ~-!3X<$OrLJQc5sTj;|6AbTG0~9`bi$-hPE0zI zGV`j~Cj*(dnK+a8gS=qNRq*MtYOOxxcP6X2`}SN7!Tt6&@(~rDS(a50_ykxqCm;%( zq#S2^y4C-WugkHF(z2_h^!A6Z<5-6J0LS)7t540rf^D{(5gQ$wPGzg8aiR?H@8Gvm zAQIxYGUY>FVP0xkO-iwoy*Rx#v%ImMo*wN~DftLRSY3wu5ws7jmrqSKW$zw_*0(GJ zCKo!c&!g7X6?9gf&z9$5h04p;R$sb)k}$E2*>C3|xPHTkmew~8`~BC~UO6{fTXw>2I4>s!;rBN}av67-bB`Zp z#LAgMT9_EW#jC%qlL+v$9PKuhntM5dc00eeTLH<;goo2T%9GKi-DALR#fNOMgTLIOgAZcjz?zIB=D^A!3_VgPut+YjBp9L~BbDeH}L1?OI7md;YC1f9- zp=mll-~A}}lJE=LX|#Pe>>SS_1}ZOij0rn5vt1^%Vcoc9z3%qkv5X#AbGs&0c#RYVG~t=^vP&nHPkh`M(L zg-@%2OTz0XM&$FPQVIWx1QET{3i>1=5ks&JFjyJ?DC@7lp%qoeo&YJwu+;w%jb zue_^LBcsjGoX_b(j!v*FfoU<$xAh^4Kf=X&9r~q5jkK;|4JP-U@$bC4)@@n@ytf-a z>j)#B5j{C_+U_T_ma_B}u9`LUX(UY12eBVMk~uzlvK!_bM(A+4hy@|F&%cg~*Jx@p zUME@7DydDpybha}p;~NV)iiYQ@RAw2|DF|wLw)P2a=TU*mO#9lk&_K&q@?`1Xa-l{ zUwvNRPKz>rRny4ToR#GIwQ00ub_=`Q*X-Ys3oQA+0KGs$zZG8L`;Tco7^LyP=?`rS z;Uq5f3a2pS>hXyIdu_vOQwpY>yXahCr`vz|OJQiJYWsF3Bg1vpS;pexzBOwUf=K)3H&ZUW zu=AmZx*vMTx?lm?FV*D&rk;BF<#c-bfeS8(4Gw00|N9t0oS=o#QGBujxvDdQN5DLv z!om*|F(6`rcwg2R)NOa5<$!@P49mj~i{tf;uitRh4aq6V4yz*)i)80!W8u-okrYW? zzWQ=>969L`AROmB@V=;ndNr!{Y$w|KGA}J6UdgT>NmWv;H$hl&LZ_5_oUyvG>iQ&m(xEZ(6K*Kb z6NW)ilGILe(eLNl+at}*9rxc)(zL>HqR$5&w0G^=&PN`xOq~iE2-?MUbtPSRp%@M) zpMSpU_9`c);<{GoGI_E5bGz!435)I9y|2Bu{li@!RyS6Mq9FkCi-Q-l6ieU)Ns^dJ zjSM5IVLrXV⁣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 z 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 Y;@0A_E!%FGMtU(71x?UrISbhT10pFI1poj5 literal 0 HcmV?d00001 diff --git a/docs/images/flard_12.png b/docs/images/flard_12.png new file mode 100644 index 0000000000000000000000000000000000000000..e0d92c90c7ffd06deacdb72af21a7b33765df48f GIT binary patch literal 34684 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 literal 0 HcmV?d00001 From 053bc174dec8170b5d4f2edc9e22fbe8d813eca3 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 14 Jun 2016 23:11:30 +0100 Subject: [PATCH 160/169] Add Unique, relax target checks, closes #130, fixes #134, bump to 0.5.7 --- gradle.properties | 2 +- .../tools/obfuscation/AnnotatedMixin.java | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/launch/MixinTweaker.java | 1 + .../spongepowered/asm/mixin/Interface.java | 8 + .../asm/mixin/MixinEnvironment.java | 29 ++- .../org/spongepowered/asm/mixin/Unique.java | 71 +++++++ .../modify/LocalVariableDiscriminator.java | 4 +- .../mixin/injection/struct/InjectionInfo.java | 2 +- .../asm/mixin/transformer/ClassInfo.java | 21 +- .../asm/mixin/transformer/InterfaceInfo.java | 65 ++++++- .../asm/mixin/transformer/MixinConfig.java | 2 +- .../asm/mixin/transformer/MixinInfo.java | 66 +++++-- .../MixinPreProcessorStandard.java | 179 ++++++++---------- .../mixin/transformer/MixinTargetContext.java | 73 ++++++- .../mixin/transformer/TargetClassContext.java | 62 +++++- .../org/spongepowered/asm/util/ASMHelper.java | 4 + 17 files changed, 459 insertions(+), 134 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/Unique.java diff --git a/gradle.properties b/gradle.properties index 030b3362..1b376e24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.6 +buildVersion=0.5.7 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 69bd7590..2714c7c6 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -212,7 +212,7 @@ class AnnotatedMixin { this.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " could not be found", this); return null; } else if (type.isPublic()) { - this.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " is public and must be specified in value", this); + this.printMessage(Kind.WARNING, "Mixin target " + privateTarget + " is public and must be specified in value", this); return null; } this.addSoftTarget(type, privateTarget); diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 67b8c7c7..4eade2ab 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.6"; + public static final String VERSION = "0.5.7"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index 1de3731c..e4ba4d5a 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -233,6 +233,7 @@ public class MixinTweaker implements ITweaker { * * @param config config resource name, does not require a leading / */ + @SuppressWarnings("deprecation") static void addConfig(String config) { if (config.endsWith(".json")) { MixinTweaker.logger.debug("Registering mixin config: {}", config); diff --git a/src/main/java/org/spongepowered/asm/mixin/Interface.java b/src/main/java/org/spongepowered/asm/mixin/Interface.java index 9c9be4c4..791c9286 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Interface.java +++ b/src/main/java/org/spongepowered/asm/mixin/Interface.java @@ -53,4 +53,12 @@ public @interface Interface { */ public String prefix(); + /** + * If set to true, all methods implementing this interface are + * treated as if they were individually decorated with {@link Unique} + * + * @return true to mark all implementing methods as unique + */ + public boolean unique() default false; + } diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 99ea0dcb..2803f17e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -276,7 +276,9 @@ public final class MixinEnvironment implements ITokenProvider { }, /** - * Run the CheckClassAdapter on all classes after mixins are applied + * Run the CheckClassAdapter on all classes after mixins are applied, + * also enables stricter checks on mixins for use at dev-time, promotes + * some warning-level messages to exceptions */ DEBUG_VERIFY(Option.DEBUG_ALL, "verify"), @@ -292,6 +294,28 @@ public final class MixinEnvironment implements ITokenProvider { */ DEBUG_INJECTORS(Option.DEBUG_ALL, "countInjections"), + /** + * Enable strict checks + */ + DEBUG_STRICT(Option.DEBUG_ALL, "strict") { + @Override + boolean getBooleanValue() { + return Booleans.parseBoolean(System.getProperty(this.property), false); + } + }, + + /** + * If false (default), {@link Unique} public methods merely raise a + * warning when encountered and are not merged into the target. If true, + * an exception is thrown instead + */ + DEBUG_UNIQUE(Option.DEBUG_STRICT, "unique"), + + /** + * Enable strict checking for mixin targets + */ + DEBUG_TARGETS(Option.DEBUG_STRICT, "targets"), + /** * Disable the injector handler remapper */ @@ -802,6 +826,7 @@ public final class MixinEnvironment implements ITokenProvider { */ @Deprecated public MixinEnvironment addConfiguration(String config) { + MixinEnvironment.logger.warn("MixinEnvironment::addConfiguration is deprecated and will be removed. Use Mixins::addConfiguration instead!"); Mixins.addConfiguration(config, this); return this; } @@ -1199,6 +1224,8 @@ public final class MixinEnvironment implements ITokenProvider { */ @Deprecated public static void setCompatibilityLevel(CompatibilityLevel level) throws IllegalArgumentException { + MixinEnvironment.logger.warn("MixinEnvironment::setCompatibilityLevel is deprecated and will be removed. Set level via config instead!"); + if (level != MixinEnvironment.compatibility && level.isAtLeast(MixinEnvironment.compatibility)) { if (!level.isSupported()) { throw new IllegalArgumentException("The requested compatibility level " + level + " could not be set. Level is not supported"); diff --git a/src/main/java/org/spongepowered/asm/mixin/Unique.java b/src/main/java/org/spongepowered/asm/mixin/Unique.java new file mode 100644 index 00000000..c798e7fe --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/Unique.java @@ -0,0 +1,71 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * This annotation, when applied to a member method in a mixin, indicates that + * the method should never overwrite a matching method in the target + * class. This indicates that the method differs from the normal "overlay-like" + * behaviour of mixins in general, and should only ever be added to the + * target. + * + *

Typical usage of this annotation would be to decorate a utility method in + * a mixin, or mark an interface-implementing method which must not overwrite a + * target if it exists (consider appropriate use of {@link Intrinsic} in these + * situations).

+ * + *

Because of the mixed usage, this annotation has different implications for + * methods with differing visibility:

+ * + *
+ *
public methods
+ *
public methods marked with this annotation are discarded if a + * matching target exists. A warning-level message is generated.
+ *
private and protected methods
+ *
non-public methods are renamed if a matching target method is + * found, this allows utility methods to be safely assigned meaningful names + * in code, but renamed if a conflict occurs when a mixin is applied.
+ *
+ * + *

Notes

+ * + *
    + *
  • To mark all methods in a mixin as unique, apply the annotation to the + * mixin itself
  • + *
  • Uniqueness can be defined on a per-interface basis by using an + * {@link Implements} annotation with unique set to true + *
  • + *
+ */ +@Target({ ElementType.METHOD, ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +public @interface Unique { + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java index 48d68c61..6691ca91 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java @@ -259,8 +259,8 @@ public class LocalVariableDiscriminator { } /** - * If the user specifies no values for {@link #ordinal}, {@link #index} or - * {@link #names} then we are considered to be operating in "implicit mode" + * If the user specifies no values for ordinal, index or + * names then we are considered to be operating in "implicit mode" * where only a single local variable of the specified type is expected to * exist. * 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 9bb21819..9de737f8 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 @@ -141,7 +141,7 @@ public abstract class InjectionInfo { this.mixin = mixin; this.method = method; this.annotation = annotation; - this.classNode = mixin.getTargetClass(); + this.classNode = mixin.getTargetClassNode(); this.isStatic = ASMHelper.methodIsStatic(method); this.readAnnotation(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 500676f1..60f61eb4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -46,8 +46,10 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.transformer.ClassInfo.Member.Type; import org.spongepowered.asm.mixin.transformer.MixinInfo.MixinClassNode; +import org.spongepowered.asm.util.ASMHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -59,8 +61,8 @@ import com.google.common.collect.ImmutableSet; */ public class ClassInfo extends TreeInfo { - public static final int INCLUDE_PRIVATE = 0x0002; - public static final int INCLUDE_STATIC = 0x0008; + public static final int INCLUDE_PRIVATE = Opcodes.ACC_PRIVATE; + public static final int INCLUDE_STATIC = Opcodes.ACC_STATIC; public static final int INCLUDE_ALL = ClassInfo.INCLUDE_PRIVATE | ClassInfo.INCLUDE_STATIC; /** @@ -334,10 +336,13 @@ public class ClassInfo extends TreeInfo { public class Method extends Member { private final List frames; + + private boolean unique; public Method(Member member) { super(member); this.frames = member instanceof Method ? ((Method)member).frames : null; + this.unique = member instanceof Method ? ((Method)member).unique : false; } public Method(MethodNode method) { @@ -347,21 +352,25 @@ public class ClassInfo extends TreeInfo { public Method(MethodNode method, boolean injected) { super(Type.METHOD, method.name, method.desc, method.access, injected); this.frames = this.gatherFrames(method); + this.unique = ASMHelper.getVisibleAnnotation(method, Unique.class) != null; } public Method(String name, String desc) { super(Type.METHOD, name, desc, Opcodes.ACC_PUBLIC, false); this.frames = null; + this.unique = false; } public Method(String name, String desc, int access) { super(Type.METHOD, name, desc, access, false); this.frames = null; + this.unique = false; } public Method(String name, String desc, int access, boolean injected) { super(Type.METHOD, name, desc, access, injected); this.frames = null; + this.unique = false; } private List gatherFrames(MethodNode method) { @@ -378,6 +387,14 @@ public class ClassInfo extends TreeInfo { public List getFrames() { return this.frames; } + + public boolean isUnique() { + return this.unique; + } + + public void setUnique(boolean unique) { + this.unique = unique; + } @Override public ClassInfo getOwner() { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java index ce7360e8..c0b04240 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java @@ -31,15 +31,22 @@ import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Interface; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.ASMHelper; +import com.sun.xml.internal.ws.org.objectweb.asm.Opcodes; + /** * Information about an interface being runtime-patched onto a mixin target * class, see {@link org.spongepowered.asm.mixin.Implements Implements} */ +/** + * @author adam + * + */ public class InterfaceInfo extends TreeInfo { /** @@ -58,6 +65,12 @@ public class InterfaceInfo extends TreeInfo { */ private final Type iface; + /** + * True if all methods implementing this interface should be treated as + * unique + */ + private final boolean unique; + /** * Method signatures in the interface, lazy loaded */ @@ -70,7 +83,7 @@ public class InterfaceInfo extends TreeInfo { * @param prefix Method prefix * @param iface Interface to load */ - private InterfaceInfo(MixinInfo mixin, String prefix, Type iface) { + private InterfaceInfo(MixinInfo mixin, String prefix, Type iface, boolean unique) { if (prefix == null || prefix.length() < 2 || !prefix.endsWith("$")) { throw new InvalidMixinException(mixin, String.format("Prefix %s for iface %s is not valid", prefix, iface.toString())); } @@ -78,6 +91,7 @@ public class InterfaceInfo extends TreeInfo { this.mixin = mixin; this.prefix = prefix; this.iface = iface; + this.unique = unique; } /** @@ -123,6 +137,15 @@ public class InterfaceInfo extends TreeInfo { public Type getIface() { return this.iface; } + + /** + * Get the internal name of the interface + * + * @return the internal name for the interface + */ + public String getName() { + return this.iface.getClassName(); + } /** * Get the internal name of the interface @@ -132,6 +155,15 @@ public class InterfaceInfo extends TreeInfo { public String getInternalName() { return this.iface.getInternalName(); } + + /** + * Get whether all methods for this interface should be treated as unique + * + * @return true to treat all member methods as unique + */ + public boolean isUnique() { + return this.unique; + } /** * Processes a method node in the mixin and renames it if necessary. If the @@ -148,20 +180,46 @@ public class InterfaceInfo extends TreeInfo { } if (!method.name.startsWith(this.prefix)) { + if (this.methods.contains(method.name + method.desc)) { + this.decorateUniqueMethod(method); + } return false; } String realName = method.name.substring(this.prefix.length()); String signature = realName + method.desc; + if (!this.methods.contains(signature)) { - throw new InvalidMixinException(this.mixin, String.format("%s does not exist in target interface %s", realName, this.iface.toString())); + throw new InvalidMixinException(this.mixin, String.format("%s does not exist in target interface %s", realName, this.getName())); + } + + if ((method.access & Opcodes.ACC_PUBLIC) == 0) { + throw new InvalidMixinException(this.mixin, String.format("%s cannot implement %s because it is not visible", realName, this.getName())); } ASMHelper.setVisibleAnnotation(method, MixinRenamed.class, "originalName", method.name, "isInterfaceMember", true); + this.decorateUniqueMethod(method); method.name = realName; return true; } + /** + * Decorate the target method with {@link Unique} if the interface is marked + * as unique + * + * @param method method to decorate + */ + private void decorateUniqueMethod(MethodNode method) { + if (!this.unique) { + return; + } + + if (ASMHelper.getVisibleAnnotation(method, Unique.class) == null) { + ASMHelper.setVisibleAnnotation(method, Unique.class); + this.mixin.getClassInfo().findMethod(method).setUnique(true); + } + } + /** * Convert an {@link Interface} annotation node into an * {@link InterfaceInfo} @@ -173,12 +231,13 @@ public class InterfaceInfo extends TreeInfo { static InterfaceInfo fromAnnotation(MixinInfo mixin, AnnotationNode node) { String prefix = ASMHelper.getAnnotationValue(node, "prefix"); Type iface = ASMHelper.getAnnotationValue(node, "iface"); + Boolean unique = ASMHelper.getAnnotationValue(node, "unique"); if (prefix == null || iface == null) { throw new InvalidMixinException(mixin, String.format("@Interface annotation on %s is missing a required parameter", mixin)); } - return new InterfaceInfo(mixin, prefix, iface); + return new InterfaceInfo(mixin, prefix, iface, unique != null ? unique.booleanValue() : false); } @Override diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 67bc5f98..9a7b6545 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -756,7 +756,7 @@ class MixinConfig implements Comparable, IMixinConfig { * * @param configFile * @param outer fallback environment - * @return + * @return new Config */ static Config create(String configFile, MixinEnvironment outer) { try { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 364adbbe..359e84da 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -47,9 +47,11 @@ import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.extensibility.IMixinConfig; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -109,6 +111,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { */ private boolean detachedSuper; + /** + * True if this mixin is decorated with {@link Unique} + */ + private boolean unique; + /** * All interfaces implemented by this mixin, including soft * implementations @@ -137,8 +144,16 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { State(byte[] mixinBytes, ClassInfo classInfo) { this.mixinBytes = mixinBytes; + this.connect(); + this.classInfo = classInfo != null ? classInfo : ClassInfo.fromClassNode(this.getClassNode()); + } + + private void connect() { this.classNode = this.createClassNode(0); - this.classInfo = classInfo != null ? classInfo : ClassInfo.fromClassNode(this.classNode); + } + + private void complete() { + this.classNode = null; } ClassInfo getClassInfo() { @@ -156,6 +171,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { boolean isDetachedSuper() { return this.detachedSuper; } + + boolean isUnique() { + return this.unique; + } List getSoftImplements() { return this.softImplements; @@ -192,6 +211,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { type.validate(this, targetClasses); this.detachedSuper = type.isDetachedSuper(); + this.unique = ASMHelper.getVisibleAnnotation(this.getClassNode(), Unique.class) != null; // Pre-flight checks this.validateInner(); @@ -206,7 +226,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { this.validateChanges(type, targetClasses); // Null out the validation classnode - this.classNode = null; + this.complete(); } private void validateInner() { @@ -380,7 +400,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Get whether this mixin is detached super, must call {@link #validate} * first * - * @return + * @return true if super is detached */ boolean isDetachedSuper() { return this.detached; @@ -547,6 +567,11 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Mixin type */ private final transient SubType type; + + /** + * Strict target checks enabled + */ + private final transient boolean strict; /** * Holds state that currently is not fully initialised or validated @@ -566,18 +591,19 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param runTransformers * @param plugin * @param suppressPlugin - * @throws ClassNotFoundException */ MixinInfo(MixinConfig parent, String mixinName, boolean runTransformers, IMixinConfigPlugin plugin, boolean suppressPlugin) { this.parent = parent; this.name = mixinName; this.className = parent.getMixinPackage() + mixinName; this.plugin = plugin; - this.phase = MixinEnvironment.getCurrentEnvironment().getPhase(); + this.phase = parent.getEnvironment().getPhase(); + this.strict = parent.getEnvironment().getOption(Option.DEBUG_TARGETS); // Read the class bytes and transform try { - this.pendingState = new State(this.loadMixinClass(this.className, runTransformers)); + byte[] mixinBytes = this.loadMixinClass(this.className, runTransformers); + this.pendingState = new State(mixinBytes); this.info = this.pendingState.getClassInfo(); this.type = this.initType(); } catch (Exception ex) { @@ -627,7 +653,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * * @param classNode * @param suppressPlugin - * @return + * @return target class list read from classNode */ protected List readTargetClasses(ClassNode classNode, boolean suppressPlugin) { if (classNode == null) { @@ -672,7 +698,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { targetName = targetName.replace('/', '.'); if (this.plugin == null || suppressPlugin || this.plugin.shouldApplyMixin(targetName, this.className)) { ClassInfo targetInfo = this.getTarget(targetName, checkPublic); - if (!outTargets.contains(targetInfo)) { + if (targetInfo != null && !outTargets.contains(targetInfo)) { outTargets.add(targetInfo); targetInfo.addMixin(this); } @@ -683,21 +709,29 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { private ClassInfo getTarget(String targetName, boolean checkPublic) throws InvalidMixinException { ClassInfo targetInfo = ClassInfo.forName(targetName); if (targetInfo == null) { - throw new InvalidMixinException(this, "@Mixin target " + targetName + " was not found " + this); + this.handleTargetError("@Mixin target " + targetName + " was not found " + this); + return null; } this.type.validateTarget(targetName, targetInfo); if (checkPublic && targetInfo.isPublic()) { - throw new InvalidMixinException(this, "@Mixin target " + targetName + " is public in " + this - + " and must be specified in value"); + this.handleTargetError("@Mixin target " + targetName + " is public in " + this + " and should be specified in value"); } return targetInfo; } + private void handleTargetError(String message) { + if (this.strict) { + this.logger.error(message); + throw new InvalidMixinException(this, message); + } + this.logger.warn(message); + } + /** * Read the priority from the {@link Mixin} annotation * * @param classNode - * @return + * @return priority read from classNode */ protected int readPriority(ClassNode classNode) { if (classNode == null) { @@ -792,6 +826,13 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { return this.getState().isDetachedSuper(); } + /** + * True if this mixin is decorated with {@link Unique} + */ + public boolean isUnique() { + return this.getState().isUnique(); + } + /** * Get the logging level for this mixin */ @@ -958,4 +999,5 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } return null; } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java index 19e500be..12d1d1c7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -25,10 +25,7 @@ package org.spongepowered.asm.mixin.transformer; import java.lang.annotation.Annotation; -import java.util.Deque; import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -52,7 +49,6 @@ import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; -import org.spongepowered.asm.obfuscation.RemapperChain; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; @@ -92,14 +88,16 @@ class MixinPreProcessorStandard { */ protected final ClassNode classNode; - private final boolean verboseLogging; + private final boolean verboseLogging, strictUnique; private boolean prepared, attached; MixinPreProcessorStandard(MixinInfo mixin, ClassNode classNode) { this.mixin = mixin; this.classNode = classNode; - this.verboseLogging = mixin.getParent().getEnvironment().getOption(Option.DEBUG_VERBOSE); + MixinEnvironment env = mixin.getParent().getEnvironment(); + this.verboseLogging = env.getOption(Option.DEBUG_VERBOSE); + this.strictUnique = env.getOption(Option.DEBUG_UNIQUE); } /** @@ -195,13 +193,18 @@ class MixinPreProcessorStandard { continue; } - if (this.processMemberMethod(context, mixinMethod, Shadow.class, true, true)) { + if (this.processShadowMethod(context, mixinMethod)) { iter.remove(); context.addShadowMethod(mixinMethod); continue; } - if (this.processMemberMethod(context, mixinMethod, Overwrite.class, false, false)) { + if (this.processOverwriteMethod(context, mixinMethod)) { + continue; + } + + if (this.processUniqueMethod(context, mixinMethod)) { + iter.remove(); continue; } @@ -222,28 +225,50 @@ class MixinPreProcessorStandard { String handlerName = context.getHandlerName(annotation, mixinMethod, surrogate); Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_ALL); + + if (method.isUnique()) { + MixinPreProcessorStandard.logger.warn("Redundant @Unique on injector method {} in {}. Injectors are implicitly unique", method, context); + } + method.renameTo(handlerName); mixinMethod.name = handlerName; + return true; } - protected boolean processMemberMethod(MixinTargetContext context, MethodNode mixinMethod, Class annotationType, - boolean mustExist, boolean mustBePrivate) { - AnnotationNode annotation = ASMHelper.getVisibleAnnotation(mixinMethod, annotationType); + protected boolean processShadowMethod(MixinTargetContext context, MethodNode mixinMethod) { + return this.processSpecialMethod(context, mixinMethod, Shadow.class, false); + } + + protected boolean processOverwriteMethod(MixinTargetContext context, MethodNode mixinMethod) { + return this.processSpecialMethod(context, mixinMethod, Overwrite.class, true); + } + + protected boolean processSpecialMethod(MixinTargetContext context, MethodNode mixinMethod, Class type, boolean overwrite) { + + AnnotationNode annotation = ASMHelper.getVisibleAnnotation(mixinMethod, type); if (annotation == null) { return false; } + if (this.mixin.isUnique() && overwrite) { + throw new InvalidMixinException(this.mixin, "@Overwrite method " + mixinMethod.name + " found in a @Unique mixin"); + } + Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_ALL); - MethodNode target = MixinPreProcessorStandard.findMethod(context.getTargetClass(), mixinMethod, annotation); + MethodNode target = context.findMethod(mixinMethod, annotation); + + if (method.isUnique()) { + throw new InvalidMixinException(this.mixin, ASMHelper.getSimpleName(type) + " method " + mixinMethod.name + " cannot be @Unique"); + } if (target == null) { - if (!mustExist) { + if (overwrite) { return false; } - target = MixinPreProcessorStandard.findRemappedMethod(context.getTargetClass(), mixinMethod); + target = context.findRemappedMethod(mixinMethod); if (target == null) { - throw new InvalidMixinException(this.mixin, annotationType.getSimpleName() + " method " + mixinMethod.name + throw new InvalidMixinException(this.mixin, ASMHelper.getSimpleName(type) + " method " + mixinMethod.name + " was not located in the target class"); } mixinMethod.name = target.name; @@ -255,7 +280,7 @@ class MixinPreProcessorStandard { } if (!target.name.equals(mixinMethod.name)) { - if (mustBePrivate && (target.access & Opcodes.ACC_PRIVATE) == 0) { + if (!overwrite && (target.access & Opcodes.ACC_PRIVATE) == 0) { throw new InvalidMixinException(this.mixin, "Non-private method cannot be aliased. Found " + target.name); } @@ -266,6 +291,37 @@ class MixinPreProcessorStandard { return true; } + protected boolean processUniqueMethod(MixinTargetContext context, MethodNode mixinMethod) { + Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_ALL); + if (method == null || (!method.isUnique() && !this.mixin.isUnique())) { + return false; + } + + MethodNode target = context.findMethod(mixinMethod, null); + if (target == null) { + return false; + } + + if ((mixinMethod.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) != 0) { + String uniqueName = context.getUniqueName(mixinMethod); + MixinPreProcessorStandard.logger.log(this.mixin.getLoggingLevel(), "Renaming @Unique method {}{} to {} in {}", + mixinMethod.name, mixinMethod.desc, uniqueName, this.mixin); + mixinMethod.name = uniqueName; + method.renameTo(uniqueName); + return false; + } + + if (this.strictUnique) { + throw new InvalidMixinException(this.mixin, "Method conflict, @Unique method " + mixinMethod.name + " in " + this.mixin + + " cannot overwrite " + target.name + target.desc + " in " + context.getTarget()); + } + + MixinPreProcessorStandard.logger.warn("Discarding @Unique public method {} in {} because it already exists in {}", mixinMethod.name, + this.mixin, context.getTarget()); + + return true; + } + protected void processMethod(MethodNode mixinMethod) { Method method = this.mixin.getClassInfo().findMethod(mixinMethod); if (method == null) { @@ -293,12 +349,12 @@ class MixinPreProcessorStandard { context.transformDescriptor(mixinField); Field field = this.mixin.getClassInfo().findField(mixinField); - FieldNode target = MixinPreProcessorStandard.findField(context.getTargetClass(), mixinField, shadow); + FieldNode target = context.findField(mixinField, shadow); if (target == null) { if (shadow == null) { continue; } - target = MixinPreProcessorStandard.findRemappedField(context.getTargetClass(), mixinField); + target = context.findRemappedField(mixinField); if (target == null) { // If this field is a shadow field but is NOT found in the target class, that's bad, mmkay throw new InvalidMixinException(this.mixin, "Shadow field " + mixinField.name + " was not located in the target class"); @@ -400,91 +456,4 @@ class MixinPreProcessorStandard { } } - protected static MethodNode findMethod(ClassNode classNode, MethodNode method, AnnotationNode annotation) { - Deque aliases = new LinkedList(); - aliases.add(method.name); - if (annotation != null) { - List aka = ASMHelper.>getAnnotationValue(annotation, "aliases"); - if (aka != null) { - aliases.addAll(aka); - } - } - - return MixinPreProcessorStandard.findMethodRecursive(classNode, aliases, method.desc); - } - - protected static MethodNode findRemappedMethod(ClassNode classNode, MethodNode method) { - RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); - String remappedName = remapperChain.mapMethodName(classNode.name, method.name, method.desc); - if (remappedName.equals(method.name)) { - return null; - } - - Deque aliases = new LinkedList(); - aliases.add(remappedName); - - return MixinPreProcessorStandard.findMethodRecursive(classNode, aliases, method.desc); - } - - private static MethodNode findMethodRecursive(ClassNode classNode, Deque aliases, String desc) { - String alias = aliases.poll(); - if (alias == null) { - return null; - } - - for (MethodNode target : classNode.methods) { - if (target.name.equals(alias) && target.desc.equals(desc)) { - return target; - } - } - - return MixinPreProcessorStandard.findMethodRecursive(classNode, aliases, desc); - } - - protected static FieldNode findField(ClassNode classNode, FieldNode field, AnnotationNode shadow) { - Deque aliases = new LinkedList(); - aliases.add(field.name); - if (shadow != null) { - List aka = ASMHelper.>getAnnotationValue(shadow, "aliases"); - if (aka != null) { - aliases.addAll(aka); - } - } - - return MixinPreProcessorStandard.findFieldRecursive(classNode, aliases, field.desc); - } - - protected static FieldNode findRemappedField(ClassNode classNode, FieldNode field) { - RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); - String remappedName = remapperChain.mapFieldName(classNode.name, field.name, field.desc); - if (remappedName.equals(field.name)) { - return null; - } - - Deque aliases = new LinkedList(); - aliases.add(remappedName); - return MixinPreProcessorStandard.findFieldRecursive(classNode, aliases, field.desc); - } - - /** - * Finds a field in the target class - * - * @param aliases - * @param desc - * @return Target field or null if not found - */ - private static FieldNode findFieldRecursive(ClassNode classNode, Deque aliases, String desc) { - String alias = aliases.poll(); - if (alias == null) { - return null; - } - - for (FieldNode target : classNode.fields) { - if (target.name.equals(alias) && target.desc.equals(desc)) { - return target; - } - } - - return MixinPreProcessorStandard.findFieldRecursive(classNode, aliases, desc); - } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 76b8bdac..3e689a6e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -26,8 +26,10 @@ package org.spongepowered.asm.mixin.transformer; import java.util.ArrayList; import java.util.Collection; +import java.util.Deque; import java.util.Iterator; import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -58,6 +60,7 @@ import org.spongepowered.asm.mixin.transformer.ClassInfo.Traversal; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.mixin.transformer.throwables.MixinTransformerError; +import org.spongepowered.asm.obfuscation.RemapperChain; import org.spongepowered.asm.util.ASMHelper; import org.spongepowered.asm.util.Constants; @@ -148,7 +151,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * * @param mixin Mixin information * @param classNode Mixin classnode - * @param target target class + * @param context target class */ MixinTargetContext(MixinInfo mixin, ClassNode classNode, TargetClassContext context) { this.mixin = mixin; @@ -233,6 +236,15 @@ public class MixinTargetContext implements IReferenceMapperContext { public String getClassRef() { return this.mixin.getClassRef(); } + + /** + * Get the target class context + * + * @return the target class context + */ + public TargetClassContext getTarget() { + return this.targetClass; + } /** * Get the target class reference @@ -249,7 +261,7 @@ public class MixinTargetContext implements IReferenceMapperContext { * * @return the target class */ - public ClassNode getTargetClass() { + public ClassNode getTargetClassNode() { return this.targetClass.getClassNode(); } @@ -755,6 +767,57 @@ public class MixinTargetContext implements IReferenceMapperContext { return this.targetClass.getTargetMethod(method); } + MethodNode findMethod(MethodNode method, AnnotationNode annotation) { + Deque aliases = new LinkedList(); + aliases.add(method.name); + if (annotation != null) { + List aka = ASMHelper.>getAnnotationValue(annotation, "aliases"); + if (aka != null) { + aliases.addAll(aka); + } + } + + return this.targetClass.findAliasedMethod(aliases, method.desc); + } + + MethodNode findRemappedMethod(MethodNode method) { + RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); + String remappedName = remapperChain.mapMethodName(this.targetClass.getName(), method.name, method.desc); + if (remappedName.equals(method.name)) { + return null; + } + + Deque aliases = new LinkedList(); + aliases.add(remappedName); + + return this.targetClass.findAliasedMethod(aliases, method.desc); + } + + FieldNode findField(FieldNode field, AnnotationNode shadow) { + Deque aliases = new LinkedList(); + aliases.add(field.name); + if (shadow != null) { + List aka = ASMHelper.>getAnnotationValue(shadow, "aliases"); + if (aka != null) { + aliases.addAll(aka); + } + } + + return this.targetClass.findAliasedField(aliases, field.desc); + } + + FieldNode findRemappedField(FieldNode field) { + RemapperChain remapperChain = MixinEnvironment.getCurrentEnvironment().getRemappers(); + String remappedName = remapperChain.mapFieldName(this.targetClass.getName(), field.name, field.desc); + if (remappedName.equals(field.name)) { + return null; + } + + Deque aliases = new LinkedList(); + aliases.add(remappedName); + return this.targetClass.findAliasedField( aliases, field.desc); + } + /** * Mark this mixin as requiring the specified class version in the context * of the current target @@ -907,11 +970,15 @@ public class MixinTargetContext implements IReferenceMapperContext { this.mixin.postApply(transformedName, targetClass); } - + public String getHandlerName(AnnotationNode annotation, MethodNode method, boolean surrogate) { return this.targetClass.getHandlerName(annotation, method, surrogate); } + public String getUniqueName(MethodNode method) { + return this.targetClass.getUniqueName(method); + } + /** * Scans the target class for injector methods and prepares discovered * injectors diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index 32ec4cfc..ff5335f7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -24,6 +24,7 @@ */ package org.spongepowered.asm.mixin.transformer; +import java.util.Deque; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,6 +32,7 @@ import java.util.SortedSet; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Debug; import org.spongepowered.asm.mixin.MixinEnvironment; @@ -91,6 +93,11 @@ class TargetClassContext { * Do not remap injector handler methods (debug option) */ private final boolean disableHandlerRemap; + + /** + * Unique method index + */ + private int nextUniqueMethodIndex = 0; /** * True once mixins have been applied to this class @@ -112,6 +119,11 @@ class TargetClassContext { this.disableHandlerRemap = MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_DISABLE_HANDLER_REMAP); } + @Override + public String toString() { + return this.className; + } + public boolean isApplied() { return this.applied; } @@ -154,6 +166,13 @@ class TargetClassContext { public List getMethods() { return this.classNode.methods; } + + /** + * Get the class fields (from the tree) + */ + public List getFields() { + return this.classNode.fields; + } /** * Get the target class metadata @@ -168,7 +187,44 @@ class TargetClassContext { public SortedSet getMixins() { return this.mixins; } + + MethodNode findAliasedMethod(Deque aliases, String desc) { + String alias = aliases.poll(); + if (alias == null) { + return null; + } + + for (MethodNode target : this.classNode.methods) { + if (target.name.equals(alias) && target.desc.equals(desc)) { + return target; + } + } + + return this.findAliasedMethod(aliases, desc); + } + /** + * Finds a field in the target class + * + * @param aliases + * @param desc + * @return Target field or null if not found + */ + FieldNode findAliasedField(Deque aliases, String desc) { + String alias = aliases.poll(); + if (alias == null) { + return null; + } + + for (FieldNode target : this.classNode.fields) { + if (target.name.equals(alias) && target.desc.equals(desc)) { + return target; + } + } + + return this.findAliasedField(aliases, desc); + } + /** * Get a target method handle from the target class * @@ -204,6 +260,10 @@ class TargetClassContext { } return String.format("%s$%s$%d", InjectionInfo.getInjectorPrefix(annotation), method.name, id.value); } + + public String getUniqueName(MethodNode method) { + return String.format("md%s$%s$%d", this.sessionId.substring(30), method.name, this.nextUniqueMethodIndex++); + } /** * Apply mixins to this class @@ -226,7 +286,7 @@ class TargetClassContext { /** - * Process {@link Debug) annotations on the class after application + * Process {@link Debug} annotations on the class after application */ public void processDebugTasks() { if (!MixinEnvironment.getCurrentEnvironment().getOption(Option.DEBUG_VERBOSE)) { diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index 9fece0dc..ac6d8e34 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -1025,6 +1025,10 @@ public class ASMHelper { return arg == null ? "" : arg.toString(); } + public static String getSimpleName(Class annotationType) { + return String.format("@%s", annotationType.getSimpleName()); + } + public static String getSimpleName(AnnotationNode annotation) { return ASMHelper.getSimpleName(annotation.desc); } From 45cf3d6ced0784ecebe0505ec4b4720a2a318304 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 14 Jun 2016 23:19:19 +0100 Subject: [PATCH 161/169] Seriously eclipse --- .../spongepowered/asm/mixin/transformer/InterfaceInfo.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java index c0b04240..62e4746b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InterfaceInfo.java @@ -27,6 +27,7 @@ package org.spongepowered.asm.mixin.transformer; import java.util.HashSet; import java.util.Set; +import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.Type; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.MethodNode; @@ -37,16 +38,10 @@ import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.ASMHelper; -import com.sun.xml.internal.ws.org.objectweb.asm.Opcodes; - /** * Information about an interface being runtime-patched onto a mixin target * class, see {@link org.spongepowered.asm.mixin.Implements Implements} */ -/** - * @author adam - * - */ public class InterfaceInfo extends TreeInfo { /** From 19ca12970a63867ea4ed65ef0b1386168c6100d4 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 15 Jun 2016 16:59:28 +0100 Subject: [PATCH 162/169] Support constraints on injector annotations, bump to 0.5.8, closes #135 --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/injection/Inject.java | 9 ++ .../asm/mixin/injection/ModifyArg.java | 9 ++ .../asm/mixin/injection/ModifyConstant.java | 9 ++ .../asm/mixin/injection/ModifyVariable.java | 9 ++ .../asm/mixin/injection/Redirect.java | 9 ++ .../transformer/MixinApplicatorStandard.java | 95 ++++++++++--------- .../asm/mixin/transformer/MixinInfo.java | 31 ++++++ .../MixinPreProcessorInterface.java | 5 +- .../MixinPreProcessorStandard.java | 20 ++-- .../org/spongepowered/asm/util/ASMHelper.java | 36 ++++++- 12 files changed, 179 insertions(+), 57 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1b376e24..95a63153 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.7 +buildVersion=0.5.8 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 4eade2ab..9cc14aa3 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.7"; + public static final String VERSION = "0.5.8"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java index 89d682fc..aa7f25a1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Inject.java @@ -34,6 +34,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import org.spongepowered.asm.mixin.injection.throwables.InjectionError; import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; +import org.spongepowered.asm.util.ConstraintParser.Constraint; /** * Specifies that this mixin method should inject a callback (or @@ -174,4 +175,12 @@ public @interface Inject { */ public int expect() default 1; + /** + * Returns constraints which must be validated for this injector to + * succeed. See {@link Constraint} for details of constraint formats. + * + * @return Constraints for this annotation + */ + public String constraints() default ""; + } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java index 3f89f27d..d976ed9e 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyArg.java @@ -32,6 +32,7 @@ import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.throwables.InjectionError; import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; +import org.spongepowered.asm.util.ConstraintParser.Constraint; /** * Specifies that this mixin method should inject an argument modifier to itself @@ -124,5 +125,13 @@ public @interface ModifyArg { * @return Minimum number of expected callbacks, default 1 */ public int expect() default 1; + + /** + * Returns constraints which must be validated for this injector to + * succeed. See {@link Constraint} for details of constraint formats. + * + * @return Constraints for this annotation + */ + public String constraints() default ""; } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java index abec6df6..a5146bad 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyConstant.java @@ -32,6 +32,7 @@ import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.throwables.InjectionError; import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; +import org.spongepowered.asm.util.ConstraintParser.Constraint; /** * Specifies that this mixin method should inject a constant modifier callback @@ -122,5 +123,13 @@ public @interface ModifyConstant { * @return Minimum number of expected callbacks, default 1 */ public int expect() default 1; + + /** + * Returns constraints which must be validated for this injector to + * succeed. See {@link Constraint} for details of constraint formats. + * + * @return Constraints for this annotation + */ + public String constraints() default ""; } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java index 1579b03c..6d3c0cd8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/ModifyVariable.java @@ -32,6 +32,7 @@ import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.throwables.InjectionError; import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; +import org.spongepowered.asm.util.ConstraintParser.Constraint; /** * Specifies that this mixin method should inject a variable modifier callback @@ -185,5 +186,13 @@ public @interface ModifyVariable { * @return Minimum number of expected callbacks, default 1 */ public int expect() default 1; + + /** + * Returns constraints which must be validated for this injector to + * succeed. See {@link Constraint} for details of constraint formats. + * + * @return Constraints for this annotation + */ + public String constraints() default ""; } diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java index 0003b286..8ffe9ced 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/Redirect.java @@ -32,6 +32,7 @@ import java.lang.annotation.Target; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.injection.throwables.InjectionError; import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; +import org.spongepowered.asm.util.ConstraintParser.Constraint; /** *

Specifies that this mixin method should redirect the specified @@ -184,5 +185,13 @@ public @interface Redirect { * @return Minimum number of expected callbacks, default 1 */ public int expect() default 1; + + /** + * Returns constraints which must be validated for this injector to + * succeed. See {@link Constraint} for details of constraint formats. + * + * @return Constraints for this annotation + */ + public String constraints() default ""; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java index 267670c7..b261f9db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -24,6 +24,7 @@ */ package org.spongepowered.asm.mixin.transformer; +import java.lang.annotation.Annotation; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Deque; @@ -52,6 +53,11 @@ import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyConstant; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; @@ -63,11 +69,25 @@ import org.spongepowered.asm.util.ConstraintParser.Constraint; import org.spongepowered.asm.util.throwables.ConstraintViolationException; import org.spongepowered.asm.util.throwables.InvalidConstraintException; +import com.google.common.collect.ImmutableList; + /** * Applies mixins to a target class */ public class MixinApplicatorStandard { + /** + * Annotations which can have constraints + */ + protected static final List> CONSTRAINED_ANNOTATIONS = ImmutableList.>of( + Overwrite.class, + Inject.class, + ModifyArg.class, + Redirect.class, + ModifyVariable.class, + ModifyConstant.class + ); + /** * Passes the mixin applicator applies to each mixin */ @@ -324,7 +344,7 @@ public class MixinApplicatorStandard { this.mergeAnnotations(shadow, target); // Strip the FINAL flag from @Mutable non-private fields - if (entry.getValue().isDecoratedMutable() && !MixinApplicatorStandard.hasFlag(target, Opcodes.ACC_PRIVATE)) { + if (entry.getValue().isDecoratedMutable() && !ASMHelper.hasFlag(target, Opcodes.ACC_PRIVATE)) { target.access &= ~Opcodes.ACC_FINAL; } } @@ -359,21 +379,8 @@ public class MixinApplicatorStandard { mixin.transformMethod(mixinMethod); if (!mixinMethod.name.startsWith("<")) { - AnnotationNode overwrite = ASMHelper.getVisibleAnnotation(mixinMethod, Overwrite.class); - boolean isOverwrite = overwrite != null; - if (isOverwrite) { - this.checkConstraints(mixin, overwrite); - } - - if (MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_STATIC) - && !MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_PRIVATE) - && !MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) - && !isOverwrite) { - throw new InvalidMixinException(mixin, - String.format("Mixin %s contains non-private static method %s%s", mixin, mixinMethod.name, mixinMethod.desc)); - } - - this.mergeMethod(mixin, mixinMethod, isOverwrite); + this.checkMethodConstraints(mixin, mixinMethod); + this.mergeMethod(mixin, mixinMethod); } else if (Constants.CLINIT.equals(mixinMethod.name)) { // Class initialiser insns get appended this.appendInsns(mixinMethod); @@ -389,7 +396,8 @@ public class MixinApplicatorStandard { * @param isOverwrite true if the method is annotated with an * {@link Overwrite} annotation */ - protected void mergeMethod(MixinTargetContext mixin, MethodNode method, boolean isOverwrite) { + protected void mergeMethod(MixinTargetContext mixin, MethodNode method) { + boolean isOverwrite = ASMHelper.getVisibleAnnotation(method, Overwrite.class) != null; MethodNode target = this.findTargetMethod(method); if (target != null) { @@ -441,8 +449,8 @@ public class MixinApplicatorStandard { throw new ClassFormatError("Invalid @MixinMerged annotation found in" + mixin + " at " + method.name + " in " + this.targetClass.name); } - if (MixinApplicatorStandard.hasFlag(target, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE) - && MixinApplicatorStandard.hasFlag(method, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE)) { + if (ASMHelper.hasFlag(target, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE) + && ASMHelper.hasFlag(method, Opcodes.ACC_SYNTHETIC | Opcodes.ACC_BRIDGE)) { if (mixin.getEnvironment().getOption(Option.DEBUG_VERBOSE)) { this.logger.warn("Synthetic bridge method clash for {} in {}", method.name, mixin); } @@ -487,7 +495,7 @@ public class MixinApplicatorStandard { } String methodName = method.name + method.desc; - if (MixinApplicatorStandard.hasFlag(method, Opcodes.ACC_STATIC)) { + if (ASMHelper.hasFlag(method, Opcodes.ACC_STATIC)) { throw new InvalidMixinException(mixin, "@Intrinsic method cannot be static, found " + methodName + " in " + mixin); } @@ -785,24 +793,40 @@ public class MixinApplicatorStandard { mixin.applyInjections(); } + /** + * Check constraints in annotations on the specified mixin method + * + * @param mixin Target context + * @param method Mixin method + */ + protected void checkMethodConstraints(MixinTargetContext mixin, MethodNode method) { + for (Class annotationType : MixinApplicatorStandard.CONSTRAINED_ANNOTATIONS) { + AnnotationNode annotation = ASMHelper.getVisibleAnnotation(method, annotationType); + if (annotation != null) { + this.checkConstraints(mixin, method, annotation); + } + } + } + /** * Check constraints for the specified annotation based on token values in * the current environment * * @param mixin Mixin being applied + * @param method annotated method * @param annotation Annotation node to check constraints */ - protected final void checkConstraints(MixinTargetContext mixin, AnnotationNode annotation) { + protected final void checkConstraints(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { try { Constraint constraint = ConstraintParser.parse(annotation); MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); try { constraint.check(environment); } catch (ConstraintViolationException ex) { - if (environment.getOption(Option.IGNORE_CONSTRAINTS)) { - this.logger.warn("Constraint violation: {}", ex.getMessage()); - } else { - throw new InvalidMixinException(mixin, ex.getMessage(), ex); + String message = String.format("Constraint violation: %s on %s in %s", ex.getMessage(), method, mixin); + this.logger.warn(message); + if (!environment.getOption(Option.IGNORE_CONSTRAINTS)) { + throw new InvalidMixinException(mixin, message, ex); } } } catch (InvalidConstraintException ex) { @@ -970,25 +994,4 @@ public class MixinApplicatorStandard { return null; } - /** - * Check whether the specified flag is set on the specified method - * - * @param method - * @param flag - * @return True if the specified flag is set in this method's access flags - */ - protected static boolean hasFlag(MethodNode method, int flag) { - return (method.access & flag) == flag; - } - - /** - * Check whether the specified flag is set on the specified field - * - * @param field - * @param flag - * @return True if the specified flag is set in this field's access flags - */ - protected static boolean hasFlag(FieldNode field, int flag) { - return (field.access & flag) == flag; - } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 359e84da..ac63fe85 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -37,6 +37,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.ClassReader; +import org.spongepowered.asm.lib.MethodVisitor; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; @@ -71,6 +72,29 @@ import net.minecraft.launchwrapper.LaunchClassLoader; */ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { + /** + * A MethodNode in a mixin + */ + public class MixinMethodNode extends MethodNode { + + private final String originalName; + + public MixinMethodNode(int access, String name, String desc, String signature, String[] exceptions) { + super(Opcodes.ASM5, access, name, desc, signature, exceptions); + this.originalName = name; + } + + @Override + public String toString() { + return String.format("%s%s", this.originalName, this.desc); + } + + public String getOriginalName() { + return this.originalName; + } + + } + /** * ClassNode for a MixinInfo */ @@ -88,6 +112,13 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { return MixinInfo.this; } + @Override + public MethodVisitor visitMethod(final int access, final String name, final String desc, final String signature, final String[] exceptions) { + MethodNode method = new MixinMethodNode(access, name, desc, signature, exceptions); + this.methods.add(method); + return method; + } + } /** diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java index 4fe187f9..2119b485 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java @@ -31,6 +31,7 @@ import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; import org.spongepowered.asm.mixin.transformer.throwables.InvalidInterfaceMixinException; +import org.spongepowered.asm.util.ASMHelper; /** * Bytecode preprocessor for interface mixins, simply performs some additional @@ -56,7 +57,7 @@ class MixinPreProcessorInterface extends MixinPreProcessorStandard { @Override protected void prepareMethod(MethodNode mixinMethod, Method method) { // I have no idea how the hell you'd compile this, but we make sure anyway! - if (!MixinApplicatorStandard.hasFlag(mixinMethod, Opcodes.ACC_PUBLIC)) { + if (!ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_PUBLIC)) { throw new InvalidInterfaceMixinException(this.mixin, "Interface mixin contains a non-public method! Found " + method + " in " + this.mixin); } @@ -73,7 +74,7 @@ class MixinPreProcessorInterface extends MixinPreProcessorStandard { */ @Override protected boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { - if (!MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_STATIC)) { + if (!ASMHelper.hasFlag(field, Opcodes.ACC_STATIC)) { throw new InvalidInterfaceMixinException(this.mixin, "Interface mixin contains an instance field! Found " + field.name + " in " + this.mixin); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java index 12d1d1c7..32044029 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -213,6 +213,14 @@ class MixinPreProcessorStandard { } protected boolean validateMethod(MixinTargetContext context, MethodNode mixinMethod) { + if (ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_STATIC) + && !ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_PRIVATE) + && !ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) + && !(ASMHelper.getVisibleAnnotation(mixinMethod, Overwrite.class) != null)) { + throw new InvalidMixinException(context, + String.format("Mixin %s contains non-private static method %s", context, mixinMethod)); + } + return true; } @@ -259,7 +267,7 @@ class MixinPreProcessorStandard { MethodNode target = context.findMethod(mixinMethod, annotation); if (method.isUnique()) { - throw new InvalidMixinException(this.mixin, ASMHelper.getSimpleName(type) + " method " + mixinMethod.name + " cannot be @Unique"); + throw new InvalidMixinException(this.mixin, "@" + ASMHelper.getSimpleName(type) + " method " + mixinMethod.name + " cannot be @Unique"); } if (target == null) { @@ -268,7 +276,7 @@ class MixinPreProcessorStandard { } target = context.findRemappedMethod(mixinMethod); if (target == null) { - throw new InvalidMixinException(this.mixin, ASMHelper.getSimpleName(type) + " method " + mixinMethod.name + throw new InvalidMixinException(this.mixin, "@" + ASMHelper.getSimpleName(type) + " method " + mixinMethod.name + " was not located in the target class"); } mixinMethod.name = target.name; @@ -386,7 +394,7 @@ class MixinPreProcessorStandard { } field.setDecoratedFinal(isFinal, isMutable); - if (this.verboseLogging && MixinApplicatorStandard.hasFlag(target, Opcodes.ACC_FINAL) != isFinal) { + if (this.verboseLogging && ASMHelper.hasFlag(target, Opcodes.ACC_FINAL) != isFinal) { String message = isFinal ? "@Shadow field {}::{} is decorated with @Final but target is not final" : "@Shadow target {}::{} is final but shadow is not decorated with @Final"; @@ -400,9 +408,9 @@ class MixinPreProcessorStandard { protected boolean validateField(MixinTargetContext context, FieldNode field, AnnotationNode shadow) { // Public static fields will fall foul of early static binding in java, including them in a mixin is an error condition - if (MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_STATIC) - && !MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_PRIVATE) - && !MixinApplicatorStandard.hasFlag(field, Opcodes.ACC_SYNTHETIC) + if (ASMHelper.hasFlag(field, Opcodes.ACC_STATIC) + && !ASMHelper.hasFlag(field, Opcodes.ACC_PRIVATE) + && !ASMHelper.hasFlag(field, Opcodes.ACC_SYNTHETIC) && shadow == null) { throw new InvalidMixinException(context, String.format("Mixin %s contains non-private static field %s:%s", context, field.name, field.desc)); diff --git a/src/main/java/org/spongepowered/asm/util/ASMHelper.java b/src/main/java/org/spongepowered/asm/util/ASMHelper.java index ac6d8e34..ae21c867 100644 --- a/src/main/java/org/spongepowered/asm/util/ASMHelper.java +++ b/src/main/java/org/spongepowered/asm/util/ASMHelper.java @@ -1026,7 +1026,7 @@ public class ASMHelper { } public static String getSimpleName(Class annotationType) { - return String.format("@%s", annotationType.getSimpleName()); + return annotationType.getSimpleName(); } public static String getSimpleName(AnnotationNode annotation) { @@ -1085,4 +1085,38 @@ public class ASMHelper { int index = Ints.indexOf(ASMHelper.CONSTANTS_ALL, insn.getOpcode()); return index < 0 ? null : Type.getType(ASMHelper.CONSTANTS_TYPES[index]); } + + /** + * Check whether the specified flag is set on the specified class + * + * @param classNode + * @param flag + * @return True if the specified flag is set in this method's access flags + */ + public static boolean hasFlag(ClassNode classNode, int flag) { + return (classNode.access & flag) == flag; + } + + /** + * Check whether the specified flag is set on the specified method + * + * @param method + * @param flag + * @return True if the specified flag is set in this method's access flags + */ + public static boolean hasFlag(MethodNode method, int flag) { + return (method.access & flag) == flag; + } + + /** + * Check whether the specified flag is set on the specified field + * + * @param field + * @param flag + * @return True if the specified flag is set in this field's access flags + */ + public static boolean hasFlag(FieldNode field, int flag) { + return (field.access & flag) == flag; + } + } From a000477243e32554dd73344e5ce87680e7883f09 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 15 Jun 2016 18:59:48 +0100 Subject: [PATCH 163/169] Hard fail if a required mixin target was already transformed, bump 0.5.9 --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 8 +- .../asm/mixin/transformer/MixinInfo.java | 47 ++--- .../asm/mixin/transformer/TreeInfo.java | 5 + .../MixinTargetAlreadyLoadedException.java | 48 +++++ .../launchwrapper/LaunchClassLoaderUtil.java | 192 ++++++++++++++++++ 6 files changed, 271 insertions(+), 31 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java create mode 100644 src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java diff --git a/gradle.properties b/gradle.properties index 95a63153..1bf14932 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.8 +buildVersion=0.5.9 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 9cc14aa3..ff5ecf73 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,13 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.8"; - - /** - * Blackboard key where the subsystem version will be stored to indicate - * successful bootstrap - */ -// public static final String INIT_KEY = Blackboard.Keys.INIT; + public static final String VERSION = "0.5.9"; // Consts private static final String LAUNCH_PACKAGE = "org.spongepowered.asm.launch."; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index ac63fe85..f1d41c96 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -25,7 +25,6 @@ package org.spongepowered.asm.mixin.transformer; import java.io.IOException; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -58,14 +57,15 @@ import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.mixin.transformer.throwables.MixinReloadException; +import org.spongepowered.asm.mixin.transformer.throwables.MixinTargetAlreadyLoadedException; import org.spongepowered.asm.util.ASMHelper; +import org.spongepowered.asm.util.launchwrapper.LaunchClassLoaderUtil; import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.Lists; import net.minecraft.launchwrapper.Launch; -import net.minecraft.launchwrapper.LaunchClassLoader; /** * Runtime information bundle about a mixin @@ -531,14 +531,17 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } } + /** + * Class loader utility + */ + private static final LaunchClassLoaderUtil classLoaderUtil = LaunchClassLoaderUtil.forClassLoader(Launch.classLoader); + /** * Global order of mixin infos, used to determine ordering between mixins * with equivalent priority */ static int mixinOrder = 0; - static final Set invalidClasses = MixinInfo.$getInvalidClassesSet(); - /** * Logger */ @@ -637,6 +640,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { this.pendingState = new State(mixinBytes); this.info = this.pendingState.getClassInfo(); this.type = this.initType(); + } catch (InvalidMixinException ex) { + throw ex; } catch (Exception ex) { throw new InvalidMixinException(this, ex); } @@ -646,6 +651,8 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { this.priority = this.readPriority(this.pendingState.getClassNode()); this.targetClasses = this.readTargetClasses(this.pendingState.getClassNode(), suppressPlugin); this.targetClassNames = Collections.unmodifiableList(Lists.transform(this.targetClasses, Functions.toStringFunction())); + } catch (InvalidMixinException ex) { + throw ex; } catch (Exception ex) { throw new InvalidMixinException(this, ex); } @@ -725,8 +732,16 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Reads a target list into the outTargets list */ private void readTargets(Collection outTargets, Collection inTargets, boolean suppressPlugin, boolean checkPublic) { - for (String targetName : inTargets) { - targetName = targetName.replace('/', '.'); + for (String targetRef : inTargets) { + String targetName = targetRef.replace('/', '.'); + if (MixinInfo.classLoaderUtil.isClassLoaded(targetName)) { + String message = String.format("Critical problem: %s target %s was already transformed.", this, targetName); + if (this.parent.isRequired()) { + throw new MixinTargetAlreadyLoadedException(this, message); + } + this.logger.error(message); + } + if (this.plugin == null || suppressPlugin || this.plugin.shouldApplyMixin(targetName, this.className)) { ClassInfo targetInfo = this.getTarget(targetName, checkPublic); if (targetInfo != null && !outTargets.contains(targetInfo)) { @@ -740,12 +755,12 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { private ClassInfo getTarget(String targetName, boolean checkPublic) throws InvalidMixinException { ClassInfo targetInfo = ClassInfo.forName(targetName); if (targetInfo == null) { - this.handleTargetError("@Mixin target " + targetName + " was not found " + this); + this.handleTargetError(String.format("@Mixin target %s was not found %s", targetName, this)); return null; } this.type.validateTarget(targetName, targetInfo); if (checkPublic && targetInfo.isPublic()) { - this.handleTargetError("@Mixin target " + targetName + " is public in " + this + " and should be specified in value"); + this.handleTargetError(String.format("@Mixin target %s is public in %s and should be specified in value", targetName, this)); } return targetInfo; } @@ -957,9 +972,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { // Inject the mixin class name into the LaunchClassLoader's invalid // classes set so that any classes referencing the mixin directly will // cause the game to crash - if (MixinInfo.invalidClasses != null) { - MixinInfo.invalidClasses.add(mixinClassName); - } + MixinInfo.classLoaderUtil.registerInvalidClass(mixinClassName); return mixinBytes; } @@ -1018,17 +1031,5 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { public String toString() { return String.format("%s:%s", this.parent.getName(), this.name); } - - @SuppressWarnings("unchecked") - private static Set $getInvalidClassesSet() { - try { - Field invalidClasses = LaunchClassLoader.class.getDeclaredField("invalidClasses"); - invalidClasses.setAccessible(true); - return (Set)invalidClasses.get(Launch.classLoader); - } catch (Exception ex) { - ex.printStackTrace(); - } - return null; - } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java index 13761a01..91a8b032 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java @@ -35,6 +35,7 @@ import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.transformer.MixinTransformer.ReEntranceState; +import org.spongepowered.asm.util.launchwrapper.LaunchClassLoaderUtil; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.Launch; @@ -136,6 +137,10 @@ abstract class TreeInfo { * except the excluded transformers */ private static byte[] applyTransformers(String name, String transformedName, byte[] basicClass) { + if (LaunchClassLoaderUtil.forClassLoader(Launch.classLoader).isClassExcluded(name, transformedName)) { + return basicClass; + } + MixinEnvironment environment = MixinEnvironment.getCurrentEnvironment(); for (IClassTransformer transformer : environment.getTransformers()) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java new file mode 100644 index 00000000..70780f29 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java @@ -0,0 +1,48 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.mixin.transformer.throwables; + +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +/** + * Exception thrown when a specified mixin target was already classloaded. + */ +public class MixinTargetAlreadyLoadedException extends InvalidMixinException { + + private static final long serialVersionUID = 1L; + + public MixinTargetAlreadyLoadedException(IMixinInfo mixin, String message) { + super(mixin, message); + } + + public MixinTargetAlreadyLoadedException(IMixinInfo mixin, Throwable cause) { + super(mixin, cause); + } + + public MixinTargetAlreadyLoadedException(IMixinInfo mixin, String message, Throwable cause) { + super(mixin, message, cause); + } + +} diff --git a/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java new file mode 100644 index 00000000..cec9bcaf --- /dev/null +++ b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java @@ -0,0 +1,192 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.util.launchwrapper; + +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import net.minecraft.launchwrapper.LaunchClassLoader; + +/** + * Utility class for reflecting into {@link LaunchClassLoader}. We do not + * write anything of the classloader fields, but we need to be able to read + * them to perform some validation tasks, and insert entries for mixin "classes" + * into the invalid classes set. + */ +public final class LaunchClassLoaderUtil { + + /** + * ClassLoader -> util mapping + */ + private static final Map utils = new HashMap(); + + /** + * ClassLoader for this util + */ + private final LaunchClassLoader classLoader; + + // Reflected fields + private Map> cachedClasses; + private final Set invalidClasses; + private final Set classLoaderExceptions; + private final Set transformerExceptions; + + /** + * Singleton, use factory to get an instance + * + * @param classLoader class loader + */ + private LaunchClassLoaderUtil(LaunchClassLoader classLoader) { + this.classLoader = classLoader; + this.cachedClasses = LaunchClassLoaderUtil.>>getField(classLoader, "cachedClasses"); + this.invalidClasses = LaunchClassLoaderUtil.>getField(classLoader, "invalidClasses"); + this.classLoaderExceptions = LaunchClassLoaderUtil.>getField(classLoader, "classLoaderExceptions"); + this.transformerExceptions = LaunchClassLoaderUtil.>getField(classLoader, "transformerExceptions"); + } + + /** + * Get the classloader + */ + public LaunchClassLoader getClassLoader() { + return this.classLoader; + } + + /** + * Get all loaded class names from the cache + */ + public Set getLoadedClasses() { + return this.getLoadedClasses(null); + } + + /** + * Get the names of loaded classes from the cache, filter using the supplied + * filter string + * + * @param filter filter string or null + * @return set of class names + */ + public Set getLoadedClasses(String filter) { + Set loadedClasses = new HashSet(); + for (String className : this.cachedClasses.keySet()) { + if (filter == null || className.startsWith(filter)) { + loadedClasses.add(className); + } + } + return loadedClasses; + } + + /** + * Get whether a class name exists in the cache (indicating it was loaded + * via the inner loader + * + * @param name class name + * @return true if the class name exists in the cache + */ + public boolean isClassLoaded(String name) { + return this.cachedClasses != null && this.cachedClasses.containsKey(name); + } + + /** + * Get whether the specified name or transformedName exist in either of the + * exclusion lists + * + * @param name class name + * @param transformedName transformed class name + * @return true if either exclusion list contains either of the names + */ + public boolean isClassExcluded(String name, String transformedName) { + for (final String exception : this.getClassLoaderExceptions()) { + if (transformedName.startsWith(exception) || name.startsWith(exception)) { + return true; + } + } + + for (final String exception : this.getTransformerExceptions()) { + if (transformedName.startsWith(exception) || name.startsWith(exception)) { + return true; + } + } + + return false; + } + + /** + * Stuff a class name directly into the invalidClasses set, this prevents + * the loader from classloading the named class. This is used by the mixin + * processor to prevent classloading of mixin classes + * + * @param name class name + */ + public void registerInvalidClass(String name) { + if (this.invalidClasses != null) { + this.invalidClasses.add(name); + } + } + + public Set getClassLoaderExceptions() { + if (this.classLoaderExceptions != null) { + return this.classLoaderExceptions; + } + return Collections.emptySet(); + } + + public Set getTransformerExceptions() { + if (this.transformerExceptions != null) { + return this.transformerExceptions; + } + return Collections.emptySet(); + } + + @SuppressWarnings("unchecked") + private static T getField(LaunchClassLoader classLoader, String fieldName) { + try { + Field field = LaunchClassLoader.class.getDeclaredField(fieldName); + field.setAccessible(true); + return (T)field.get(classLoader); + } catch (Exception ex) { + ex.printStackTrace(); + } + return null; + } + + /** + * Get the utility class for the supplied classloader + * + * @param classLoader classLoader to fetch utility wrapper for + * @return utility wrapper + */ + public static LaunchClassLoaderUtil forClassLoader(LaunchClassLoader classLoader) { + LaunchClassLoaderUtil util = LaunchClassLoaderUtil.utils.get(classLoader); + if (util == null) { + util = new LaunchClassLoaderUtil(classLoader); + LaunchClassLoaderUtil.utils.put(classLoader, util); + } + return util; + } +} From 7bfca4ba788c9ca8d4aac91f015409427c052d7d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 16 Jun 2016 16:37:05 +0100 Subject: [PATCH 164/169] Minor adjustments for sanity --- .../transformer/MixinApplicatorStandard.java | 17 ++++++++ .../asm/mixin/transformer/MixinInfo.java | 26 +++++++----- .../MixinPreProcessorInterface.java | 8 ++-- .../MixinPreProcessorStandard.java | 42 ++++++++----------- .../MixinTargetAlreadyLoadedException.java | 16 ++++--- 5 files changed, 64 insertions(+), 45 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java index b261f9db..504dd07d 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -379,6 +379,7 @@ public class MixinApplicatorStandard { mixin.transformMethod(mixinMethod); if (!mixinMethod.name.startsWith("<")) { + this.checkMethodVisibility(mixin, mixinMethod); this.checkMethodConstraints(mixin, mixinMethod); this.mergeMethod(mixin, mixinMethod); } else if (Constants.CLINIT.equals(mixinMethod.name)) { @@ -793,6 +794,22 @@ public class MixinApplicatorStandard { mixin.applyInjections(); } + /** + * Check visibility before merging a mixin method + * + * @param mixin + * @param mixinMethod + */ + protected void checkMethodVisibility(MixinTargetContext mixin, MethodNode mixinMethod) { + if (ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_STATIC) + && !ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_PRIVATE) + && !ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) + && !(ASMHelper.getVisibleAnnotation(mixinMethod, Overwrite.class) != null)) { + throw new InvalidMixinException(mixin, + String.format("Mixin %s contains non-private static method %s", mixin, mixinMethod)); + } + } + /** * Check constraints in annotations on the specified mixin method * diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index f1d41c96..4c4a0877 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -75,10 +75,10 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * A MethodNode in a mixin */ - public class MixinMethodNode extends MethodNode { + class MixinMethodNode extends MethodNode { private final String originalName; - + public MixinMethodNode(int access, String name, String desc, String signature, String[] exceptions) { super(Opcodes.ASM5, access, name, desc, signature, exceptions); this.originalName = name; @@ -98,14 +98,18 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { /** * ClassNode for a MixinInfo */ - public class MixinClassNode extends ClassNode { + class MixinClassNode extends ClassNode { + + public final List mixinMethods; public MixinClassNode(MixinInfo mixin) { this(Opcodes.ASM5); } + @SuppressWarnings("unchecked") public MixinClassNode(int api) { super(api); + this.mixinMethods = (List)(Object)this.methods; } public MixinInfo getMixin() { @@ -167,7 +171,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Initial ClassNode created for mixin validation, not used for actual * application */ - protected ClassNode classNode; + protected MixinClassNode classNode; State(byte[] mixinBytes) { this(mixinBytes, null); @@ -225,7 +229,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @param flags Flags passed into classReader * @return Tree representing the bytecode */ - ClassNode createClassNode(int flags) { + MixinClassNode createClassNode(int flags) { MixinClassNode classNode = new MixinClassNode(MixinInfo.this); ClassReader classReader = new ClassReader(this.mixinBytes); classReader.accept(classNode, flags); @@ -454,7 +458,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { abstract void validate(State state, List targetClasses); - abstract MixinPreProcessorStandard createPreProcessor(ClassNode classNode); + abstract MixinPreProcessorStandard createPreProcessor(MixinClassNode classNode); /** * A standard mixin @@ -496,7 +500,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } @Override - MixinPreProcessorStandard createPreProcessor(ClassNode classNode) { + MixinPreProcessorStandard createPreProcessor(MixinClassNode classNode) { return new MixinPreProcessorStandard(this.mixin, classNode); } } @@ -525,7 +529,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } @Override - MixinPreProcessorStandard createPreProcessor(ClassNode classNode) { + MixinPreProcessorStandard createPreProcessor(MixinClassNode classNode) { return new MixinPreProcessorInterface(this.mixin, classNode); } } @@ -737,7 +741,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { if (MixinInfo.classLoaderUtil.isClassLoaded(targetName)) { String message = String.format("Critical problem: %s target %s was already transformed.", this, targetName); if (this.parent.isRequired()) { - throw new MixinTargetAlreadyLoadedException(this, message); + throw new MixinTargetAlreadyLoadedException(this, message, targetName); } this.logger.error(message); } @@ -898,7 +902,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * Get a new tree for the class bytecode */ @Override - public ClassNode getClassNode(int flags) { + public MixinClassNode getClassNode(int flags) { return this.getState().createClassNode(flags); } @@ -947,7 +951,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { * @return new context */ MixinTargetContext createContextFor(TargetClassContext target) { - ClassNode classNode = this.getClassNode(ClassReader.EXPAND_FRAMES); + MixinClassNode classNode = this.getClassNode(ClassReader.EXPAND_FRAMES); return this.type.createPreProcessor(classNode).prepare().createContextFor(target); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java index 2119b485..d9fbf4e2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java @@ -26,10 +26,10 @@ package org.spongepowered.asm.mixin.transformer; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.FieldNode; -import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; +import org.spongepowered.asm.mixin.transformer.MixinInfo.MixinClassNode; +import org.spongepowered.asm.mixin.transformer.MixinInfo.MixinMethodNode; import org.spongepowered.asm.mixin.transformer.throwables.InvalidInterfaceMixinException; import org.spongepowered.asm.util.ASMHelper; @@ -45,7 +45,7 @@ class MixinPreProcessorInterface extends MixinPreProcessorStandard { * @param mixin Mixin info * @param classNode Mixin classnode */ - MixinPreProcessorInterface(MixinInfo mixin, ClassNode classNode) { + MixinPreProcessorInterface(MixinInfo mixin, MixinClassNode classNode) { super(mixin, classNode); } @@ -55,7 +55,7 @@ class MixinPreProcessorInterface extends MixinPreProcessorStandard { * org.spongepowered.asm.mixin.transformer.ClassInfo.Method) */ @Override - protected void prepareMethod(MethodNode mixinMethod, Method method) { + protected void prepareMethod(MixinMethodNode mixinMethod, Method method) { // I have no idea how the hell you'd compile this, but we make sure anyway! if (!ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_PUBLIC)) { throw new InvalidInterfaceMixinException(this.mixin, "Interface mixin contains a non-public method! Found " + method + " in " diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java index 32044029..8ae7a238 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -32,7 +32,6 @@ import org.apache.logging.log4j.Logger; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.AnnotationNode; -import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; @@ -47,6 +46,8 @@ import org.spongepowered.asm.mixin.injection.Surrogate; import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import org.spongepowered.asm.mixin.transformer.ClassInfo.Field; import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; +import org.spongepowered.asm.mixin.transformer.MixinInfo.MixinClassNode; +import org.spongepowered.asm.mixin.transformer.MixinInfo.MixinMethodNode; import org.spongepowered.asm.mixin.transformer.meta.MixinRenamed; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.ASMHelper; @@ -86,13 +87,13 @@ class MixinPreProcessorStandard { /** * Mixin class node */ - protected final ClassNode classNode; + protected final MixinClassNode classNode; private final boolean verboseLogging, strictUnique; private boolean prepared, attached; - MixinPreProcessorStandard(MixinInfo mixin, ClassNode classNode) { + MixinPreProcessorStandard(MixinInfo mixin, MixinClassNode classNode) { this.mixin = mixin; this.classNode = classNode; MixinEnvironment env = mixin.getParent().getEnvironment(); @@ -109,7 +110,7 @@ class MixinPreProcessorStandard { if (!this.prepared) { this.prepared = true; - for (MethodNode mixinMethod : this.classNode.methods) { + for (MixinMethodNode mixinMethod : this.classNode.mixinMethods) { Method method = this.mixin.getClassInfo().findMethod(mixinMethod); this.prepareMethod(mixinMethod, method); } @@ -122,12 +123,12 @@ class MixinPreProcessorStandard { return this; } - protected void prepareMethod(MethodNode mixinMethod, Method method) { + protected void prepareMethod(MixinMethodNode mixinMethod, Method method) { this.prepareShadow(mixinMethod, method); this.prepareSoftImplements(mixinMethod, method); } - protected void prepareShadow(MethodNode mixinMethod, Method method) { + protected void prepareShadow(MixinMethodNode mixinMethod, Method method) { AnnotationNode shadowAnnotation = ASMHelper.getVisibleAnnotation(mixinMethod, Shadow.class); if (shadowAnnotation == null) { return; @@ -142,7 +143,7 @@ class MixinPreProcessorStandard { } } - protected void prepareSoftImplements(MethodNode mixinMethod, Method method) { + protected void prepareSoftImplements(MixinMethodNode mixinMethod, Method method) { for (InterfaceInfo iface : this.mixin.getSoftImplements()) { if (iface.renameMethod(mixinMethod)) { method.renameTo(mixinMethod.name); @@ -181,8 +182,8 @@ class MixinPreProcessorStandard { } protected void attachMethods(MixinTargetContext context) { - for (Iterator iter = this.classNode.methods.iterator(); iter.hasNext();) { - MethodNode mixinMethod = iter.next(); + for (Iterator iter = this.classNode.mixinMethods.iterator(); iter.hasNext();) { + MixinMethodNode mixinMethod = iter.next(); if (!this.validateMethod(context, mixinMethod)) { iter.remove(); @@ -212,19 +213,11 @@ class MixinPreProcessorStandard { } } - protected boolean validateMethod(MixinTargetContext context, MethodNode mixinMethod) { - if (ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_STATIC) - && !ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_PRIVATE) - && !ASMHelper.hasFlag(mixinMethod, Opcodes.ACC_SYNTHETIC) - && !(ASMHelper.getVisibleAnnotation(mixinMethod, Overwrite.class) != null)) { - throw new InvalidMixinException(context, - String.format("Mixin %s contains non-private static method %s", context, mixinMethod)); - } - + protected boolean validateMethod(MixinTargetContext context, MixinMethodNode mixinMethod) { return true; } - protected boolean processInjectorMethod(MixinTargetContext context, MethodNode mixinMethod) { + protected boolean processInjectorMethod(MixinTargetContext context, MixinMethodNode mixinMethod) { AnnotationNode annotation = InjectionInfo.getInjectorAnnotation(context, mixinMethod); boolean surrogate = ASMHelper.getVisibleAnnotation(mixinMethod, Surrogate.class) != null; if (annotation == null && !surrogate) { @@ -244,15 +237,16 @@ class MixinPreProcessorStandard { return true; } - protected boolean processShadowMethod(MixinTargetContext context, MethodNode mixinMethod) { + protected boolean processShadowMethod(MixinTargetContext context, MixinMethodNode mixinMethod) { return this.processSpecialMethod(context, mixinMethod, Shadow.class, false); } - protected boolean processOverwriteMethod(MixinTargetContext context, MethodNode mixinMethod) { + protected boolean processOverwriteMethod(MixinTargetContext context, MixinMethodNode mixinMethod) { return this.processSpecialMethod(context, mixinMethod, Overwrite.class, true); } - protected boolean processSpecialMethod(MixinTargetContext context, MethodNode mixinMethod, Class type, boolean overwrite) { + protected boolean processSpecialMethod(MixinTargetContext context, MixinMethodNode mixinMethod, Class type, + boolean overwrite) { AnnotationNode annotation = ASMHelper.getVisibleAnnotation(mixinMethod, type); if (annotation == null) { @@ -299,7 +293,7 @@ class MixinPreProcessorStandard { return true; } - protected boolean processUniqueMethod(MixinTargetContext context, MethodNode mixinMethod) { + protected boolean processUniqueMethod(MixinTargetContext context, MixinMethodNode mixinMethod) { Method method = this.mixin.getClassInfo().findMethod(mixinMethod, ClassInfo.INCLUDE_ALL); if (method == null || (!method.isUnique() && !this.mixin.isUnique())) { return false; @@ -330,7 +324,7 @@ class MixinPreProcessorStandard { return true; } - protected void processMethod(MethodNode mixinMethod) { + protected void processMethod(MixinMethodNode mixinMethod) { Method method = this.mixin.getClassInfo().findMethod(mixinMethod); if (method == null) { return; diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java index 70780f29..613ad74c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/MixinTargetAlreadyLoadedException.java @@ -32,17 +32,21 @@ import org.spongepowered.asm.mixin.extensibility.IMixinInfo; public class MixinTargetAlreadyLoadedException extends InvalidMixinException { private static final long serialVersionUID = 1L; + + private final String target; - public MixinTargetAlreadyLoadedException(IMixinInfo mixin, String message) { + public MixinTargetAlreadyLoadedException(IMixinInfo mixin, String message, String target) { super(mixin, message); + this.target = target; } - public MixinTargetAlreadyLoadedException(IMixinInfo mixin, Throwable cause) { - super(mixin, cause); - } - - public MixinTargetAlreadyLoadedException(IMixinInfo mixin, String message, Throwable cause) { + public MixinTargetAlreadyLoadedException(IMixinInfo mixin, String message, String target, Throwable cause) { super(mixin, message, cause); + this.target = target; + } + + public String getTarget() { + return this.target; } } From 0541ed4d3cf5a16a9c52ffa4e9781d46ffc08d92 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 16 Jun 2016 16:43:03 +0100 Subject: [PATCH 165/169] Only emit this warning if calling externally --- .../java/org/spongepowered/asm/mixin/MixinEnvironment.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 2803f17e..83502248 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -1224,7 +1224,10 @@ public final class MixinEnvironment implements ITokenProvider { */ @Deprecated public static void setCompatibilityLevel(CompatibilityLevel level) throws IllegalArgumentException { - MixinEnvironment.logger.warn("MixinEnvironment::setCompatibilityLevel is deprecated and will be removed. Set level via config instead!"); + StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); + if (!"org.spongepowered.asm.mixin.transformer.MixinConfig".equals(stackTrace[2].getClassName())) { + MixinEnvironment.logger.warn("MixinEnvironment::setCompatibilityLevel is deprecated and will be removed. Set level via config instead!"); + } if (level != MixinEnvironment.compatibility && level.isAtLeast(MixinEnvironment.compatibility)) { if (!level.isSupported()) { From 2cd02e91a417f676d2dbc73c7c8436257e65bf8f Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 17 Jun 2016 22:28:05 +0100 Subject: [PATCH 166/169] Make tweaker/manifest constants public for @Minecrell --- .../asm/launch/MixinLaunchAgentDefault.java | 15 ++++++--------- .../spongepowered/asm/launch/MixinTweaker.java | 4 ++-- .../org/spongepowered/asm/util/Constants.java | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java index 87da8172..b9949c6e 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java @@ -26,6 +26,8 @@ package org.spongepowered.asm.launch; import java.net.URI; +import org.spongepowered.asm.util.Constants.ManifestAttributes; + import net.minecraft.launchwrapper.LaunchClassLoader; /** @@ -33,11 +35,6 @@ import net.minecraft.launchwrapper.LaunchClassLoader; */ public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { - protected static final String MFATT_MIXINCONFIGS = "MixinConfigs"; - protected static final String MFATT_TOKENPROVIDERS = "MixinTokenProviders"; - protected static final String MFATT_MAINCLASS = "Main-Class"; - protected static final String MFATT_COMPATIBILITY = "MixinCompatibilityLevel"; - public MixinLaunchAgentDefault(URI uri) { super(uri); } @@ -45,21 +42,21 @@ public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { @SuppressWarnings("deprecation") @Override public void prepare() { - String compatibilityLevel = this.attributes.get(MixinLaunchAgentDefault.MFATT_COMPATIBILITY); + String compatibilityLevel = this.attributes.get(ManifestAttributes.COMPATIBILITY); if (compatibilityLevel != null) { MixinLaunchAgentAbstract.logger.warn("{} Setting mixin compatibility level via manifest is deprecated, " + "use 'compatibilityLevel' key in config instead", this.container); MixinTweaker.setCompatibilityLevel(compatibilityLevel); } - String mixinConfigs = this.attributes.get(MixinLaunchAgentDefault.MFATT_MIXINCONFIGS); + String mixinConfigs = this.attributes.get(ManifestAttributes.MIXINCONFIGS); if (mixinConfigs != null) { for (String config : mixinConfigs.split(",")) { MixinTweaker.addConfig(config.trim()); } } - String tokenProviders = this.attributes.get(MixinLaunchAgentDefault.MFATT_TOKENPROVIDERS); + String tokenProviders = this.attributes.get(ManifestAttributes.TOKENPROVIDERS); if (tokenProviders != null) { for (String provider : tokenProviders.split(",")) { MixinTweaker.addTokenProvider(provider.trim()); @@ -77,7 +74,7 @@ public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { @Override public String getLaunchTarget() { - return this.attributes.get(MixinLaunchAgentDefault.MFATT_MAINCLASS); + return this.attributes.get(ManifestAttributes.MAINCLASS); } } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index e4ba4d5a..621df793 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -38,6 +38,7 @@ import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; import org.spongepowered.asm.mixin.Mixins; +import org.spongepowered.asm.util.Constants.ManifestAttributes; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; @@ -50,7 +51,6 @@ import net.minecraft.launchwrapper.LaunchClassLoader; */ public class MixinTweaker implements ITweaker { - private static final String MFATT_TWEAKER = "TweakClass"; private static final String DEFAULT_MAIN_CLASS = "net.minecraft.client.main.Main"; /** @@ -174,7 +174,7 @@ public class MixinTweaker implements ITweaker { continue; } MainAttributes attributes = MainAttributes.of(uri); - String tweaker = attributes.get(MixinTweaker.MFATT_TWEAKER); + String tweaker = attributes.get(ManifestAttributes.TWEAKER); if (MixinTweaker.class.getName().equals(tweaker)) { MixinTweaker.logger.debug("{} contains a mixin tweaker, adding agents", uri); this.addContainer(uri); diff --git a/src/main/java/org/spongepowered/asm/util/Constants.java b/src/main/java/org/spongepowered/asm/util/Constants.java index 4f940293..e3cb559d 100644 --- a/src/main/java/org/spongepowered/asm/util/Constants.java +++ b/src/main/java/org/spongepowered/asm/util/Constants.java @@ -43,4 +43,20 @@ public abstract class Constants { public static final String CLASS = "Ljava/lang/Class;"; private Constants() {} + + /** + * Shared Jar Manifest Attributes + */ + public abstract static class ManifestAttributes { + + public static final String TWEAKER = "TweakClass"; + public static final String MAINCLASS = "Main-Class"; + public static final String MIXINCONFIGS = "MixinConfigs"; + public static final String TOKENPROVIDERS = "MixinTokenProviders"; + + @Deprecated + public static final String COMPATIBILITY = "MixinCompatibilityLevel"; + + private ManifestAttributes() {} + } } From 75f327fa569c5a04e1ca1800f597bc1c90e3258e Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 17 Jun 2016 22:28:49 +0100 Subject: [PATCH 167/169] Support @Unique on fields, bump to 0.5.10 --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 2 +- .../org/spongepowered/asm/mixin/Mixins.java | 32 ++++++++++---- .../org/spongepowered/asm/mixin/Unique.java | 13 +++--- .../asm/mixin/transformer/ClassInfo.java | 39 ++++++++++------- .../asm/mixin/transformer/Config.java | 4 ++ .../MixinPreProcessorStandard.java | 42 ++++++++++++++----- .../mixin/transformer/MixinTargetContext.java | 4 ++ .../mixin/transformer/TargetClassContext.java | 8 +++- 9 files changed, 103 insertions(+), 43 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1bf14932..e0ca29b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.9 +buildVersion=0.5.10 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index ff5ecf73..3601f811 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.9"; + public static final String VERSION = "0.5.10"; // Consts private static final String LAUNCH_PACKAGE = "org.spongepowered.asm.launch."; diff --git a/src/main/java/org/spongepowered/asm/mixin/Mixins.java b/src/main/java/org/spongepowered/asm/mixin/Mixins.java index 397f7103..b45c6184 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Mixins.java +++ b/src/main/java/org/spongepowered/asm/mixin/Mixins.java @@ -59,17 +59,29 @@ public final class Mixins { private Mixins() {} + public static void addConfigurations(String... configFiles) { + MixinEnvironment fallback = MixinEnvironment.getDefaultEnvironment(); + for (String configFile : configFiles) { + Mixins.createConfiguration(configFile, fallback); + } + } + /** * Add a mixin configuration resource * * @param configFile path to configuration resource */ public static void addConfiguration(String configFile) { - Mixins.addConfiguration(configFile, MixinEnvironment.getDefaultEnvironment()); + Mixins.createConfiguration(configFile, MixinEnvironment.getDefaultEnvironment()); } @Deprecated static void addConfiguration(String configFile, MixinEnvironment fallback) { + Mixins.createConfiguration(configFile, fallback); + } + + @SuppressWarnings("deprecation") + private static void createConfiguration(String configFile, MixinEnvironment fallback) { Config config = null; try { @@ -78,13 +90,19 @@ public final class Mixins { Mixins.logger.error("Error encountered reading mixin config " + configFile + ": " + ex.getClass().getName() + " " + ex.getMessage(), ex); } - if (config != null) { - MixinEnvironment env = config.getEnvironment(); - if (env != null) { - env.registerConfig(configFile); - } - Mixins.getConfigs().add(config); + Mixins.registerConfiguration(config); + } + + private static void registerConfiguration(Config config) { + if (config == null) { + return; } + + MixinEnvironment env = config.getEnvironment(); + if (env != null) { + env.registerConfig(config.getName()); + } + Mixins.getConfigs().add(config); } /** diff --git a/src/main/java/org/spongepowered/asm/mixin/Unique.java b/src/main/java/org/spongepowered/asm/mixin/Unique.java index c798e7fe..c23503fe 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Unique.java +++ b/src/main/java/org/spongepowered/asm/mixin/Unique.java @@ -30,11 +30,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * This annotation, when applied to a member method in a mixin, indicates that - * the method should never overwrite a matching method in the target - * class. This indicates that the method differs from the normal "overlay-like" - * behaviour of mixins in general, and should only ever be added to the - * target. + * This annotation, when applied to a member method or field in a mixin, + * indicates that the member should never overwrite a matching membver in + * the target class. This indicates that the member differs from the normal + * "overlay-like" behaviour of mixins in general, and should only ever be + * added to the target. For public fields, the annotation has no + * effect. * *

Typical usage of this annotation would be to decorate a utility method in * a mixin, or mark an interface-implementing method which must not overwrite a @@ -64,7 +65,7 @@ import java.lang.annotation.Target; * * */ -@Target({ ElementType.METHOD, ElementType.TYPE }) +@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) public @interface Unique { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index 60f61eb4..edc384f3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -46,6 +46,7 @@ import org.spongepowered.asm.lib.tree.MethodNode; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.transformer.ClassInfo.Member.Type; import org.spongepowered.asm.mixin.transformer.MixinInfo.MixinClassNode; @@ -210,9 +211,15 @@ public class ClassInfo extends TreeInfo { */ private boolean decoratedMutable; + /** + * True if this member is decorated with {@link Unique} + */ + private boolean unique; + protected Member(Member member) { this(member.type, member.memberName, member.memberDesc, member.modifiers, member.isInjected); this.currentName = member.currentName; + this.unique = member.unique; } protected Member(Type type, String name, String desc, int access) { @@ -264,6 +271,14 @@ public class ClassInfo extends TreeInfo { return (this.modifiers & Opcodes.ACC_FINAL) != 0; } + public boolean isUnique() { + return this.unique; + } + + public void setUnique(boolean unique) { + this.unique = unique; + } + public boolean isDecoratedFinal() { return this.decoratedFinal; } @@ -337,40 +352,34 @@ public class ClassInfo extends TreeInfo { private final List frames; - private boolean unique; - public Method(Member member) { super(member); this.frames = member instanceof Method ? ((Method)member).frames : null; - this.unique = member instanceof Method ? ((Method)member).unique : false; } public Method(MethodNode method) { this(method, false); + this.setUnique(ASMHelper.getVisibleAnnotation(method, Unique.class) != null); } public Method(MethodNode method, boolean injected) { super(Type.METHOD, method.name, method.desc, method.access, injected); this.frames = this.gatherFrames(method); - this.unique = ASMHelper.getVisibleAnnotation(method, Unique.class) != null; } public Method(String name, String desc) { super(Type.METHOD, name, desc, Opcodes.ACC_PUBLIC, false); this.frames = null; - this.unique = false; } public Method(String name, String desc, int access) { super(Type.METHOD, name, desc, access, false); this.frames = null; - this.unique = false; } public Method(String name, String desc, int access, boolean injected) { super(Type.METHOD, name, desc, access, injected); this.frames = null; - this.unique = false; } private List gatherFrames(MethodNode method) { @@ -388,14 +397,6 @@ public class ClassInfo extends TreeInfo { return this.frames; } - public boolean isUnique() { - return this.unique; - } - - public void setUnique(boolean unique) { - this.unique = unique; - } - @Override public ClassInfo getOwner() { return ClassInfo.this; @@ -451,6 +452,14 @@ public class ClassInfo extends TreeInfo { public Field(FieldNode field, boolean injected) { super(Type.FIELD, field.name, field.desc, field.access, injected); + + this.setUnique(ASMHelper.getVisibleAnnotation(field, Unique.class) != null); + + if (ASMHelper.getVisibleAnnotation(field, Shadow.class) != null) { + boolean decoratedFinal = ASMHelper.getVisibleAnnotation(field, Final.class) != null; + boolean decoratedMutable = ASMHelper.getVisibleAnnotation(field, Mutable.class) != null; + this.setDecoratedFinal(decoratedFinal, decoratedMutable); + } } public Field(String name, String desc, int access) { diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/Config.java b/src/main/java/org/spongepowered/asm/mixin/transformer/Config.java index 0f173282..d0c61983 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/Config.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/Config.java @@ -46,6 +46,10 @@ public class Config { this.name = config.getName(); this.config = config; } + + public String getName() { + return this.name; + } /** * Access inner config diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java index 8ae7a238..2bcffcbf 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -36,10 +36,8 @@ import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.FieldNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.lib.tree.MethodNode; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; -import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.Surrogate; @@ -341,8 +339,8 @@ class MixinPreProcessorStandard { for (Iterator iter = this.classNode.fields.iterator(); iter.hasNext();) { FieldNode mixinField = iter.next(); AnnotationNode shadow = ASMHelper.getVisibleAnnotation(mixinField, Shadow.class); - boolean isFinal = ASMHelper.getVisibleAnnotation(mixinField, Final.class) != null; - boolean isMutable = ASMHelper.getVisibleAnnotation(mixinField, Mutable.class) != null; + boolean isShadow = shadow != null; + if (!this.validateField(context, mixinField, shadow)) { iter.remove(); continue; @@ -351,6 +349,10 @@ class MixinPreProcessorStandard { context.transformDescriptor(mixinField); Field field = this.mixin.getClassInfo().findField(mixinField); + if (field.isUnique() && isShadow) { + throw new InvalidMixinException(this.mixin, "@Shadow field " + mixinField.name + " cannot be @Unique"); + } + FieldNode target = context.findField(mixinField, shadow); if (target == null) { if (shadow == null) { @@ -363,7 +365,29 @@ class MixinPreProcessorStandard { } mixinField.name = target.name; field.renameTo(target.name); - } + } + + if (field.isUnique()) { + if ((mixinField.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) != 0) { + String uniqueName = context.getUniqueName(mixinField); + MixinPreProcessorStandard.logger.log(this.mixin.getLoggingLevel(), "Renaming @Unique field {}{} to {} in {}", + mixinField.name, mixinField.desc, uniqueName, this.mixin); + mixinField.name = uniqueName; + field.renameTo(uniqueName); + continue; + } + + if (this.strictUnique) { + throw new InvalidMixinException(this.mixin, "Field conflict, @Unique field " + mixinField.name + " in " + this.mixin + + " cannot overwrite " + target.name + target.desc + " in " + context.getTarget()); + } + + MixinPreProcessorStandard.logger.warn("Discarding @Unique public field {} in {} because it already exists in {}. " + + "Note that declared FIELD INITIALISERS will NOT be removed!", mixinField.name, this.mixin, context.getTarget()); + + iter.remove(); + continue; + } // Check that the shadow field has a matching descriptor if (!target.desc.equals(mixinField.desc)) { @@ -382,12 +406,8 @@ class MixinPreProcessorStandard { // Shadow fields get stripped from the mixin class iter.remove(); - if (shadow != null) { - if (field == null) { - throw new InvalidMixinException(this.mixin, "Unable to locate field surrogate: " + mixinField.name + " in " + this.mixin); - } - field.setDecoratedFinal(isFinal, isMutable); - + if (isShadow) { + boolean isFinal = field.isDecoratedFinal(); if (this.verboseLogging && ASMHelper.hasFlag(target, Opcodes.ACC_FINAL) != isFinal) { String message = isFinal ? "@Shadow field {}::{} is decorated with @Final but target is not final" diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 3e689a6e..ff89ce28 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -979,6 +979,10 @@ public class MixinTargetContext implements IReferenceMapperContext { return this.targetClass.getUniqueName(method); } + public String getUniqueName(FieldNode field) { + return this.targetClass.getUniqueName(field); + } + /** * Scans the target class for injector methods and prepares discovered * injectors diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java index ff5335f7..2ba06fb5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -95,9 +95,9 @@ class TargetClassContext { private final boolean disableHandlerRemap; /** - * Unique method index + * Unique method and field indices */ - private int nextUniqueMethodIndex = 0; + private int nextUniqueMethodIndex, nextUniqueFieldIndex; /** * True once mixins have been applied to this class @@ -265,6 +265,10 @@ class TargetClassContext { return String.format("md%s$%s$%d", this.sessionId.substring(30), method.name, this.nextUniqueMethodIndex++); } + public String getUniqueName(FieldNode field) { + return String.format("fd%s$%s$%d", this.sessionId.substring(30), field.name, this.nextUniqueFieldIndex++); + } + /** * Apply mixins to this class */ From adf1c040a6949799b1060bbf4df46a12a7a17b36 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 21 Jun 2016 15:20:18 +0100 Subject: [PATCH 168/169] Quick and dirty merge of platform refactor for remapper, closes #91 --- gradle.properties | 2 +- .../asm/launch/MixinBootstrap.java | 51 +++- .../asm/launch/MixinTweaker.java | 204 +------------ .../IMixinPlatformAgent.java} | 20 +- .../launch/{ => platform}/MainAttributes.java | 2 +- .../MixinContainer.java} | 45 ++- .../MixinPlatformAgentAbstract.java} | 20 +- .../MixinPlatformAgentDefault.java} | 21 +- .../MixinPlatformAgentFML.java} | 59 ++-- .../launch/platform/MixinPlatformManager.java | 285 ++++++++++++++++++ .../asm/mixin/MixinEnvironment.java | 1 + .../asm/obfuscation/RemapperChain.java | 5 + .../launchwrapper/LaunchClassLoaderUtil.java | 44 ++- 13 files changed, 481 insertions(+), 278 deletions(-) rename src/main/java/org/spongepowered/asm/launch/{IMixinLaunchAgent.java => platform/IMixinPlatformAgent.java} (80%) rename src/main/java/org/spongepowered/asm/launch/{ => platform}/MainAttributes.java (98%) rename src/main/java/org/spongepowered/asm/launch/{MixinTweakContainer.java => platform/MixinContainer.java} (62%) rename src/main/java/org/spongepowered/asm/launch/{MixinLaunchAgentAbstract.java => platform/MixinPlatformAgentAbstract.java} (78%) rename src/main/java/org/spongepowered/asm/launch/{MixinLaunchAgentDefault.java => platform/MixinPlatformAgentDefault.java} (77%) rename src/main/java/org/spongepowered/asm/launch/{MixinLaunchAgentFML.java => platform/MixinPlatformAgentFML.java} (79%) create mode 100644 src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java diff --git a/gradle.properties b/gradle.properties index e0ca29b8..8b9c1033 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.5.10 +buildVersion=0.5.11 buildType=SNAPSHOT diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 3601f811..fefc9c8a 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -24,14 +24,19 @@ */ package org.spongepowered.asm.launch; +import java.util.Arrays; import java.util.List; +import java.util.TreeMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.launch.platform.MixinPlatformManager; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import org.spongepowered.asm.util.PrettyPrinter; import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; /** * Bootstaps the mixin subsystem. This class acts as a bridge between the mixin @@ -60,7 +65,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.5.10"; + public static final String VERSION = "0.6"; // Consts private static final String LAUNCH_PACKAGE = "org.spongepowered.asm.launch."; @@ -76,7 +81,7 @@ public abstract class MixinBootstrap { // These are Klass local, with luck this shouldn't be a problem private static boolean initialised = false; - private static boolean injectStateTweaker = true; + private static boolean initState = true; // Static initialiser, add classloader exclusions as early as possible static { @@ -88,6 +93,8 @@ public abstract class MixinBootstrap { // Only needed in dev, in production this would be handled by the tweaker Launch.classLoader.addClassLoaderExclusion(MixinBootstrap.LAUNCH_PACKAGE); } + + private static MixinPlatformManager platformManager = new MixinPlatformManager(); private MixinBootstrap() {} @@ -98,21 +105,28 @@ public abstract class MixinBootstrap { Launch.classLoader.registerTransformer(MixinBootstrap.TRANSFORMER_PROXY_CLASS); } + /** + * Get the platform manager + */ + public static MixinPlatformManager getPlatform() { + return MixinBootstrap.platformManager; + } + /** * Initialise the mixin subsystem */ public static void init() { - if (!MixinBootstrap.preInit()) { + if (!MixinBootstrap.start()) { return; } - MixinBootstrap.register(); + MixinBootstrap.doInit(null); } /** * Phase 1 of mixin initialisation */ - static boolean preInit() { + static boolean start() { Object registeredVersion = Blackboard.get(Blackboard.Keys.INIT); if (registeredVersion != null) { if (!registeredVersion.equals(MixinBootstrap.VERSION)) { @@ -132,11 +146,12 @@ public abstract class MixinBootstrap { if (command != null && command.contains("GradleStart")) { System.setProperty("mixin.env.disableRefMap", "true"); } - + if (MixinBootstrap.findInStackTrace(Launch.class.getName(), "launch") > 132) { MixinBootstrap.logger.error("Initialising mixin subsystem after game pre-init phase! Some mixins may be skipped."); MixinEnvironment.init(Phase.DEFAULT); - MixinBootstrap.injectStateTweaker = false; + MixinBootstrap.getPlatform().prepare(null); + MixinBootstrap.initState = false; } else { MixinEnvironment.init(Phase.PREINIT); } @@ -148,16 +163,23 @@ public abstract class MixinBootstrap { } /** - * Phase 2 of mixin initialisation, register the state tweaker + * Phase 2 of mixin initialisation, initialise the phases */ - static void register() { + static void doInit(List args) { if (!MixinBootstrap.initialised) { - throw new IllegalStateException("MixinBootstrap.register() called before MixinBootstrap.preInit()"); + throw new IllegalStateException("MixinBootstrap.doInit() called before MixinBootstrap.preInit()"); } - if (MixinBootstrap.injectStateTweaker) { + for (String platformProviderClass : MixinBootstrap.getPlatform().getPhaseProviderClasses()) { +// System.err.printf("Registering %s\n", platformProviderClass); +// MixinEnvironment.registerPhaseProvider(platformProviderClass); + } + + if (MixinBootstrap.initState) { + MixinBootstrap.getPlatform().prepare(args); + if (MixinBootstrap.findInStackTrace(Launch.class.getName(), "launch") < 4) { - MixinBootstrap.logger.warn("MixinBootstrap.register() called during a tweak constructor. Expect CoModificationException in 5.. 4.."); + MixinBootstrap.logger.warn("MixinBootstrap.doInit() called during a tweak constructor. Expect CoModificationException in 5.. 4.."); } List tweakClasses = Blackboard.>get(Blackboard.Keys.TWEAKCLASSES); @@ -167,6 +189,10 @@ public abstract class MixinBootstrap { } } + static void injectIntoClassLoader(LaunchClassLoader classLoader) { + MixinBootstrap.getPlatform().injectIntoClassLoader(classLoader); + } + private static int findInStackTrace(String className, String methodName) { Thread currentThread = Thread.currentThread(); @@ -183,4 +209,5 @@ public abstract class MixinBootstrap { return 0; } + } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java index 621df793..d87904db 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweaker.java @@ -25,23 +25,9 @@ package org.spongepowered.asm.launch; import java.io.File; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.spongepowered.asm.mixin.MixinEnvironment; -import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; -import org.spongepowered.asm.mixin.MixinEnvironment.Phase; -import org.spongepowered.asm.mixin.Mixins; -import org.spongepowered.asm.util.Constants.ManifestAttributes; import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; /** @@ -51,90 +37,20 @@ import net.minecraft.launchwrapper.LaunchClassLoader; */ public class MixinTweaker implements ITweaker { - private static final String DEFAULT_MAIN_CLASS = "net.minecraft.client.main.Main"; - - /** - * Make with the logging already - */ - private static final Logger logger = LogManager.getLogger("mixin"); - - /** - * Tweak containers - */ - private final Map containers = new LinkedHashMap(); - - /** - * Container for this tweaker - */ - private MixinTweakContainer primaryContainer; - - /** - * Tracks whether {@link #acceptOptions} was called yet, if true, causes new - * launch agents to be prepared immediately - */ - private boolean prepared = false; - /** * Hello world */ public MixinTweaker() { - MixinBootstrap.preInit(); - - // Add agents for the tweak container - URI uri = null; - try { - uri = this.getClass().getProtectionDomain().getCodeSource().getLocation().toURI(); - if (uri != null) { - this.primaryContainer = this.addContainer(uri); - } - } catch (URISyntaxException ex) { - ex.printStackTrace(); - } + MixinBootstrap.start(); } - public final MixinTweakContainer addContainer(URI uri) { - MixinTweakContainer existingContainer = this.containers.get(uri); - if (existingContainer != null) { - return existingContainer; - } - - MixinTweaker.logger.debug("Adding mixin launch agents for container {}", uri); - MixinTweakContainer container = new MixinTweakContainer(uri); - this.containers.put(uri, container); - - if (this.prepared) { - container.prepare(); - } - return container; - } - /* (non-Javadoc) * @see net.minecraft.launchwrapper.ITweaker#acceptOptions(java.util.List, * java.io.File, java.io.File, java.lang.String) */ @Override public final void acceptOptions(List args, File gameDir, File assetsDir, String profile) { - MixinBootstrap.register(); - this.prepared = true; - for (MixinTweakContainer container : this.containers.values()) { - container.prepare(); - } - this.parseArgs(args); - } - - /** - * Read and parse command-line arguments - * - * @param args command-line arguments - */ - private void parseArgs(List args) { - boolean captureNext = false; - for (String arg : args) { - if (captureNext) { - MixinTweaker.addConfig(arg); - } - captureNext = "--mixin".equals(arg); - } + MixinBootstrap.doInit(args); } /* (non-Javadoc) @@ -143,46 +59,7 @@ public class MixinTweaker implements ITweaker { */ @Override public final void injectIntoClassLoader(LaunchClassLoader classLoader) { - if (this.primaryContainer != null) { - this.primaryContainer.initPrimaryContainer(); - } - - this.scanClasspath(); - MixinTweaker.logger.debug("injectIntoClassLoader running with {} agents", this.containers.size()); - for (MixinTweakContainer container : this.containers.values()) { - try { - container.injectIntoClassLoader(classLoader); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - } - - /** - * Scan the classpath for mixin containers (containers which declare the - * mixin tweaker in their manifest) and add agents for them - */ - private void scanClasspath() { - for (URL url : Launch.classLoader.getSources()) { - try { - URI uri = url.toURI(); - if (this.containers.containsKey(uri)) { - continue; - } - MixinTweaker.logger.debug("Scanning {} for mixin tweaker", uri); - if (!"file".equals(uri.getScheme()) || !new File(uri).exists()) { - continue; - } - MainAttributes attributes = MainAttributes.of(uri); - String tweaker = attributes.get(ManifestAttributes.TWEAKER); - if (MixinTweaker.class.getName().equals(tweaker)) { - MixinTweaker.logger.debug("{} contains a mixin tweaker, adding agents", uri); - this.addContainer(uri); - } - } catch (Exception ex) { - ex.printStackTrace(); - } - } + MixinBootstrap.injectIntoClassLoader(classLoader); } /* (non-Javadoc) @@ -190,14 +67,7 @@ public class MixinTweaker implements ITweaker { */ @Override public String getLaunchTarget() { - for (MixinTweakContainer container : this.containers.values()) { - String mainClass = container.getLaunchTarget(); - if (mainClass != null) { - return mainClass; - } - } - - return MixinTweaker.DEFAULT_MAIN_CLASS; + return MixinBootstrap.getPlatform().getLaunchTarget(); } /* (non-Javadoc) @@ -208,70 +78,4 @@ public class MixinTweaker implements ITweaker { return new String[]{}; } - /** - * Set the desired compatibility level as a string, used by agents to set - * compatibility level from jar manifest - * - * @param level compatibility level as a string - */ - @Deprecated - static void setCompatibilityLevel(String level) { - try { - CompatibilityLevel value = CompatibilityLevel.valueOf(level.toUpperCase()); - MixinTweaker.logger.debug("Setting mixin compatibility level: {}", value); - MixinEnvironment.setCompatibilityLevel(value); - } catch (IllegalArgumentException ex) { - MixinTweaker.logger.warn("Invalid compatibility level specified: {}", level); - } - } - - /** - * Add a config from a jar manifest source or the command line. Supports - * config declarations in the form filename.json or alternatively - * filename.json@PHASE where PHASE is a - * case-sensitive string token representing an environment phase. - * - * @param config config resource name, does not require a leading / - */ - @SuppressWarnings("deprecation") - static void addConfig(String config) { - if (config.endsWith(".json")) { - MixinTweaker.logger.debug("Registering mixin config: {}", config); - Mixins.addConfiguration(config); - } else if (config.contains(".json@")) { - int pos = config.indexOf(".json@"); - String phaseName = config.substring(pos + 6); - config = config.substring(0, pos + 5); - Phase phase = Phase.forName(phaseName); - if (phase != null) { - MixinTweaker.logger.warn("Setting config phase via manifest is deprecated: {}. Specify target in config instead", config); - MixinTweaker.logger.debug("Registering mixin config: {}", config); - MixinEnvironment.getEnvironment(phase).addConfiguration(config); - } - } - } - - /** - * Add a token provider class from a jar manifest source. Supports either - * bare class names in the form blah.package.ClassName or - * alternatively blah.package.ClassName@PHASE where - * PHASE is a case-sensitive string token representing an - * environment phase name. - * - * @param provider provider class name, optionally suffixed with @PHASE - */ - static void addTokenProvider(String provider) { - if (provider.contains("@")) { - String[] parts = provider.split("@", 2); - Phase phase = Phase.forName(parts[1]); - if (phase != null) { - MixinTweaker.logger.debug("Registering token provider class: {}", parts[0]); - MixinEnvironment.getEnvironment(phase).registerTokenProviderClass(parts[0]); - } - return; - } - - MixinEnvironment.getDefaultEnvironment().registerTokenProviderClass(provider); - } - } diff --git a/src/main/java/org/spongepowered/asm/launch/IMixinLaunchAgent.java b/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformAgent.java similarity index 80% rename from src/main/java/org/spongepowered/asm/launch/IMixinLaunchAgent.java rename to src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformAgent.java index f9a08085..abdad43d 100644 --- a/src/main/java/org/spongepowered/asm/launch/IMixinLaunchAgent.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/IMixinPlatformAgent.java @@ -22,21 +22,26 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.launch; +package org.spongepowered.asm.launch.platform; import net.minecraft.launchwrapper.LaunchClassLoader; /** - * Base interface for launch agents. Launch agents are environment-specific - * launch handlers which are used by the {@link MixinTweaker mixin tweaker} to - * perform launch tasks required by that environment without having to fill the - * tweaker itself with a bunch of environment-specific cruft. + * Base interface for platform agents. Platform agents are environment-specific + * handlers which are used by the Mixin subsystem to perform platform-specific + * tasks required by different environments without having to litter the Mixin + * codebase with a bunch of environment-specific cruft. * - *

Agents handle mixin environment launch tasks on a per-container basis, + *

Platform Agents handle mixin environment tasks on a per-container basis, * with each container in the environment being assigned one of each available * type of agent to handle those tasks on behalf of the container.

*/ -interface IMixinLaunchAgent { +public interface IMixinPlatformAgent { + + /** + * Get the phase provider for this agent + */ + public abstract String getPhaseProvider(); /** * Called during pre-initialisation, after all tweakers and tweak containers @@ -63,4 +68,5 @@ interface IMixinLaunchAgent { * custom target is available. */ public abstract String getLaunchTarget(); + } diff --git a/src/main/java/org/spongepowered/asm/launch/MainAttributes.java b/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java similarity index 98% rename from src/main/java/org/spongepowered/asm/launch/MainAttributes.java rename to src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java index 7b8938ca..574bd9f3 100644 --- a/src/main/java/org/spongepowered/asm/launch/MainAttributes.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.launch; +package org.spongepowered.asm.launch.platform; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinContainer.java similarity index 62% rename from src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java rename to src/main/java/org/spongepowered/asm/launch/platform/MixinContainer.java index 137b69d9..0c274329 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinContainer.java @@ -22,46 +22,48 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.launch; +package org.spongepowered.asm.launch.platform; import java.lang.reflect.Constructor; import java.net.URI; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.launch.Blackboard; import net.minecraft.launchwrapper.LaunchClassLoader; /** - * A collection of {@link IMixinLaunchAgent} launch agents) + * A collection of {@link IMixinPlatformAgent} platform agents) */ -public class MixinTweakContainer { +public class MixinContainer { public static final List agentClasses = new ArrayList(); static { - Blackboard.put(Blackboard.Keys.AGENTS, MixinTweakContainer.agentClasses); - MixinTweakContainer.agentClasses.add("org.spongepowered.asm.launch.MixinLaunchAgentFML"); - MixinTweakContainer.agentClasses.add("org.spongepowered.asm.launch.MixinLaunchAgentDefault"); + Blackboard.put(Blackboard.Keys.AGENTS, MixinContainer.agentClasses); + MixinContainer.agentClasses.add("org.spongepowered.asm.launch.platform.MixinPlatformAgentFML"); + MixinContainer.agentClasses.add("org.spongepowered.asm.launch.platform.MixinPlatformAgentDefault"); } private final Logger logger = LogManager.getLogger("mixin"); private final URI uri; - private final List agents = new ArrayList(); + private final List agents = new ArrayList(); - public MixinTweakContainer(URI uri) { + public MixinContainer(MixinPlatformManager manager, URI uri) { this.uri = uri; - for (String agentClass : MixinTweakContainer.agentClasses) { + for (String agentClass : MixinContainer.agentClasses) { try { @SuppressWarnings("unchecked") - Class clazz = (Class)Class.forName(agentClass); - Constructor ctor = clazz.getDeclaredConstructor(URI.class); - IMixinLaunchAgent agent = ctor.newInstance(uri); + Class clazz = (Class)Class.forName(agentClass); + Constructor ctor = clazz.getDeclaredConstructor(MixinPlatformManager.class, URI.class); + IMixinPlatformAgent agent = ctor.newInstance(manager, uri); this.agents.add(agent); } catch (Exception ex) { this.logger.catching(ex); @@ -76,17 +78,28 @@ public class MixinTweakContainer { return this.uri; } + public Collection getPhaseProviders() { + List phaseProviders = new ArrayList(); + for (IMixinPlatformAgent agent : this.agents) { + String phaseProvider = agent.getPhaseProvider(); + if (phaseProvider != null) { + phaseProviders.add(phaseProvider); + } + } + return phaseProviders; + } + /** * */ public void prepare() { - for (IMixinLaunchAgent agent : this.agents) { + for (IMixinPlatformAgent agent : this.agents) { agent.prepare(); } } public void initPrimaryContainer() { - for (IMixinLaunchAgent agent : this.agents) { + for (IMixinPlatformAgent agent : this.agents) { this.logger.debug("Processing launch tasks for {}", agent); agent.initPrimaryContainer(); } @@ -96,13 +109,13 @@ public class MixinTweakContainer { * @param classLoader */ public void injectIntoClassLoader(LaunchClassLoader classLoader) { - for (IMixinLaunchAgent agent : this.agents) { + for (IMixinPlatformAgent agent : this.agents) { agent.injectIntoClassLoader(classLoader); } } public String getLaunchTarget() { - for (IMixinLaunchAgent agent : this.agents) { + for (IMixinPlatformAgent agent : this.agents) { String launchTarget = agent.getLaunchTarget(); if (launchTarget != null) { return launchTarget; diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentAbstract.java similarity index 78% rename from src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java rename to src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentAbstract.java index 4ba3b701..c32924dd 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentAbstract.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentAbstract.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.launch; +package org.spongepowered.asm.launch.platform; import java.io.File; import java.net.URI; @@ -31,15 +31,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; /** - * Launch agent base class + * Platform agent base class */ -public abstract class MixinLaunchAgentAbstract implements IMixinLaunchAgent { +public abstract class MixinPlatformAgentAbstract implements IMixinPlatformAgent { /** * Logger */ protected static final Logger logger = LogManager.getLogger("mixin"); + protected final MixinPlatformManager manager; + /** * URI to the container */ @@ -56,11 +58,12 @@ public abstract class MixinLaunchAgentAbstract implements IMixinLaunchAgent { protected final MainAttributes attributes; /** - * Create a new launch agent for the specified URI + * Create a new platform agent for the specified URI * * @param uri */ - public MixinLaunchAgentAbstract(URI uri) { + public MixinPlatformAgentAbstract(MixinPlatformManager manager, URI uri) { + this.manager = manager; this.uri = uri; this.container = this.uri != null ? new File(this.uri) : null; this.attributes = MainAttributes.of(uri); @@ -68,7 +71,12 @@ public abstract class MixinLaunchAgentAbstract implements IMixinLaunchAgent { @Override public String toString() { - return String.format("LaunchAgent[%s:%s]", this.getClass().getSimpleName(), this.uri); + return String.format("PlatformAgent[%s:%s]", this.getClass().getSimpleName(), this.uri); } + @Override + public String getPhaseProvider() { + return null; + } + } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentDefault.java similarity index 77% rename from src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java rename to src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentDefault.java index b9949c6e..fd6aae9b 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentDefault.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentDefault.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.launch; +package org.spongepowered.asm.launch.platform; import java.net.URI; @@ -31,35 +31,34 @@ import org.spongepowered.asm.util.Constants.ManifestAttributes; import net.minecraft.launchwrapper.LaunchClassLoader; /** - * Default launch agent, handles the MixinConfigs manifest key + * Default platform agent, handles the mixin manifest keys such as + * MixinConfigs and MixinTokenProviders. */ -public class MixinLaunchAgentDefault extends MixinLaunchAgentAbstract { +public class MixinPlatformAgentDefault extends MixinPlatformAgentAbstract { - public MixinLaunchAgentDefault(URI uri) { - super(uri); + public MixinPlatformAgentDefault(MixinPlatformManager manager, URI uri) { + super(manager, uri); } - @SuppressWarnings("deprecation") @Override public void prepare() { + @SuppressWarnings("deprecation") String compatibilityLevel = this.attributes.get(ManifestAttributes.COMPATIBILITY); if (compatibilityLevel != null) { - MixinLaunchAgentAbstract.logger.warn("{} Setting mixin compatibility level via manifest is deprecated, " - + "use 'compatibilityLevel' key in config instead", this.container); - MixinTweaker.setCompatibilityLevel(compatibilityLevel); + this.manager.setCompatibilityLevel(compatibilityLevel); } String mixinConfigs = this.attributes.get(ManifestAttributes.MIXINCONFIGS); if (mixinConfigs != null) { for (String config : mixinConfigs.split(",")) { - MixinTweaker.addConfig(config.trim()); + this.manager.addConfig(config.trim()); } } String tokenProviders = this.attributes.get(ManifestAttributes.TOKENPROVIDERS); if (tokenProviders != null) { for (String provider : tokenProviders.split(",")) { - MixinTweaker.addTokenProvider(provider.trim()); + this.manager.addTokenProvider(provider.trim()); } } } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFML.java similarity index 79% rename from src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java rename to src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFML.java index 316cf195..404e4b76 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFML.java @@ -22,32 +22,39 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.asm.launch; +package org.spongepowered.asm.launch.platform; import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URI; +//import java.util.Collection; import java.util.Collections; import java.util.List; import org.apache.logging.log4j.Level; +import org.spongepowered.asm.launch.Blackboard; import org.spongepowered.asm.mixin.MixinEnvironment; +//import org.spongepowered.asm.mixin.environment.IPhaseProvider; +//import org.spongepowered.asm.mixin.environment.PhaseDefinition; +//import org.spongepowered.asm.mixin.environment.phase.OnLogMessage; import org.spongepowered.asm.mixin.extensibility.IRemapper; +//import com.google.common.collect.ImmutableList; + import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; /** - * Launch agent for use under FML. + * Platform agent for use under FML. * *

When FML is present we scan containers for the manifest entries which are * inhibited by the tweaker, in particular the FMLCorePlugin and * FMLCorePluginContainsFMLMod entries. This is required because FML * performs no further processing of containers if they contain a tweaker!

*/ -public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { +public class MixinPlatformAgentFML extends MixinPlatformAgentAbstract { private static final String LOAD_CORE_MOD_METHOD = "loadCoreMod"; private static final String GET_REPARSEABLE_COREMODS_METHOD = "getReparseableCoremods"; @@ -83,8 +90,8 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { /** * @param uri */ - public MixinLaunchAgentFML(URI uri) { - super(uri); + public MixinPlatformAgentFML(MixinPlatformManager manager, URI uri) { + super(manager, uri); this.fileName = this.container.getName(); this.coreModWrapper = this.initFMLCoreMod(); } @@ -94,9 +101,9 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { */ private ITweaker initFMLCoreMod() { try { - this.clCoreModManager = MixinLaunchAgentFML.getCoreModManagerClass(); + this.clCoreModManager = MixinPlatformAgentFML.getCoreModManagerClass(); - if ("true".equalsIgnoreCase(this.attributes.get(MixinLaunchAgentFML.MFATT_FORCELOADASMOD))) { + if ("true".equalsIgnoreCase(this.attributes.get(MixinPlatformAgentFML.MFATT_FORCELOADASMOD))) { this.loadAsMod(); } @@ -119,12 +126,12 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { */ private void loadAsMod() { try { - MixinLaunchAgentFML.getIgnoredMods(this.clCoreModManager).remove(this.fileName); + MixinPlatformAgentFML.getIgnoredMods(this.clCoreModManager).remove(this.fileName); } catch (Exception ex) { - MixinLaunchAgentAbstract.logger.catching(ex); + MixinPlatformAgentAbstract.logger.catching(ex); } - if (this.attributes.get(MixinLaunchAgentFML.MFATT_COREMODCONTAINSMOD) != null) { + if (this.attributes.get(MixinPlatformAgentFML.MFATT_COREMODCONTAINSMOD) != null) { this.addReparseableJar(); } } @@ -136,7 +143,7 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { private void addReparseableJar() { try { Method mdGetReparsedCoremods = this.clCoreModManager.getDeclaredMethod(Blackboard.getString( - Blackboard.Keys.FML_GET_REPARSEABLE_COREMODS, MixinLaunchAgentFML.GET_REPARSEABLE_COREMODS_METHOD)); + Blackboard.Keys.FML_GET_REPARSEABLE_COREMODS, MixinPlatformAgentFML.GET_REPARSEABLE_COREMODS_METHOD)); @SuppressWarnings("unchecked") List reparsedCoremods = (List)mdGetReparsedCoremods.invoke(null); if (!reparsedCoremods.contains(this.fileName)) { @@ -148,13 +155,13 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { } private ITweaker injectCorePlugin() throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { - String coreModName = this.attributes.get(MixinLaunchAgentFML.MFATT_FMLCOREPLUGIN); + String coreModName = this.attributes.get(MixinPlatformAgentFML.MFATT_FMLCOREPLUGIN); if (coreModName == null) { return null; } Method mdLoadCoreMod = this.clCoreModManager.getDeclaredMethod(Blackboard.getString( - Blackboard.Keys.FML_LOAD_CORE_MOD, MixinLaunchAgentFML.LOAD_CORE_MOD_METHOD), LaunchClassLoader.class, String.class, File.class); + Blackboard.Keys.FML_LOAD_CORE_MOD, MixinPlatformAgentFML.LOAD_CORE_MOD_METHOD), LaunchClassLoader.class, String.class, File.class); mdLoadCoreMod.setAccessible(true); ITweaker wrapper = (ITweaker)mdLoadCoreMod.invoke(null, Launch.classLoader, coreModName, this.container); if (wrapper == null) { @@ -163,38 +170,44 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { return wrapper; } + + @Override + public String getPhaseProvider() { + return MixinPlatformAgentFML.class.getName() + "$PhaseProvider"; + } /* (non-Javadoc) - * @see org.spongepowered.asm.launch.IMixinLaunchAgent#prepare() + * @see org.spongepowered.asm.launch.IMixinPlatformAgent#prepare() */ @Override public void prepare() { } /* (non-Javadoc) - * @see org.spongepowered.asm.launch.IMixinLaunchAgent + * @see org.spongepowered.asm.launch.IMixinPlatformAgent * #initPrimaryContainer() */ @Override public void initPrimaryContainer() { if (this.clCoreModManager != null) { +// MixinEnvironment.registerPhaseProvider(MixinPlatformAgentFML.class.getName() + "$PhaseProvider"); this.injectRemapper(); } } private void injectRemapper() { try { - Class clFmlRemapperAdapter = Class.forName(MixinLaunchAgentFML.FML_REMAPPER_ADAPTER_CLASS, true, Launch.classLoader); + Class clFmlRemapperAdapter = Class.forName(MixinPlatformAgentFML.FML_REMAPPER_ADAPTER_CLASS, true, Launch.classLoader); Method mdCreate = clFmlRemapperAdapter.getDeclaredMethod("create"); IRemapper remapper = (IRemapper)mdCreate.invoke(null); MixinEnvironment.getDefaultEnvironment().getRemappers().add(remapper); } catch (Exception ex) { - MixinLaunchAgentAbstract.logger.debug("Failed instancing FML remapper adapter, things will probably go horribly for notch-obf'd mods!"); + MixinPlatformAgentAbstract.logger.debug("Failed instancing FML remapper adapter, things will probably go horribly for notch-obf'd mods!"); } } /* (non-Javadoc) - * @see org.spongepowered.asm.launch.IMixinLaunchAgent + * @see org.spongepowered.asm.launch.IMixinPlatformAgent * #injectIntoClassLoader(net.minecraft.launchwrapper.LaunchClassLoader) */ @Override @@ -205,13 +218,13 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { } /* (non-Javadoc) - * @see org.spongepowered.asm.launch.IMixinLaunchAgent#getLaunchTarget() + * @see org.spongepowered.asm.launch.IMixinPlatformAgent#getLaunchTarget() */ @Override public String getLaunchTarget() { return null; } - + /** * Performs a naive check which attempts to discover whether we are pre or * post FML's main injection. If we are pre, then we must not @@ -240,7 +253,7 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { private static Class getCoreModManagerClass() throws ClassNotFoundException { try { return Class.forName(Blackboard.getString( - Blackboard.Keys.FML_CORE_MOD_MANAGER, MixinLaunchAgentFML.CORE_MOD_MANAGER_CLASS)); + Blackboard.Keys.FML_CORE_MOD_MANAGER, MixinPlatformAgentFML.CORE_MOD_MANAGER_CLASS)); } catch (ClassNotFoundException ex) { return Class.forName("cpw.mods.fml.relauncher.CoreModManager"); } @@ -252,13 +265,13 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { try { mdGetIgnoredMods = clCoreModManager.getDeclaredMethod(Blackboard.getString( - Blackboard.Keys.FML_GET_IGNORED_MODS, MixinLaunchAgentFML.GET_IGNORED_MODS_METHOD)); + Blackboard.Keys.FML_GET_IGNORED_MODS, MixinPlatformAgentFML.GET_IGNORED_MODS_METHOD)); } catch (NoSuchMethodException ex1) { try { // Legacy name mdGetIgnoredMods = clCoreModManager.getDeclaredMethod("getLoadedCoremods"); } catch (NoSuchMethodException ex2) { - MixinLaunchAgentAbstract.logger.catching(Level.DEBUG, ex2); + MixinPlatformAgentAbstract.logger.catching(Level.DEBUG, ex2); return Collections.emptyList(); } } diff --git a/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java new file mode 100644 index 00000000..bdec4790 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java @@ -0,0 +1,285 @@ +/* + * This file is part of Mixin, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.asm.launch.platform; + +import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +//import org.spongepowered.asm.launch.MixinBootstrap.Delegate; +import org.spongepowered.asm.launch.MixinTweaker; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.MixinEnvironment.CompatibilityLevel; +import org.spongepowered.asm.mixin.MixinEnvironment.Phase; +import org.spongepowered.asm.mixin.Mixins; + +//import com.google.common.collect.ImmutableList; + +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; + +/** + * Handler for platform-specific behaviour required in different mixin + * environments. + */ +public class MixinPlatformManager { + + private static final String MFATT_TWEAKER = "TweakClass"; + private static final String DEFAULT_MAIN_CLASS = "net.minecraft.client.main.Main"; + + /** + * Make with the logging already + */ + private static final Logger logger = LogManager.getLogger("mixin"); + + /** + * Bootstrap delegate + */ +// private final Delegate delegate; + + /** + * Tweak containers + */ + private final Map containers = new LinkedHashMap(); + + /** + * Container for this tweaker + */ + private MixinContainer primaryContainer; + + /** + * Tracks whether {@link #acceptOptions} was called yet, if true, causes new + * agents to be prepared immediately + */ + private boolean prepared = false; + + /** + * Tracks whether {@link #injectIntoClassLoader} was called yet + */ + private boolean injected; + + public MixinPlatformManager() { //Delegate delegate) { +// this.delegate = delegate; + + // Add agents for the tweak container + URI uri = null; + try { + uri = this.getClass().getProtectionDomain().getCodeSource().getLocation().toURI(); + if (uri != null) { + this.primaryContainer = this.addContainer(uri); + } + } catch (URISyntaxException ex) { + ex.printStackTrace(); + } + } + + public Collection getPhaseProviderClasses() { + Collection phaseProviders = this.primaryContainer.getPhaseProviders(); + if (phaseProviders != null) { + return Collections.unmodifiableCollection(phaseProviders); + } + + return Collections.emptyList(); + } + + public final MixinContainer addContainer(URI uri) { + MixinContainer existingContainer = this.containers.get(uri); + if (existingContainer != null) { + return existingContainer; + } + + MixinPlatformManager.logger.debug("Adding mixin platform agents for container {}", uri); + MixinContainer container = new MixinContainer(this, uri); + this.containers.put(uri, container); + + if (this.prepared) { + container.prepare(); + } + return container; + } + + public final void prepare(List args) { + this.prepared = true; + for (MixinContainer container : this.containers.values()) { + container.prepare(); + } + if (args != null) { + this.parseArgs(args); + } else { + String argv = System.getProperty("sun.java.command"); + if (argv != null) { + this.parseArgs(Arrays.asList(argv.split(" "))); + } + } + } + + /** + * Read and parse command-line arguments + * + * @param args command-line arguments + */ + private void parseArgs(List args) { + boolean captureNext = false; + for (String arg : args) { + if (captureNext) { + this.addConfig(arg); + } + captureNext = "--mixin".equals(arg); + } + } + + public final void injectIntoClassLoader(LaunchClassLoader classLoader) { + if (this.injected) { + return; + } + this.injected = true; + + if (this.primaryContainer != null) { + this.primaryContainer.initPrimaryContainer(); + } + + this.scanClasspath(); + MixinPlatformManager.logger.debug("injectIntoClassLoader running with {} agents", this.containers.size()); + for (MixinContainer container : this.containers.values()) { + try { + container.injectIntoClassLoader(classLoader); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + } + + /** + * Scan the classpath for mixin containers (containers which declare the + * mixin tweaker in their manifest) and add agents for them + */ + private void scanClasspath() { + for (URL url : Launch.classLoader.getSources()) { + try { + URI uri = url.toURI(); + if (this.containers.containsKey(uri)) { + continue; + } + MixinPlatformManager.logger.debug("Scanning {} for mixin tweaker", uri); + if (!"file".equals(uri.getScheme()) || !new File(uri).exists()) { + continue; + } + MainAttributes attributes = MainAttributes.of(uri); + String tweaker = attributes.get(MixinPlatformManager.MFATT_TWEAKER); + if (MixinTweaker.class.getName().equals(tweaker)) { + MixinPlatformManager.logger.debug("{} contains a mixin tweaker, adding agents", uri); + this.addContainer(uri); + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } + } + + public String getLaunchTarget() { + for (MixinContainer container : this.containers.values()) { + String mainClass = container.getLaunchTarget(); + if (mainClass != null) { + return mainClass; + } + } + + return MixinPlatformManager.DEFAULT_MAIN_CLASS; + } + + /** + * Set the desired compatibility level as a string, used by agents to set + * compatibility level from jar manifest + * + * @param level compatibility level as a string + */ + final void setCompatibilityLevel(String level) { + try { + CompatibilityLevel value = CompatibilityLevel.valueOf(level.toUpperCase()); + MixinPlatformManager.logger.debug("Setting mixin compatibility level: {}", value); + MixinEnvironment.setCompatibilityLevel(value); + } catch (IllegalArgumentException ex) { + MixinPlatformManager.logger.warn("Invalid compatibility level specified: {}", level); + } + } + + /** + * Add a config from a jar manifest source or the command line. Supports + * config declarations in the form filename.json or alternatively + * filename.json@PHASE where PHASE is a + * case-sensitive string token representing an environment phase. + * + * @param config config resource name, does not require a leading / + */ + final void addConfig(String config) { + if (config.endsWith(".json")) { + MixinPlatformManager.logger.debug("Registering mixin config: {}", config); + Mixins.addConfiguration(config); + } else if (config.contains(".json@")) { + int pos = config.indexOf(".json@"); + String phaseName = config.substring(pos + 6); + config = config.substring(0, pos + 5); + Phase phase = Phase.forName(phaseName); + if (phase != null) { + MixinPlatformManager.logger.warn("Setting config phase via manifest is deprecated: {}. Specify target in config instead", config); + MixinPlatformManager.logger.debug("Registering mixin config: {}", config); + MixinEnvironment.getEnvironment(phase).addConfiguration(config); + } + } + } + + /** + * Add a token provider class from a jar manifest source. Supports either + * bare class names in the form blah.package.ClassName or + * alternatively blah.package.ClassName@PHASE where + * PHASE is a case-sensitive string token representing an + * environment phase name. + * + * @param provider provider class name, optionally suffixed with @PHASE + */ + final void addTokenProvider(String provider) { + if (provider.contains("@")) { + String[] parts = provider.split("@", 2); + Phase phase = Phase.forName(parts[1]); + if (phase != null) { + MixinPlatformManager.logger.debug("Registering token provider class: {}", parts[0]); + MixinEnvironment.getEnvironment(phase).registerTokenProviderClass(parts[0]); + } + return; + } + + MixinEnvironment.getDefaultEnvironment().registerTokenProviderClass(provider); + } + +} diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 83502248..bf7210c2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -549,6 +549,7 @@ public final class MixinEnvironment implements ITokenProvider { @Override public void injectIntoClassLoader(LaunchClassLoader classLoader) { + MixinBootstrap.getPlatform().injectIntoClassLoader(classLoader); } @Override diff --git a/src/main/java/org/spongepowered/asm/obfuscation/RemapperChain.java b/src/main/java/org/spongepowered/asm/obfuscation/RemapperChain.java index 411adcdb..926c0358 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/RemapperChain.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/RemapperChain.java @@ -37,6 +37,11 @@ public class RemapperChain implements IRemapper { private final List remappers = new ArrayList(); + @Override + public String toString() { + return String.format("RemapperChain[%d]", this.remappers.size()); + } + public RemapperChain add(IRemapper remapper) { this.remappers.add(remapper); return this; diff --git a/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java index cec9bcaf..072a07c5 100644 --- a/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java +++ b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.Vector; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -41,6 +42,15 @@ import net.minecraft.launchwrapper.LaunchClassLoader; */ public final class LaunchClassLoaderUtil { + /** + * Class load state + */ + public enum LoadedType { + UNLOADED, + LOADED, + TRANSFORMED + } + /** * ClassLoader -> util mapping */ @@ -51,6 +61,8 @@ public final class LaunchClassLoaderUtil { */ private final LaunchClassLoader classLoader; + private final Set parentLoadedClassNames = new HashSet(); + // Reflected fields private Map> cachedClasses; private final Set invalidClasses; @@ -109,7 +121,17 @@ public final class LaunchClassLoaderUtil { * @return true if the class name exists in the cache */ public boolean isClassLoaded(String name) { - return this.cachedClasses != null && this.cachedClasses.containsKey(name); + if (this.cachedClasses != null && this.cachedClasses.containsKey(name)) { + return true; + } + +// if (this.parentLoadedClassNames.contains(name)) { +// return true; +// } +// +// this.readLoadedClassesFromParent(); +// return this.parentLoadedClassNames.contains(name); + return false; } /** @@ -163,6 +185,26 @@ public final class LaunchClassLoaderUtil { return Collections.emptySet(); } + private void readLoadedClassesFromParent() { + if (this.classLoader == null) { + return; + } + + ClassLoader parent = this.classLoader.getClass().getClassLoader(); + try { + Field fdClasses = ClassLoader.class.getDeclaredField("classes"); + fdClasses.setAccessible(true); + + @SuppressWarnings("unchecked") + Vector> classes = (Vector>) fdClasses.get(parent); + for (Class c : classes) { + this.parentLoadedClassNames.add(c.getName()); + } + } catch (Exception ex) { + // boo + } + } + @SuppressWarnings("unchecked") private static T getField(LaunchClassLoader classLoader, String fieldName) { try { From f0d25bd2995cda0064929f625e750ec8e27f6783 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 21 Jun 2016 15:22:11 +0100 Subject: [PATCH 169/169] Clean this up, correct version --- .../asm/launch/MixinBootstrap.java | 10 ++--- .../launch/platform/MixinPlatformManager.java | 2 + .../launchwrapper/LaunchClassLoaderUtil.java | 38 ------------------- 3 files changed, 6 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index fefc9c8a..2407da88 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -24,16 +24,13 @@ */ package org.spongepowered.asm.launch; -import java.util.Arrays; import java.util.List; -import java.util.TreeMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.launch.platform.MixinPlatformManager; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; -import org.spongepowered.asm.util.PrettyPrinter; import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -65,7 +62,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.6"; + public static final String VERSION = "0.5.11"; // Consts private static final String LAUNCH_PACKAGE = "org.spongepowered.asm.launch."; @@ -170,10 +167,11 @@ public abstract class MixinBootstrap { throw new IllegalStateException("MixinBootstrap.doInit() called before MixinBootstrap.preInit()"); } - for (String platformProviderClass : MixinBootstrap.getPlatform().getPhaseProviderClasses()) { + MixinBootstrap.getPlatform().getPhaseProviderClasses(); +// for (String platformProviderClass : MixinBootstrap.getPlatform().getPhaseProviderClasses()) { // System.err.printf("Registering %s\n", platformProviderClass); // MixinEnvironment.registerPhaseProvider(platformProviderClass); - } +// } if (MixinBootstrap.initState) { MixinBootstrap.getPlatform().prepare(args); diff --git a/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java index bdec4790..efde7e32 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinPlatformManager.java @@ -224,6 +224,7 @@ public class MixinPlatformManager { * * @param level compatibility level as a string */ + @SuppressWarnings("deprecation") final void setCompatibilityLevel(String level) { try { CompatibilityLevel value = CompatibilityLevel.valueOf(level.toUpperCase()); @@ -242,6 +243,7 @@ public class MixinPlatformManager { * * @param config config resource name, does not require a leading / */ + @SuppressWarnings("deprecation") final void addConfig(String config) { if (config.endsWith(".json")) { MixinPlatformManager.logger.debug("Registering mixin config: {}", config); diff --git a/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java index 072a07c5..8e916132 100644 --- a/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java +++ b/src/main/java/org/spongepowered/asm/util/launchwrapper/LaunchClassLoaderUtil.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.Vector; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -42,15 +41,6 @@ import net.minecraft.launchwrapper.LaunchClassLoader; */ public final class LaunchClassLoaderUtil { - /** - * Class load state - */ - public enum LoadedType { - UNLOADED, - LOADED, - TRANSFORMED - } - /** * ClassLoader -> util mapping */ @@ -61,8 +51,6 @@ public final class LaunchClassLoaderUtil { */ private final LaunchClassLoader classLoader; - private final Set parentLoadedClassNames = new HashSet(); - // Reflected fields private Map> cachedClasses; private final Set invalidClasses; @@ -125,12 +113,6 @@ public final class LaunchClassLoaderUtil { return true; } -// if (this.parentLoadedClassNames.contains(name)) { -// return true; -// } -// -// this.readLoadedClassesFromParent(); -// return this.parentLoadedClassNames.contains(name); return false; } @@ -185,26 +167,6 @@ public final class LaunchClassLoaderUtil { return Collections.emptySet(); } - private void readLoadedClassesFromParent() { - if (this.classLoader == null) { - return; - } - - ClassLoader parent = this.classLoader.getClass().getClassLoader(); - try { - Field fdClasses = ClassLoader.class.getDeclaredField("classes"); - fdClasses.setAccessible(true); - - @SuppressWarnings("unchecked") - Vector> classes = (Vector>) fdClasses.get(parent); - for (Class c : classes) { - this.parentLoadedClassNames.add(c.getName()); - } - } catch (Exception ex) { - // boo - } - } - @SuppressWarnings("unchecked") private static T getField(LaunchClassLoader classLoader, String fieldName) { try {