Always conform synthetic methods, even if no immediate conflict detected

This commit is contained in:
Mumfrey committed 2019-12-13 17:25:51 +00:00
1 parent a5d9b4e512
commit e72808fd95
2 files changed
+18 -5

No files matched your search

@@ -33,6 +33,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.launch.GlobalProperties;
@@ -1003,7 +1004,14 @@ public final class MixinEnvironment implements ITokenProvider {
return "Unknown";
}
}
/**
* Get logging level info/debug based on verbose setting
*/
private Level getVerboseLoggingLevel() {
return this.getOption(Option.DEBUG_VERBOSE) ? Level.INFO : Level.DEBUG;
}
/**
* Get the phase for this environment
*
@@ -1081,7 +1089,7 @@ public final class MixinEnvironment implements ITokenProvider {
if (provider != null && !this.tokenProviderClasses.contains(provider.getClass().getName())) {
String providerName = provider.getClass().getName();
TokenProviderWrapper wrapper = new TokenProviderWrapper(provider, this);
MixinEnvironment.logger.info("Adding new token provider {} to {}", providerName, this);
MixinEnvironment.logger.log(this.getVerboseLoggingLevel(), "Adding new token provider {} to {}", providerName, this);
this.tokenProviders.add(wrapper);
this.tokenProviderClasses.add(providerName);
Collections.sort(this.tokenProviders);
@@ -506,17 +506,18 @@ class MixinPreProcessorStandard {
return false;
}
if (method.isSynthetic()) {
boolean synthetic = method.isSynthetic();
if (synthetic) {
context.transformDescriptor(mixinMethod);
method.remapTo(mixinMethod.desc);
}
MethodNode target = context.findMethod(mixinMethod, null);
if (target == null) {
if (target == null && !synthetic) {
return false;
}
String type = method.isSynthetic() ? "synthetic" : "@Unique";
String type = synthetic ? "synthetic" : "@Unique";
if (Bytecode.getVisibility(mixinMethod).ordinal() < Visibility.PUBLIC.ordinal()) {
if (method.isConformed()) {
@@ -530,6 +531,10 @@ class MixinPreProcessorStandard {
return false;
}
if (target == null) {
return false;
}
if (this.strictUnique) {
throw new InvalidMixinException(this.mixin, String.format("Method conflict, %s method %s in %s cannot overwrite %s%s in %s",
type, mixinMethod.name, this.mixin, target.name, target.desc, context.getTarget()));