From e2c9aa449ce241f46aca77d6a3cb81056e2ddd4e Mon Sep 17 00:00:00 2001 From: Chocohead Date: Mon, 13 Feb 2023 16:15:56 +0100 Subject: [PATCH] Fix unique fields conflicting where they shouldn't (#92) * Fix unique fields crashing when staticness mismatches an existing field Fixes SpongePowered/Mixin#576 * Fix mismatching mixin fields silently being dropped Allowing them to be included will throw a VerifyError --- .../transformer/MixinPreProcessorStandard.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 b26a36db..e839903f 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -628,11 +628,6 @@ class MixinPreProcessorStandard { mixinField.name = field.renameTo(target.name); } - if (!Bytecode.compareFlags(mixinField, target, Opcodes.ACC_STATIC)) { - throw new InvalidMixinException(this.mixin, String.format("STATIC modifier of @Shadow field %s in %s does not match the target", - mixinField.name, this.mixin)); - } - if (field.isUnique()) { if ((mixinField.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) != 0) { String uniqueName = context.getUniqueName(mixinField); @@ -653,6 +648,14 @@ class MixinPreProcessorStandard { iter.remove(); continue; + } else if (!Bytecode.compareFlags(mixinField, target, Opcodes.ACC_STATIC)) { + if (isShadow) { + throw new InvalidMixinException(this.mixin, String.format("STATIC modifier of @Shadow field %s in %s does not match the target", + mixinField.name, this.mixin)); + } else { + throw new InvalidMixinException(this.mixin, String.format("Field %s in %s conflicts with %sstatic field in the target (%s)", + mixinField.name, mixin, Bytecode.isStatic(target) ? "" : "non-", context.getTarget())); + } } // Check that the shadow field has a matching descriptor