From d2d1fbc6f4e7193a778887bb6a95aba4bad07dd3 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 12 May 2024 18:55:59 +0100 Subject: [PATCH] Move staticness check for mixin field after unique check, closes #576 --- .../mixin/transformer/MixinPreProcessorStandard.java | 10 +++++----- 1 file changed, 5 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 0a34097d..5478643c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -633,11 +633,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); @@ -659,6 +654,11 @@ class MixinPreProcessorStandard { continue; } + 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)); + } + // Check that the shadow field has a matching descriptor if (!target.desc.equals(mixinField.desc)) { throw new InvalidMixinException(this.mixin, String.format("The field %s in the target class has a conflicting signature",