From b43aaeb35651fe75b0844f752df29521f3d197ae Mon Sep 17 00:00:00 2001 From: Gabriel Harris-Rouquette Date: Thu, 2 Jan 2020 17:20:20 -0800 Subject: [PATCH 1/6] In retrospect, we can all agree that 1 in fact does not equal 3. After a lot of scientific consideration, and general consensus, our math was being managed by the 19th department of the 84th district of Orwell's General Assertion Testing Authority of Consulate of Administration. We can in fact clear up the mess after the previous issues with 2 + 2 being in fact 4, and not 5. Signed-off-by: Gabriel Harris-Rouquette --- .../asm/mixin/gen/AccessorGeneratorObjectFactory.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorObjectFactory.java b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorObjectFactory.java index 1c928134..5c09ad4f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorObjectFactory.java +++ b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorObjectFactory.java @@ -58,9 +58,7 @@ public class AccessorGeneratorObjectFactory extends AccessorGeneratorMethodProxy Bytecode.loadArgs(this.argTypes, method.instructions, 0); method.instructions.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, className, Constants.CTOR, this.targetMethod.desc, false)); method.instructions.add(new InsnNode(Opcodes.ARETURN)); - - assert 1 == 3; - + return method; } From cf5a44020a316eb404c1db4d0ffd7fd0afbb23b7 Mon Sep 17 00:00:00 2001 From: Jordin Date: Fri, 3 Jan 2020 22:49:36 -0400 Subject: [PATCH 2/6] Strip the FINAL flag from all targets --- .../asm/mixin/transformer/MixinApplicatorStandard.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 70d7e2d9..9f43be95 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -464,8 +464,8 @@ class MixinApplicatorStandard { if (target != null) { Annotations.merge(shadow, target); - // Strip the FINAL flag from @Mutable non-private fields - if (entry.getValue().isDecoratedMutable() && !Bytecode.hasFlag(target, Opcodes.ACC_PRIVATE)) { + // Strip the FINAL flag from @Mutable fields + if (entry.getValue().isDecoratedMutable()) { target.access &= ~Opcodes.ACC_FINAL; } } From 8cdc32d1fa192259a3553c0a60f7d2a868c1dd5a Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sat, 4 Jan 2020 16:44:00 +0000 Subject: [PATCH 3/6] Support for Mutable on setter accessors for final fields, closes #378 --- .../org/spongepowered/asm/mixin/Mutable.java | 15 +++++++-- .../asm/mixin/gen/AccessorGenerator.java | 8 +++++ .../gen/AccessorGeneratorFieldSetter.java | 31 +++++++++++++++++++ .../asm/mixin/gen/AccessorInfo.java | 19 +++++++++++- .../asm/mixin/gen/InvokerInfo.java | 2 +- .../asm/mixin/struct/SpecialMethodInfo.java | 8 +++++ .../asm/mixin/transformer/ClassInfo.java | 10 +++--- .../mixin/transformer/MixinTargetContext.java | 11 +++++-- 8 files changed, 92 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/Mutable.java b/src/main/java/org/spongepowered/asm/mixin/Mutable.java index 0852426c..5d521592 100644 --- a/src/main/java/org/spongepowered/asm/mixin/Mutable.java +++ b/src/main/java/org/spongepowered/asm/mixin/Mutable.java @@ -29,11 +29,20 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.spongepowered.asm.mixin.gen.Accessor; + /** - * Use in conjunction with {@link Final} to indicate that whilst a field is - * final in the target class, mutation within the mixin is intentional. + * Use in conjunction with {@link Final} or {@link Accessor} to indicate that + * whilst a target field is final in the target class, mutation within the mixin + * is intentional. + * + *

Applying this annotation has the effect of removing the final + * modifier from the target field in order to avoid illegal access errors when a + * shadow visible outside the mixin class (eg. to derived or package-local + * mixins) is mutated. It also permits the mutation on Java runtimes which also + * check for mutation of private final variables (JRE 9 and later).

