diff --git a/build.gradle b/build.gradle index bb71522f..0c03b85d 100644 --- a/build.gradle +++ b/build.gradle @@ -110,6 +110,9 @@ dependencies { compile guava compile log4j2 compile 'com.google.code.gson:gson:2.2.4' + if (Float.parseFloat(asmVersion) < 6) { + compile "org.ow2.asm:asm-debug-all:$asmVersion" + } compile "org.ow2.asm:asm-tree:$asmVersion" compile "org.ow2.asm:asm-commons:$asmVersion" compile "org.ow2.asm:asm-util:$asmVersion" @@ -144,6 +147,9 @@ dependencies { modlauncherCompile configurations.compile modlauncherCompile 'net.sf.jopt-simple:jopt-simple:5.0.4' + modlauncherCompile "org.ow2.asm:asm-tree:$modlauncherAsmVersion" + modlauncherCompile "org.ow2.asm:asm-commons:$modlauncherAsmVersion" + modlauncherCompile "org.ow2.asm:asm-util:$modlauncherAsmVersion" modlauncherCompile ('cpw.mods:modlauncher:4.0.0') { exclude module: 'log4j-core' } diff --git a/gradle.properties b/gradle.properties index c0dd8d2e..75c6f4d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,3 +8,4 @@ buildVersion=0.8-preview buildType=SNAPSHOT asmVersion=6.2 legacyForgeAsmVersion=5.0.3 +modlauncherAsmVersion=6.2 diff --git a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java index 7e90c87d..1587ff46 100644 --- a/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java +++ b/src/agent/java/org/spongepowered/tools/agent/MixinAgent.java @@ -41,7 +41,7 @@ import org.spongepowered.asm.mixin.transformer.ext.IHotSwap; import org.spongepowered.asm.mixin.transformer.throwables.MixinReloadException; import org.spongepowered.asm.service.IMixinService; import org.spongepowered.asm.service.MixinService; -import org.spongepowered.asm.util.Bytecode; +import org.spongepowered.asm.util.asm.ASM; /** * An agent that re-transforms a mixin's target classes if the mixin has been @@ -64,7 +64,7 @@ public class MixinAgent implements IHotSwap { byte[] mixinBytecode = MixinAgent.classLoader.getFakeMixinBytecode(classBeingRedefined); if (mixinBytecode != null) { - ClassNode classNode = new ClassNode(Bytecode.ASM_API_VERSION); + ClassNode classNode = new ClassNode(ASM.API_VERSION); ClassReader cr = new ClassReader(classfileBuffer); cr.accept(classNode, ClassReader.EXPAND_FRAMES); diff --git a/src/main/java/org/spongepowered/asm/launch/platform/MixinConnectorManager.java b/src/main/java/org/spongepowered/asm/launch/platform/MixinConnectorManager.java index 69635d62..36a26c5b 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/MixinConnectorManager.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MixinConnectorManager.java @@ -25,11 +25,8 @@ package org.spongepowered.asm.launch.platform; import java.util.ArrayList; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; import java.util.Set; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index 9c1be41d..2f73ccfa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -54,6 +54,7 @@ import org.spongepowered.asm.util.IConsumer; import org.spongepowered.asm.util.ITokenProvider; import org.spongepowered.asm.util.JavaVersion; import org.spongepowered.asm.util.PrettyPrinter; +import org.spongepowered.asm.util.asm.ASM; import org.spongepowered.asm.util.perf.Profiler; import com.google.common.collect.ImmutableList; @@ -977,7 +978,8 @@ public final class MixinEnvironment implements ITokenProvider { printer.kv("Code source", codeSource); printer.kv("Internal Version", version); printer.kv("Java Versions Supported", CompatibilityLevel.getSupportedVersions()); - printer.kv("Current Compatibility Level", MixinEnvironment.getCompatibilityLevel()).hr(); + printer.kv("Current Compatibility Level", MixinEnvironment.getCompatibilityLevel()); + printer.kv("Detected ASM API Version", ASM.getApiVersionString()).hr(); printer.kv("Service Name", serviceName); printer.kv("Mixin Service Class", this.service.getClass().getName()); printer.kv("Global Property Service Class", MixinService.getGlobalPropertyService().getClass().getName()).hr(); diff --git a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGenerator.java b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGenerator.java index 6ee65bbd..68ae4294 100644 --- a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGenerator.java +++ b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGenerator.java @@ -31,7 +31,7 @@ import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.MethodNode; import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; import org.spongepowered.asm.mixin.refmap.IMixinContext; -import org.spongepowered.asm.util.Bytecode; +import org.spongepowered.asm.util.asm.ASM; /** * Base class for accessor generators @@ -70,7 +70,7 @@ public abstract class AccessorGenerator { */ protected final MethodNode createMethod(int maxLocals, int maxStack) { MethodNode method = this.info.getMethod(); - MethodNode accessor = new MethodNode(Bytecode.ASM_API_VERSION, (method.access & ~Opcodes.ACC_ABSTRACT) | Opcodes.ACC_SYNTHETIC, method.name, + MethodNode accessor = new MethodNode(ASM.API_VERSION, (method.access & ~Opcodes.ACC_ABSTRACT) | Opcodes.ACC_SYNTHETIC, method.name, method.desc, null, null); accessor.visibleAnnotations = new ArrayList(); accessor.visibleAnnotations.add(this.info.getAnnotation()); 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 69b19403..ceee6ed4 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java @@ -65,6 +65,7 @@ import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.util.Annotations; import org.spongepowered.asm.util.Bytecode; +import org.spongepowered.asm.util.asm.ASM; import org.spongepowered.asm.util.asm.ElementNode; import com.google.common.base.Strings; @@ -466,7 +467,7 @@ public abstract class InjectionInfo extends SpecialMethodInfo implements ISliceC * @return new method */ public MethodNode addMethod(int access, String name, String desc) { - MethodNode method = new MethodNode(Bytecode.ASM_API_VERSION, access | Opcodes.ACC_SYNTHETIC, name, desc, null, null); + MethodNode method = new MethodNode(ASM.API_VERSION, access | Opcodes.ACC_SYNTHETIC, name, desc, null, null); this.injectedMethods.add(method); return method; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java b/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java index 84a2d787..f4b52a0f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/InnerClassGenerator.java @@ -42,8 +42,8 @@ import org.spongepowered.asm.mixin.transformer.ext.IClassGenerator; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.service.ISyntheticClassInfo; import org.spongepowered.asm.service.MixinService; -import org.spongepowered.asm.util.Bytecode; import org.spongepowered.asm.util.IConsumer; +import org.spongepowered.asm.util.asm.ASM; /** * Class generator which creates unique copies of inner classes within mixins @@ -200,7 +200,7 @@ final class InnerClassGenerator implements IClassGenerator { private final InnerClassInfo info; public InnerClassAdapter(ClassVisitor cv, InnerClassInfo info) { - super(Bytecode.ASM_API_VERSION, cv, info); + super(ASM.API_VERSION, cv, info); this.info = info; } 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 3a743b7d..8fbd6455 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -67,6 +67,7 @@ import org.spongepowered.asm.service.IMixinService; import org.spongepowered.asm.service.MixinService; import org.spongepowered.asm.util.Annotations; import org.spongepowered.asm.util.Bytecode; +import org.spongepowered.asm.util.asm.ASM; import org.spongepowered.asm.util.perf.Profiler; import org.spongepowered.asm.util.perf.Profiler.Section; @@ -87,7 +88,7 @@ class MixinInfo implements Comparable, IMixinInfo { private final String originalName; public MixinMethodNode(int access, String name, String desc, String signature, String[] exceptions) { - super(Bytecode.ASM_API_VERSION, access, name, desc, signature, exceptions); + super(ASM.API_VERSION, access, name, desc, signature, exceptions); this.originalName = name; } @@ -134,7 +135,7 @@ class MixinInfo implements Comparable, IMixinInfo { public final List mixinMethods; MixinClassNode(MixinInfo mixin) { - this(Bytecode.ASM_API_VERSION); + this(ASM.API_VERSION); } @SuppressWarnings("unchecked") 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 71010d8a..01e21624 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -32,8 +32,8 @@ import org.spongepowered.asm.mixin.throwables.MixinException; import org.spongepowered.asm.mixin.transformer.ext.Extensions; import org.spongepowered.asm.mixin.transformer.ext.IExtensionRegistry; import org.spongepowered.asm.transformers.TreeTransformer; -import org.spongepowered.asm.util.Bytecode; import org.spongepowered.asm.util.Constants; +import org.spongepowered.asm.util.asm.ASM; /** * Transformer which manages the mixin configuration and application process @@ -203,7 +203,7 @@ class MixinTransformer extends TreeTransformer implements IMixinTransformer { * You need to ask yourself why you're reading this comment */ private static ClassNode createEmptyClass(String name) { - ClassNode classNode = new ClassNode(Bytecode.ASM_API_VERSION); + ClassNode classNode = new ClassNode(ASM.API_VERSION); classNode.name = name.replace('.', '/'); classNode.version = MixinEnvironment.getCompatibilityLevel().classVersion(); classNode.superName = Constants.OBJECT; diff --git a/src/main/java/org/spongepowered/asm/util/Bytecode.java b/src/main/java/org/spongepowered/asm/util/Bytecode.java index f1a20d49..67104255 100644 --- a/src/main/java/org/spongepowered/asm/util/Bytecode.java +++ b/src/main/java/org/spongepowered/asm/util/Bytecode.java @@ -43,6 +43,7 @@ import org.objectweb.asm.Type; import org.objectweb.asm.tree.*; import org.objectweb.asm.util.CheckClassAdapter; import org.objectweb.asm.util.TraceClassVisitor; +import org.spongepowered.asm.util.asm.ASM; import org.spongepowered.asm.util.throwables.SyntheticBridgeException; import org.spongepowered.asm.util.throwables.SyntheticBridgeException.Problem; @@ -143,8 +144,6 @@ public final class Bytecode { return this.isSuper ? "super" : "this"; } } - - public static final int ASM_API_VERSION = Opcodes.ASM6; /** * Integer constant opcodes @@ -1162,7 +1161,6 @@ public final class Bytecode { dest.sourceDebug = source.sourceDebug; dest.sourceFile = source.sourceFile; - dest.module = source.module; dest.outerClass = source.outerClass; dest.outerMethod = source.outerMethod; dest.outerMethodDesc = source.outerMethodDesc; @@ -1176,7 +1174,10 @@ public final class Bytecode { Bytecode.clear(dest.innerClasses); Bytecode.clear(dest.fields); Bytecode.clear(dest.methods); - + + if (ASM.API_VERSION >= Opcodes.ASM6) { + dest.module = source.module; + } // TODO Java 10 // dest.nestHostClassExperimental = source.nestHostClassExperimental; diff --git a/src/main/java/org/spongepowered/asm/util/ClassSignature.java b/src/main/java/org/spongepowered/asm/util/ClassSignature.java index 0785536c..6b9033a0 100644 --- a/src/main/java/org/spongepowered/asm/util/ClassSignature.java +++ b/src/main/java/org/spongepowered/asm/util/ClassSignature.java @@ -39,6 +39,7 @@ import org.objectweb.asm.signature.SignatureReader; import org.objectweb.asm.signature.SignatureVisitor; import org.objectweb.asm.signature.SignatureWriter; import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.util.asm.ASM; /** * Represents an object-oriented view of a generic class signature. We use ASM's @@ -660,7 +661,7 @@ public class ClassSignature { abstract class SignatureElement extends SignatureVisitor { public SignatureElement() { - super(Bytecode.ASM_API_VERSION); + super(ASM.API_VERSION); } } @@ -897,7 +898,7 @@ public class ClassSignature { private FormalParamElement param; SignatureParser() { - super(Bytecode.ASM_API_VERSION); + super(ASM.API_VERSION); } @Override diff --git a/src/main/java/org/spongepowered/asm/util/Locals.java b/src/main/java/org/spongepowered/asm/util/Locals.java index e6b90dd7..4a30c68b 100644 --- a/src/main/java/org/spongepowered/asm/util/Locals.java +++ b/src/main/java/org/spongepowered/asm/util/Locals.java @@ -48,6 +48,7 @@ import org.objectweb.asm.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.util.asm.ASM; import org.spongepowered.asm.util.asm.MixinVerifier; import org.spongepowered.asm.util.throwables.LVTGeneratorError; @@ -388,7 +389,7 @@ public final class Locals { // Use Analyzer to generate the bytecode frames Analyzer analyzer = new Analyzer( - new MixinVerifier(Bytecode.ASM_API_VERSION, Type.getObjectType(classNode.name), objectType, interfaces, false)); + new MixinVerifier(ASM.API_VERSION, Type.getObjectType(classNode.name), objectType, interfaces, false)); try { analyzer.analyze(classNode.name, method); } catch (AnalyzerException ex) { diff --git a/src/main/java/org/spongepowered/asm/util/asm/ASM.java b/src/main/java/org/spongepowered/asm/util/asm/ASM.java new file mode 100644 index 00000000..5771d06f --- /dev/null +++ b/src/main/java/org/spongepowered/asm/util/asm/ASM.java @@ -0,0 +1,89 @@ +/* + * 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.asm; + +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.ClassNode; + +/** + * Utility methods for determining ASM version and other version-specific + * shenanigans + */ +public final class ASM { + + @SuppressWarnings("deprecation") + private static final int[] EXPERIMENTAL_VERSIONS = { Opcodes.ASM7_EXPERIMENTAL }; + private static final int[] SUPPORTED_VERSIONS = { Opcodes.ASM6, Opcodes.ASM5 }; + + public static final int API_VERSION = ASM.detectVersion(); + + private static boolean experimental; + + private ASM() { + } + + /** + * Get the ASM API version as a string (mostly for debugging and the banner) + * + * @return + */ + public static String getApiVersionString() { + String suffix = ""; + if (ASM.experimental) { + int version = ASM.detectVersion(ASM.SUPPORTED_VERSIONS); + suffix = String.format("-EXPERIMENTAL (%d.%d)", ((0xFF0000 & version) >> 16), ((0xFF00 & version) >> 8)); + } + return String.format("ASM %d.%d%s", ((0xFF0000 & ASM.API_VERSION) >> 16), ((0xFF00 & ASM.API_VERSION) >> 8), suffix); + } + + private static int detectVersion() { + int expVersion = ASM.detectVersion(ASM.EXPERIMENTAL_VERSIONS); + if (expVersion > 0) { + ASM.experimental = true; + return expVersion; + } + + ASM.experimental = false; + int version = ASM.detectVersion(ASM.SUPPORTED_VERSIONS); + if (version > 0) { + return version; + } + + return Opcodes.ASM5; + } + + private static int detectVersion(int[] versions) { + for (int version : versions) { + try { + new ClassNode(version).hashCode(); + return version; + } catch (IllegalArgumentException ex) { + // expected, this version is not supported + } + } + return 0; + } + +} diff --git a/src/main/java/org/spongepowered/asm/util/asm/MethodVisitorEx.java b/src/main/java/org/spongepowered/asm/util/asm/MethodVisitorEx.java index 78ca1a13..0778a679 100644 --- a/src/main/java/org/spongepowered/asm/util/asm/MethodVisitorEx.java +++ b/src/main/java/org/spongepowered/asm/util/asm/MethodVisitorEx.java @@ -34,7 +34,7 @@ import org.spongepowered.asm.util.Bytecode; public class MethodVisitorEx extends MethodVisitor { public MethodVisitorEx(MethodVisitor mv) { - super(Bytecode.ASM_API_VERSION, mv); + super(ASM.API_VERSION, mv); } /** diff --git a/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java b/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java index b896a039..881a8e90 100644 --- a/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java +++ b/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java @@ -153,6 +153,7 @@ public class MixinLaunchPlugin implements ILaunchPluginService, IClassBytecodePr } @Override + @Deprecated public void addResource(Path resource, String name) { this.service.getPrimaryContainer().addResource(name, resource); }