From 34dab7d1d57d02fcd1bf59f0d2235ea035e1b4b2 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 25 Nov 2015 00:41:45 +0000 Subject: [PATCH] Validate against raw types when validating super because mirror sucks --- .../org/spongepowered/tools/MirrorUtils.java | 17 +++++++++++++++++ .../obfuscation/validation/TargetValidator.java | 9 +++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/MirrorUtils.java b/src/ap/java/org/spongepowered/tools/MirrorUtils.java index fff3cf40..937d2b01 100644 --- a/src/ap/java/org/spongepowered/tools/MirrorUtils.java +++ b/src/ap/java/org/spongepowered/tools/MirrorUtils.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; @@ -204,4 +205,20 @@ public abstract class MirrorUtils { } return reference.toString(); } + + public static boolean isAssignable(ProcessingEnvironment processingEnv, TypeMirror targetType, TypeMirror superClass) { + boolean assignable = processingEnv.getTypeUtils().isAssignable(targetType, superClass); + if (!assignable && targetType instanceof DeclaredType && superClass instanceof DeclaredType) { + TypeMirror rawTargetType = MirrorUtils.toRawType(processingEnv, (DeclaredType)targetType); + TypeMirror rawSuperType = MirrorUtils.toRawType(processingEnv, (DeclaredType)superClass); + return processingEnv.getTypeUtils().isAssignable(rawTargetType, rawSuperType); + } + + return assignable; + } + + private static TypeMirror toRawType(ProcessingEnvironment processingEnv, DeclaredType targetType) { + return processingEnv.getElementUtils().getTypeElement(((TypeElement)targetType.asElement()).getQualifiedName()).asType(); + } + } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java index 06bb658e..3fc429fd 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/validation/TargetValidator.java @@ -34,6 +34,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; +import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.IOptionProvider; import org.spongepowered.tools.obfuscation.MixinValidator; import org.spongepowered.tools.obfuscation.TypeHandle; @@ -79,7 +80,7 @@ public class TargetValidator extends MixinValidator { } private boolean validateSuperClass(TypeMirror targetType, TypeMirror superClass) { - if (this.isAssignable(targetType, superClass)) { + if (MirrorUtils.isAssignable(this.processingEnv, targetType, superClass)) { return true; } @@ -106,15 +107,11 @@ public class TargetValidator extends MixinValidator { private boolean checkMixinsFor(TypeMirror targetType, TypeMirror superClass) { for (TypeMirror mixinType : this.getMixinsTargeting(targetType)) { - if (this.isAssignable(mixinType, superClass)) { + if (MirrorUtils.isAssignable(this.processingEnv, mixinType, superClass)) { return true; } } return false; } - - protected final boolean isAssignable(TypeMirror targetType, TypeMirror superClass) { - return this.processingEnv.getTypeUtils().isAssignable(targetType, superClass); - } }