From 6aee1957e4e1576b8854794669f7916e71b9832d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 18 Jul 2017 13:42:16 +0100 Subject: [PATCH] Fix up some debug wiring for method merged state --- .../mixin/transformer/MixinApplicatorStandard.java | 1 + .../asm/mixin/transformer/MixinConfig.java | 4 ++++ .../mixin/transformer/MixinPreProcessorStandard.java | 11 +++++++---- 3 files changed, 12 insertions(+), 4 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 0e5fc5c8..f8c4aac7 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorStandard.java @@ -438,6 +438,7 @@ class MixinApplicatorStandard { AnnotationNode intrinsic = Annotations.getInvisible(method, Intrinsic.class); if (intrinsic != null) { if (this.mergeIntrinsic(mixin, method, isOverwrite, target, intrinsic)) { + mixin.getTarget().methodMerged(method); return; } } else { 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 6bff6c3a..f9e59358 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -394,6 +394,10 @@ final class MixinConfig implements Comparable, IMixinConfig { } private boolean checkVersion() throws MixinInitialisationError { + if (this.version == null) { + this.logger.error("Mixin config {} does not specify \"minVersion\" property", this.name); + } + VersionNumber minVersion = VersionNumber.parse(this.version); VersionNumber curVersion = VersionNumber.parse(this.env.getVersion()); if (minVersion.compareTo(curVersion) > 0) { 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 06ba937d..b10e912a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java @@ -274,11 +274,11 @@ class MixinPreProcessorStandard { } if (this.attachOverwriteMethod(context, mixinMethod)) { + context.addMixinMethod(mixinMethod); continue; } if (this.attachUniqueMethod(context, mixinMethod)) { - context.addMixinMethod(mixinMethod); iter.remove(); continue; } @@ -471,6 +471,7 @@ class MixinPreProcessorStandard { Bytecode.compareBridgeMethods(target, mixinMethod); MixinPreProcessorStandard.logger.debug("Discarding sythetic bridge method {} in {} because existing method in {} is compatible", type, mixinMethod.name, this.mixin, context.getTarget()); + return true; } catch (SyntheticBridgeException ex) { if (this.verboseLogging || this.env.getOption(Option.DEBUG_VERIFY)) { // Show analysis if debug options are active, implying we're in a dev environment @@ -478,12 +479,14 @@ class MixinPreProcessorStandard { } throw new InvalidMixinException(this.mixin, ex.getMessage()); } - } else { - MixinPreProcessorStandard.logger.warn("Discarding {} public method {} in {} because it already exists in {}", type, mixinMethod.name, - this.mixin, context.getTarget()); } + + MixinPreProcessorStandard.logger.warn("Discarding {} public method {} in {} because it already exists in {}", type, mixinMethod.name, + this.mixin, context.getTarget()); + return true; } + context.addMixinMethod(mixinMethod); return true; }