From ed00253bdaac88fbc06d216a5059f115a9668eb7 Mon Sep 17 00:00:00 2001 From: Chocohead Date: Wed, 8 Sep 2021 12:39:11 +0100 Subject: [PATCH] Fix annotating fields with @Unique (#64) * Fix annotating fields with unique Whilst other mixins are taken into account for making methods unique, fields previously did not * Still compiling to Java 6 --- .../transformer/MixinApplicatorStandard.java | 1 + .../MixinPreProcessorStandard.java | 2 + .../mixin/transformer/MixinTargetContext.java | 21 ++++++++- .../mixin/transformer/TargetClassContext.java | 44 ++++++++++++++++++- 4 files changed, 66 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 8251b25b..8d4d92c8 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -487,6 +487,7 @@ class MixinApplicatorStandard { if (target == null) { // This is just a local field, so add it this.targetClass.fields.add(field); + mixin.fieldMerged(field); if (field.signature != null) { if (this.mergeSignatures) { 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 639501cd..b26a36db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -615,6 +615,7 @@ class MixinPreProcessorStandard { FieldNode target = context.findField(mixinField, shadow); if (target == null) { if (shadow == null) { + context.addMixinField(mixinField); continue; } target = context.findRemappedField(mixinField); @@ -638,6 +639,7 @@ class MixinPreProcessorStandard { MixinPreProcessorStandard.logger.log(this.mixin.getLoggingLevel(), "Renaming @Unique field {}{} to {} in {}", mixinField.name, mixinField.desc, uniqueName, this.mixin); mixinField.name = field.renameTo(uniqueName); + context.addMixinField(mixinField); continue; } 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 1f4a91ad..809595c3 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -256,6 +256,25 @@ public class MixinTargetContext extends ClassContext implements IMixinContext { "sessionId", this.sessionId); } + void addMixinField(FieldNode field) { + Annotations.setVisible(field, MixinMerged.class, "mixin", this.getClassName()); + this.getTarget().addMixinField(field); + } + + /** + * Callback from the applicator which notifies us that a field was merged + * + * @param field merged field + */ + void fieldMerged(FieldNode field) { + this.getTarget().fieldMerged(field); + + Annotations.setVisible(field, MixinMerged.class, + "mixin", this.getClassName(), + "priority", this.getPriority(), + "sessionId", this.sessionId); + } + /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -1046,7 +1065,7 @@ public class MixinTargetContext extends ClassContext implements IMixinContext { } } - return this.getTarget().findAliasedField(aliases, field.desc); + return this.getTarget().findField(aliases, field.desc); } FieldNode findRemappedField(FieldNode field) { 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 29e57244..1e3b32ff 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TargetClassContext.java @@ -127,6 +127,13 @@ final class TargetClassContext extends ClassContext implements ITargetClassConte */ private final Set mixinMethods = new HashSet(); + /** + * Information about fields which have been discovered by mixin + * preprocessors in this pass but which have not yet been merged into the + * target class. + */ + private final Set mixinFields = new HashSet(); + /** * Exceptions which were suppressed during mixin application because they * were raised by an optional mixin @@ -278,6 +285,21 @@ final class TargetClassContext extends ClassContext implements ITargetClassConte } } + /** + * Add the specified field to the pending mixin fields set + * + * @param field field to add + */ + void addMixinField(FieldNode field) { + this.mixinFields.add(field); + } + + void fieldMerged(FieldNode field) { + if (!this.mixinFields.remove(field)) { + TargetClassContext.logger.debug("Unexpected: Merged unregistered field {} {} in {}", field.desc, field.name, this); + } + } + MethodNode findMethod(Deque aliases, String desc) { return this.findAliasedMethod(aliases, desc, true); } @@ -309,6 +331,10 @@ final class TargetClassContext extends ClassContext implements ITargetClassConte return this.findAliasedMethod(aliases, desc); } + FieldNode findField(Deque aliases, String desc) { + return this.findAliasedField(aliases, desc, true); + } + /** * Finds a field in the target class * @@ -317,6 +343,10 @@ final class TargetClassContext extends ClassContext implements ITargetClassConte * @return Target field or null if not found */ FieldNode findAliasedField(Deque aliases, String desc) { + return this.findAliasedField(aliases, desc, false); + } + + private FieldNode findAliasedField(Deque aliases, String desc, boolean includeMixinFields) { String alias = aliases.poll(); if (alias == null) { return null; @@ -328,7 +358,15 @@ final class TargetClassContext extends ClassContext implements ITargetClassConte } } - return this.findAliasedField(aliases, desc); + if (includeMixinFields) { + for (FieldNode target : this.mixinFields) { + if (target.name.equals(alias) && target.desc.equals(desc)) { + return target; + } + } + } + + return this.findAliasedField(aliases, desc, includeMixinFields); } /** @@ -417,6 +455,10 @@ final class TargetClassContext extends ClassContext implements ITargetClassConte TargetClassContext.logger.debug("Unexpected: Registered method {}{} in {} was not merged", method.name, method.desc, this); } } + + for (FieldNode field : this.mixinFields) { + TargetClassContext.logger.debug("Unexpected: Registered field {} {} in {} was not merged", field.desc, field.name, this); + } } /**