*/ -@Target(ElementType.FIELD) +@Target({ ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) public @interface Mutable { 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 68ae4294..e11bded5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGenerator.java +++ b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGenerator.java @@ -78,6 +78,14 @@ public abstract class AccessorGenerator { accessor.maxStack = maxStack; return accessor; } + + /** + * Perform pre-flight checks on the accessor, to ensure it can be generated + * sanely + */ + public void validate() { + // Stub for subclasses + } /** * Generate the accessor method diff --git a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorFieldSetter.java b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorFieldSetter.java index 9ba3cce5..cee3d330 100644 --- a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorFieldSetter.java +++ b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorFieldSetter.java @@ -24,26 +24,57 @@ */ package org.spongepowered.asm.mixin.gen; +import org.apache.logging.log4j.LogManager; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.FieldInsnNode; import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.VarInsnNode; +import org.spongepowered.asm.mixin.MixinEnvironment.Option; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.transformer.ClassInfo.Method; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +import org.spongepowered.asm.util.Bytecode; /** * Generator for field setters */ public class AccessorGeneratorFieldSetter extends AccessorGeneratorField { + /** + * True if the accessor method is decorated with {@link Mutable} + */ + private boolean mutable; + public AccessorGeneratorFieldSetter(AccessorInfo info) { super(info); } + + @Override + public void validate() { + super.validate(); + + Method method = this.info.getClassInfo().findMethod(this.info.getMethod()); + this.mutable = method.isDecoratedMutable(); + if (this.mutable || !Bytecode.hasFlag(this.targetField, Opcodes.ACC_FINAL)) { + return; + } + + if (this.info.getContext().getOption(Option.DEBUG_VERBOSE)) { + LogManager.getLogger("mixin").warn("{} for final field {}::{} is not @Mutable", this.info, + ((MixinTargetContext)this.info.getContext()).getTarget(), this.targetField.name); + } + } /* (non-Javadoc) * @see org.spongepowered.asm.mixin.gen.AccessorGenerator#generate() */ @Override public MethodNode generate() { + if (this.mutable) { + this.targetField.access &= ~Opcodes.ACC_FINAL; + } + int stackSpace = this.targetIsStatic ? 0 : 1; // Stack space for "this" int maxLocals = stackSpace + this.targetType.getSize(); int maxStack = stackSpace + this.targetType.getSize(); diff --git a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorInfo.java b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorInfo.java index d0f14737..fd650c01 100644 --- a/src/main/java/org/spongepowered/asm/mixin/gen/AccessorInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/gen/AccessorInfo.java @@ -282,6 +282,12 @@ public class AccessorInfo extends SpecialMethodInfo { */ protected MethodNode targetMethod; + /** + * Generator which will be responsible for actually generating the accessor + * method body + */ + protected AccessorGenerator generator; + public AccessorInfo(MixinTargetContext mixin, MethodNode method) { this(mixin, method, Accessor.class); } @@ -401,6 +407,8 @@ public class AccessorInfo extends SpecialMethodInfo { } return null; } + + /** * Get the inflected/specified target member for this accessor @@ -466,6 +474,15 @@ public class AccessorInfo extends SpecialMethodInfo { public void locate() { this.targetField = this.findTargetField(); } + + /** + * Called immediately after locate, initialises the generator for this + * accessor and runs validation. + */ + public void validate() { + this.generator = this.type.getGenerator(this); + this.generator.validate(); + } /** * Second pass, generate the actual accessor method for this accessor. The @@ -475,7 +492,7 @@ public class AccessorInfo extends SpecialMethodInfo { * @return generated accessor method */ public MethodNode generate() { - MethodNode generatedAccessor = this.type.getGenerator(this).generate(); + MethodNode generatedAccessor = this.generator.generate(); Annotations.merge(this.method, generatedAccessor); return generatedAccessor; } diff --git a/src/main/java/org/spongepowered/asm/mixin/gen/InvokerInfo.java b/src/main/java/org/spongepowered/asm/mixin/gen/InvokerInfo.java index 0671112d..cde243e7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/gen/InvokerInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/gen/InvokerInfo.java @@ -42,7 +42,7 @@ import org.spongepowered.asm.util.asm.ElementNode; */ class InvokerInfo extends AccessorInfo { - public InvokerInfo(MixinTargetContext mixin, MethodNode method) { + InvokerInfo(MixinTargetContext mixin, MethodNode method) { super(mixin, method, Invoker.class); } diff --git a/src/main/java/org/spongepowered/asm/mixin/struct/SpecialMethodInfo.java b/src/main/java/org/spongepowered/asm/mixin/struct/SpecialMethodInfo.java index 2a91ad0c..0ceea9bb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/struct/SpecialMethodInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/struct/SpecialMethodInfo.java @@ -29,6 +29,7 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; import org.spongepowered.asm.mixin.injection.IInjectionPointContext; import org.spongepowered.asm.mixin.refmap.IMixinContext; +import org.spongepowered.asm.mixin.transformer.ClassInfo; import org.spongepowered.asm.mixin.transformer.MixinTargetContext; import org.spongepowered.asm.util.Bytecode; import org.spongepowered.asm.util.asm.MethodNodeEx; @@ -105,6 +106,13 @@ public abstract class SpecialMethodInfo implements IInjectionPointContext { public final ClassNode getClassNode() { return this.classNode; } + + /** + * Get the class metadata for the mixin + */ + public final ClassInfo getClassInfo() { + return this.mixin.getClassInfo(); + } /** * Get method being called 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 c9519c60..8eb20a93 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -403,7 +403,7 @@ public final class ClassInfo { return this.decoratedMutable; } - public void setDecoratedFinal(boolean decoratedFinal, boolean decoratedMutable) { + protected void setDecoratedFinal(boolean decoratedFinal, boolean decoratedMutable) { this.decoratedFinal = decoratedFinal; this.decoratedMutable = decoratedMutable; } @@ -486,11 +486,8 @@ public final class ClassInfo { this.frames = member instanceof Method ? ((Method)member).frames : null; } - @SuppressWarnings("unchecked") public Method(MethodNode method) { this(method, false); - this.setUnique(Annotations.getVisible(method, Unique.class) != null); - this.isAccessor = Annotations.getSingleVisible(method, Accessor.class, Invoker.class) != null; } @SuppressWarnings("unchecked") @@ -499,6 +496,9 @@ public final class ClassInfo { this.frames = this.gatherFrames(method); this.setUnique(Annotations.getVisible(method, Unique.class) != null); this.isAccessor = Annotations.getSingleVisible(method, Accessor.class, Invoker.class) != null; + boolean decoratedFinal = Annotations.getVisible(method, Final.class) != null; + boolean decoratedMutable = Annotations.getVisible(method, Mutable.class) != null; + this.setDecoratedFinal(decoratedFinal, decoratedMutable); } public Method(String name, String desc) { @@ -606,7 +606,7 @@ public final class ClassInfo { /** * A field */ - class Field extends Member { + public class Field extends Member { public Field(Member member) { super(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 baf044df..c78022cb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -354,7 +354,7 @@ public class MixinTargetContext extends ClassContext implements IMixinContext { * @return the local class info */ @Override - ClassInfo getClassInfo() { + public ClassInfo getClassInfo() { return this.mixin.getClassInfo(); } @@ -559,7 +559,7 @@ public class MixinTargetContext extends ClassContext implements IMixinContext { if (methodRef.getOwner().equals(this.getClassRef())) { methodRef.setOwner(this.getTarget().getClassRef()); Method md = this.getClassInfo().findMethod(methodRef.getName(), methodRef.getDesc(), ClassInfo.INCLUDE_ALL); - if (md != null && md.isRenamed() && md.getOriginalName().equals(methodRef.getName()) && md.isSynthetic()) { + if (md != null && md.isRenamed() && md.getOriginalName().equals(methodRef.getName()) && (md.isSynthetic() || md.isConformed())) { methodRef.setName(md.getName()); } this.upgradeMethodRef(method, methodRef, md); @@ -1307,6 +1307,13 @@ public class MixinTargetContext extends ClassContext implements IMixinContext { accessor.locate(); } + accessorActivity.next("Validate"); + Activity validateActivity = this.activities.begin("?"); + for (AccessorInfo accessor : this.accessors) { + validateActivity.next(accessor.toString()); + accessor.validate(); + } + accessorActivity.next("Generate"); Activity generateActivity = this.activities.begin("?"); for (AccessorInfo accessor : this.accessors) { From bd4076714d55071e0e0fa4fd1fe3105f87afcd17 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 8 Jan 2020 21:20:04 +0000 Subject: [PATCH 4/6] Provide more useful info when mixin classload is prohibited, closes #376 --- .../asm/mixin/transformer/MixinConfig.java | 15 +++- .../asm/mixin/transformer/MixinInfo.java | 81 +++++++++++++++---- .../asm/mixin/transformer/MixinProcessor.java | 41 ++++++++-- .../throwables/IllegalClassLoadError.java | 46 +++++++++++ 4 files changed, 160 insertions(+), 23 deletions(-) create mode 100644 src/main/java/org/spongepowered/asm/mixin/transformer/throwables/IllegalClassLoadError.java 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 50d128fc..d62c4b24 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -55,6 +55,8 @@ import org.spongepowered.asm.service.MixinService; import org.spongepowered.asm.util.VersionNumber; import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList.Builder; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; @@ -904,8 +906,17 @@ final class MixinConfig implements Comparable, IMixinConfig { /** * Get the list of mixin classes we will be applying */ + @SuppressWarnings("unchecked") public List getClasses() { - return Collections.unmodifiableList(this.mixinClasses); + Builder list = ImmutableList.builder(); + for (List classes : new List[] { this.mixinClasses, this.mixinClassesClient, this.mixinClassesServer} ) { + if (classes != null) { + for (String className : classes) { + list.add(this.mixinPackage + className); + } + } + } + return list.build(); } /** @@ -975,7 +986,7 @@ final class MixinConfig implements Comparable, IMixinConfig { public boolean packageMatch(String className) { return className.startsWith(this.mixinPackage); } - + /** * Check whether this configuration bundle has a mixin for the specified * class 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 a7bd6bfa..f18b3dbb 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -84,6 +84,33 @@ import com.google.common.collect.Lists; */ class MixinInfo implements Comparable, IMixinInfo { + /** + * Class variant, used to determine subtype + */ + enum Variant { + + /** + * Standard mixin + */ + STANDARD, + + /** + * Interface mixin + */ + INTERFACE, + + /** + * Accessor mixin (interface mixin containing only accessors) + */ + ACCESSOR, + + /** + * Type proxy + */ + PROXY + + } + /** * A MethodNode in a mixin */ @@ -649,22 +676,17 @@ class MixinInfo implements Comparable, IMixinInfo { } static SubType getTypeFor(MixinInfo mixin) { - if (!mixin.getClassInfo().isInterface()) { - return new SubType.Standard(mixin); + Variant variant = MixinInfo.getVariant(mixin.getClassInfo()); + switch (variant) { + case STANDARD: + return new SubType.Standard(mixin); + case INTERFACE: + return new SubType.Interface(mixin); + case ACCESSOR: + return new SubType.Accessor(mixin); + default: + throw new IllegalStateException("Unsupported Mixin variant " + variant + " for " + mixin); } - - boolean containsNonAccessorMethod = false; - for (Method method : mixin.getClassInfo().getMethods()) { - containsNonAccessorMethod |= !method.isAccessor(); - } - - if (containsNonAccessorMethod) { - // If the mixin contains any other methods, treat it as a regular interface mixin - return new SubType.Interface(mixin); - } - - // The mixin contains no non-accessor methods, so we can treat it as an accessor - return new SubType.Accessor(mixin); } } @@ -853,7 +875,7 @@ class MixinInfo implements Comparable, IMixinInfo { throw new InvalidMixinException(this, ex); } } - + /** * Parse the declared targets from the annotation into ClassInfo instances * and perform initial validation of each target @@ -1346,4 +1368,31 @@ class MixinInfo implements Comparable, IMixinInfo { return String.format("%s:%s", this.parent.getName(), this.name); } + static Variant getVariant(ClassNode classNode) { + return MixinInfo.getVariant(ClassInfo.fromClassNode(classNode)); + } + + static Variant getVariant(ClassInfo classInfo) { +// if (ProxyInfo.isProxy(classInfo)) { +// return Variant.PROXY; +// } + + if (!classInfo.isInterface()) { + return Variant.STANDARD; + } + + boolean containsNonAccessorMethod = false; + for (Method method : classInfo.getMethods()) { + containsNonAccessorMethod |= (!method.isAccessor() && !method.isSynthetic()); + } + + if (containsNonAccessorMethod) { + // If the mixin contains any other methods, treat it as a regular interface mixin + return Variant.INTERFACE; + } + + // The mixin contains no non-accessor methods, so we can treat it as an accessor + return Variant.ACCESSOR; + } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java index 0fa0dbb9..faed74e1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinProcessor.java @@ -30,7 +30,9 @@ import java.util.*; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Option; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; @@ -45,17 +47,20 @@ 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.transformer.MixinConfig.IListener; +import org.spongepowered.asm.mixin.transformer.MixinInfo.Variant; import org.spongepowered.asm.mixin.transformer.ext.Extensions; import org.spongepowered.asm.mixin.transformer.ext.IHotSwap; import org.spongepowered.asm.mixin.transformer.ext.extensions.ExtensionCheckClass.ValidationFailedException; import org.spongepowered.asm.mixin.transformer.ext.extensions.ExtensionClassExporter; import org.spongepowered.asm.mixin.transformer.meta.MixinMerged; +import org.spongepowered.asm.mixin.transformer.throwables.IllegalClassLoadError; import org.spongepowered.asm.mixin.transformer.throwables.InvalidMixinException; import org.spongepowered.asm.mixin.transformer.throwables.MixinTransformerError; import org.spongepowered.asm.mixin.transformer.throwables.ReEntrantTransformerError; import org.spongepowered.asm.service.IMixinAuditTrail; import org.spongepowered.asm.service.IMixinService; import org.spongepowered.asm.service.MixinService; +import org.spongepowered.asm.util.Annotations; import org.spongepowered.asm.util.PrettyPrinter; import org.spongepowered.asm.util.ReEntranceLock; import org.spongepowered.asm.util.perf.Profiler; @@ -300,11 +305,14 @@ public class MixinProcessor { } SortedSet mixins = null; - boolean invalidRef = false; + MixinConfig packageOwnedByConfig = null; for (MixinConfig config : this.configs) { if (config.packageMatch(name)) { - invalidRef = true; + int packageLen = packageOwnedByConfig != null ? packageOwnedByConfig.getMixinPackage().length() : 0; + if (config.getMixinPackage().length() > packageLen) { + packageOwnedByConfig = config; + } continue; } @@ -318,12 +326,11 @@ public class MixinProcessor { } } - if (invalidRef) { - throw new NoClassDefFoundError(String.format("%s is a mixin class and cannot be referenced directly", name)); + if (packageOwnedByConfig != null) { + throw new IllegalClassLoadError(this.getInvalidClassError(name, targetClassNode, packageOwnedByConfig)); } 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) { ReEntrantTransformerError error = new ReEntrantTransformerError("Re-entrance error."); @@ -361,6 +368,30 @@ public class MixinProcessor { } return success; } + + private String getInvalidClassError(String name, ClassNode targetClassNode, MixinConfig ownedByConfig) { + if (ownedByConfig.getClasses().contains(name)) { + return String.format("Illegal classload request for %s. Mixin is defined in %s and cannot be referenced directly", name, ownedByConfig); + } + +// AnnotationNode shadow = Annotations.getInvisible(targetClassNode, Shadow.class); +// if (shadow != null) { +// return String.format("Illegal classload request for UNRESOLVED @Shadow %s. " +// + "The proxy was referenced outside a mixin or the mixin processor encountered an internal error.", name); +// } + + AnnotationNode mixin = Annotations.getInvisible(targetClassNode, Mixin.class); + if (mixin != null) { + Variant variant = MixinInfo.getVariant(targetClassNode); + if (variant == Variant.ACCESSOR) { + return String.format("Illegal classload request for accessor mixin %s. The mixin is missing from %s which owns " + + "package %s* and the mixin has not been applied.", name, ownedByConfig, ownedByConfig.getMixinPackage()); + } + } + + return String.format("%s is in a defined mixin package %s* owned by %s and cannot be referenced directly", + name, ownedByConfig.getMixinPackage(), ownedByConfig); + } /** * Update a mixin class with new bytecode. diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/IllegalClassLoadError.java b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/IllegalClassLoadError.java new file mode 100644 index 00000000..a7934b91 --- /dev/null +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/throwables/IllegalClassLoadError.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.transformer.throwables; + +/** + * Error thrown when a class defined in a mixin package is classloaded + */ +public class IllegalClassLoadError extends MixinTransformerError { + + private static final long serialVersionUID = 1L; + + public IllegalClassLoadError(String message) { + super(message); + } + + public IllegalClassLoadError(Throwable cause) { + super(cause); + } + + public IllegalClassLoadError(String message, Throwable cause) { + super(message, cause); + } + +} From c338f0c7a4586535678e2a02a19e5e1b35e3eb02 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 10 Jan 2020 18:08:17 +0000 Subject: [PATCH 5/6] Update build with POM exclusions for older builds and maven repo switch --- build.gradle | 37 ++++++++++++++++--- .../asm/mixin/transformer/MixinConfig.java | 2 +- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index b923cde9..91a8252b 100644 --- a/build.gradle +++ b/build.gradle @@ -107,8 +107,8 @@ dependencies { def guava = 'com.google.guava:guava:21.0' // from mc1.12 onwards def log4j2 = 'org.apache.logging.log4j:log4j-core:2.0-beta9' - implementation guava - implementation log4j2 + 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" @@ -357,15 +357,28 @@ artifacts { archives javadocJar } +ext.excludePomDeps = [ + 'asm-tree', + 'asm-commons', + 'asm-util', + 'log4j-core', + 'guava', + 'gson', +] + uploadArchives { repositories { mavenDeployer { configuration = configurations.deployerJars - if (project.hasProperty("spongeRepo")) { - repository(url: project.spongeRepo) { - authentication(userName: project.spongeUsername, password: project.spongePassword) + if (buildType == 'RELEASE' && project.hasProperty("releaseRepo")) { + repository(url: project.releaseRepo) { + authentication(userName: project.releaseRepoUsername, password: project.releaseRepoPassword) + } + } else if (buildType == 'SNAPSHOT' && project.hasProperty("snapshotRepo")) { + repository(url: project.snapshotRepo) { + authentication(userName: project.snapshotRepoUsername, password: project.snapshotRepoPassword) } } @@ -398,7 +411,21 @@ uploadArchives { } } } + whenConfigured { + dependencies = dependencies.findAll { + !it.artifactId.matches(excludePomDeps.join('|')) + } + } } } } } + +install.repositories.mavenInstaller.pom { + whenConfigured { + dependencies = dependencies.findAll { + !it.artifactId.matches(excludePomDeps.join('|')) + } + } +} + \ No newline at end of file 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 d62c4b24..b178d87c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -906,7 +906,7 @@ final class MixinConfig implements Comparable, IMixinConfig { /** * Get the list of mixin classes we will be applying */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public List getClasses() { Builder list = ImmutableList.builder(); for (List classes : new List[] { this.mixinClasses, this.mixinClassesClient, this.mixinClassesServer} ) { From 6f6cee9674208bd2958d7b8417e1b38eddb2d09d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 10 Jan 2020 20:56:46 +0000 Subject: [PATCH 6/6] Mixin 0.8 RELEASE --- build.gradle | 106 ++++++++++++++++++++++++---------------------- gradle.properties | 2 +- 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index 91a8252b..0e644554 100644 --- a/build.gradle +++ b/build.gradle @@ -366,66 +366,70 @@ ext.excludePomDeps = [ 'gson', ] -uploadArchives { - repositories { +ext.mavenPom = { + groupId = project.group + version = project.version + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging project.packaging + description project.projectName + url 'http://www.spongepowered.org/' - mavenDeployer { - configuration = configurations.deployerJars + scm { + url 'https://github.com/SpongePowered/Mixin' + connection 'scm:git:git://github.com/SpongePowered/Mixin.git' + developerConnection 'scm:git:git@github.com:SpongePowered/Mixin.git' + } - if (buildType == 'RELEASE' && project.hasProperty("releaseRepo")) { - repository(url: project.releaseRepo) { - authentication(userName: project.releaseRepoUsername, password: project.releaseRepoPassword) - } - } else if (buildType == 'SNAPSHOT' && project.hasProperty("snapshotRepo")) { - repository(url: project.snapshotRepo) { - authentication(userName: project.snapshotRepoUsername, password: project.snapshotRepoPassword) - } - } + issueManagement { + system 'GitHub Issues' + url 'https://github.com/SpongePowered/Mixin/issues' + } - pom { - groupId = project.group - version = project.version - artifactId = project.archivesBaseName - project { - name project.archivesBaseName - packaging project.packaging - description project.projectName - url 'http://www.spongepowered.org/' - - scm { - url 'https://github.com/SpongePowered/Mixin' - connection 'scm:git:git://github.com/SpongePowered/Mixin.git' - developerConnection 'scm:git:git@github.com:SpongePowered/Mixin.git' - } - - issueManagement { - system 'GitHub Issues' - url 'https://github.com/SpongePowered/Mixin/issues' - } - - licenses { - license { - name 'MIT license' - url 'http://opensource.org/licenses/MIT' - distribution 'repo' - } - } - } - whenConfigured { - dependencies = dependencies.findAll { - !it.artifactId.matches(excludePomDeps.join('|')) - } - } + licenses { + license { + name 'MIT license' + url 'http://opensource.org/licenses/MIT' + distribution 'repo' } } } -} - -install.repositories.mavenInstaller.pom { whenConfigured { dependencies = dependencies.findAll { !it.artifactId.matches(excludePomDeps.join('|')) } } } - \ No newline at end of file + +uploadArchives { + repositories { + // Push releases to release repo + if (buildType == 'RELEASE' && project.hasProperty("releaseRepo")) { + mavenDeployer { + name = "release" + configuration = configurations.deployerJars + pom mavenPom + repository(url: project.releaseRepo) { + authentication(userName: project.releaseRepoUsername, password: project.releaseRepoPassword) + } + } + } + + // Push everything to sponge repo + if (project.hasProperty("spongeRepo")) { + mavenDeployer { + name = "sponge" + configuration = configurations.deployerJars + pom mavenPom + repository(url: project.spongeRepo) { + authentication(userName: project.spongeUsername, password: project.spongePassword) + } + } + } + } +} + +install.repositories.mavenInstaller { + pom mavenPom +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fa2b8b0e..c8bf6003 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ description=Mixin url=https://www.spongepowered.org organization=SpongePowered buildVersion=0.8 -buildType=SNAPSHOT +buildType=RELEASE asmVersion=6.2 legacyForgeAsmVersion=5.0.3 modlauncherAsmVersion=6.2