AP: Fix several cases of ASM TypeHandles breaking code that relies on Mirror.

(cherry picked from commit e5d9db491a)
This commit is contained in:
LlamaLad7 committed 2023-08-12 17:38:42 +01:00
1 parent 89acb8387a
commit 1cec8b1377
11 files changed
+110 -104

No files matched your search

@@ -176,7 +176,7 @@ class AnnotatedMixin implements IMixinContext, IAnnotatedElement {
this.mappings = this.obf.createMappingConsumer();
this.messager = ap;
this.mixin = type;
this.handle = new TypeHandle(type);
this.handle = new TypeHandle(type, ap.getTypeProvider());
this.methods = new ArrayList<MethodHandle>(this.handle.getMethods());
this.virtual = this.handle.getAnnotation(Pseudo.class).exists();
this.annotation = this.handle.getAnnotation(Mixin.class);
@@ -77,7 +77,7 @@ class AnnotatedMixinElementHandlerSoftImplements extends AnnotatedMixinElementHa
}
try {
TypeHandle iface = new TypeHandle(interfaceAnnotation.<DeclaredType>getValue("iface"));
TypeHandle iface = this.ap.getTypeProvider().getTypeHandle(interfaceAnnotation.<DeclaredType>getValue("iface"));
String prefix = interfaceAnnotation.<String>getValue("prefix");
this.processSoftImplements(remap, iface, prefix);
} catch (Exception ex) {
@@ -371,17 +371,13 @@ final class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider
return this.mixins.get(mixinType);
}
public Collection<TypeMirror> getMixinsTargeting(TypeMirror targetType) {
return this.getMixinsTargeting((TypeElement)((DeclaredType)targetType).asElement());
}
public Collection<TypeMirror> getMixinsTargeting(TypeElement targetType) {
List<TypeMirror> minions = new ArrayList<TypeMirror>();
public Collection<TypeHandle> getMixinsTargeting(TypeHandle targetType) {
List<TypeHandle> minions = new ArrayList<TypeHandle>();
for (TypeReference mixin : this.targets.getMixinsTargeting(targetType)) {
TypeHandle handle = mixin.getHandle(this.processingEnv);
if (handle != null && handle.hasTypeMirror()) {
minions.add(handle.getTypeMirror());
TypeHandle handle = mixin.getHandle(this);
if (handle != null) {
minions.add(handle);
}
}
@@ -710,7 +706,7 @@ final class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider
TypeElement element = this.getTypeElement(name, elements);
if (element != null) {
try {
return new TypeHandle(element);
return new TypeHandle(element, this);
} catch (NullPointerException ex) {
// probably bad package
}
@@ -718,7 +714,7 @@ final class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider
if (pkg != null) {
// Couldn't resolve the class, but could resolve the package, so just return an imaginary handle.
return new TypeHandle(pkg, name);
return new TypeHandle(pkg, name, this);
}
// Couldn't even resolve the package, all hope is lost.
@@ -816,11 +812,11 @@ final class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider
String pkg = name.substring(0, lastDotPos);
PackageElement packageElement = this.processingEnv.getElementUtils().getPackageElement(pkg);
if (packageElement != null) {
return new TypeHandleSimulated(packageElement, name, simulatedTarget);
return new TypeHandleSimulated(packageElement, name, simulatedTarget, this);
}
}
return new TypeHandleSimulated(name, simulatedTarget);
return new TypeHandleSimulated(name, simulatedTarget, this);
}
/* (non-Javadoc)
@@ -28,13 +28,13 @@ import java.util.Collection;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import org.spongepowered.asm.util.asm.IAnnotationHandle;
import org.spongepowered.tools.obfuscation.interfaces.IMessagerSuppressible;
import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor;
import org.spongepowered.tools.obfuscation.interfaces.IMixinValidator;
import org.spongepowered.tools.obfuscation.interfaces.IOptionProvider;
import org.spongepowered.tools.obfuscation.interfaces.ITypeHandleProvider;
import org.spongepowered.tools.obfuscation.mirror.TypeHandle;
/**
@@ -57,7 +57,12 @@ public abstract class MixinValidator implements IMixinValidator {
* Option provider
*/
protected final IOptionProvider options;
/**
* Type handle provider
*/
protected final ITypeHandleProvider typeHandleProvider;
/**
* Pass to run this validator in
*/
@@ -73,6 +78,7 @@ public abstract class MixinValidator implements IMixinValidator {
this.processingEnv = ap.getProcessingEnvironment();
this.messager = ap;
this.options = ap;
this.typeHandleProvider = ap.getTypeProvider();
this.pass = pass;
}
@@ -94,7 +100,7 @@ public abstract class MixinValidator implements IMixinValidator {
protected abstract boolean validate(TypeElement mixin, IAnnotationHandle annotation, Collection<TypeHandle> targets);
protected final Collection<TypeMirror> getMixinsTargeting(TypeMirror targetType) {
protected final Collection<TypeHandle> getMixinsTargeting(TypeHandle targetType) {
return AnnotatedMixins.getMixinsForEnvironment(this.processingEnv).getMixinsTargeting(targetType);
}
}
@@ -196,13 +196,13 @@ public abstract class ObfuscationEnvironment implements IObfuscationEnvironment
}
// See if we can get the superclass from the reference
TypeMirror superClass = type.getElement().getSuperclass();
if (superClass.getKind() != TypeKind.DECLARED) {
TypeHandle superClass = type.getSuperclass();
if (superClass == null) {
return null;
}
// Well we found it, let's inflect the class name and recurse the search
String superClassName = ((TypeElement)((DeclaredType)superClass).asElement()).getQualifiedName().toString();
String superClassName = superClass.getSimpleName();
return this.getObfMethod(method.move(superClassName.replace('.', '/')));
}
@@ -132,16 +132,6 @@ public final class TargetMap extends HashMap<TypeReference, Set<TypeReference>>
Set<TypeReference> mixins = this.getMixinsFor(target);
mixins.add(mixin);
}
/**
* Get mixin classes which target the specified class
*
* @param target Target class
* @return Collection of mixins registered as targetting the specified class
*/
Collection<TypeReference> getMixinsTargeting(TypeElement target) {
return this.getMixinsTargeting(new TypeHandle(target));
}
/**
* Get mixin classes which target the specified class
@@ -44,6 +44,7 @@ import org.spongepowered.asm.mixin.injection.selectors.ITargetSelectorByName;
import org.spongepowered.asm.obfuscation.mapping.common.MappingMethod;
import org.spongepowered.asm.util.Bytecode;
import org.spongepowered.asm.util.asm.IAnnotationHandle;
import org.spongepowered.tools.obfuscation.interfaces.ITypeHandleProvider;
import org.spongepowered.tools.obfuscation.mirror.mapping.MappingMethodResolvable;
import com.google.common.collect.ImmutableList;
@@ -71,6 +72,12 @@ public class TypeHandle {
* Actual type element, this is null for inaccessible classes
*/
private final TypeElement element;
/**
* Type handle provider, we need this since we have to resolve type handles
* for related classes (eg. superclass) without using mirror
*/
protected final ITypeHandleProvider typeProvider;
/**
* Reference to this handle, for serialisation
@@ -84,10 +91,11 @@ public class TypeHandle {
* @param pkg Package
* @param name FQ class name
*/
public TypeHandle(PackageElement pkg, String name) {
public TypeHandle(PackageElement pkg, String name, ITypeHandleProvider typeProvider) {
this.name = name.replace('.', '/');
this.pkg = pkg;
this.element = null;
this.typeProvider = typeProvider;
}
/**
@@ -95,10 +103,11 @@ public class TypeHandle {
*
* @param element ze element
*/
public TypeHandle(TypeElement element) {
public TypeHandle(TypeElement element, ITypeHandleProvider typeProvider) {
this.pkg = TypeUtils.getPackage(element);
this.name = TypeUtils.getInternalName(element);
this.element = element;
this.typeProvider = typeProvider;
}
/**
@@ -106,8 +115,8 @@ public class TypeHandle {
*
* @param type type
*/
public TypeHandle(DeclaredType type) {
this((TypeElement)type.asElement());
public TypeHandle(DeclaredType type, ITypeHandleProvider typeProvider) {
this((TypeElement)type.asElement(), typeProvider);
}
/* (non-Javadoc)
@@ -215,7 +224,7 @@ public class TypeHandle {
return null;
}
return new TypeHandle((DeclaredType)superClass);
return typeProvider.getTypeHandle(superClass);
}
/**
@@ -228,7 +237,7 @@ public class TypeHandle {
Builder<TypeHandle> list = ImmutableList.<TypeHandle>builder();
for (TypeMirror iface : this.getTargetElement().getInterfaces()) {
list.add(new TypeHandle((DeclaredType)iface));
list.add(typeProvider.getTypeHandle(iface));
}
return list.build();
}
@@ -275,6 +284,34 @@ public class TypeHandle {
public boolean isSimulated() {
return false;
}
/**
* Gets whether this handle definitely does not represent an interface
*/
public boolean isNotInterface() {
TypeElement target = this.getTargetElement();
return target != null && !target.getKind().isInterface();
}
/**
* Gets whether this handle is the same as or a supertype of the other handle
*/
public boolean isAssignableFrom(TypeHandle other) {
if (this.getName().equals(other.getName())) {
return true;
}
List<TypeHandle> superTypes = new ArrayList<>();
if (other.getSuperclass() != null) {
superTypes.add(other.getSuperclass());
}
superTypes.addAll(other.getInterfaces());
for (TypeHandle superType : superTypes) {
if (this.isAssignableFrom(superType)) {
return true;
}
}
return false;
}
/**
* Get the TypeReference for this type, used for serialisation
@@ -76,12 +76,6 @@ public class TypeHandleASM extends TypeHandle {
* ClassNode used for accessing information when not accessible via mirror
*/
private final ClassNode classNode;
/**
* Type handle provider, we need this since we have to resolve type handles
* for related classes (eg. superclass) without using mirror
*/
private final ITypeHandleProvider typeProvider;
/**
* Ctor for imaginary elements, require the enclosing package and the FQ
@@ -91,9 +85,8 @@ public class TypeHandleASM extends TypeHandle {
* @param name FQ class name
*/
protected TypeHandleASM(PackageElement pkg, String name, ClassNode classNode, ITypeHandleProvider typeProvider) {
super(pkg, name);
super(pkg, name, typeProvider);
this.classNode = classNode;
this.typeProvider = typeProvider;
}
/* (non-Javadoc)
@@ -146,8 +139,10 @@ public class TypeHandleASM extends TypeHandle {
*/
@Override
public TypeHandle getSuperclass() {
TypeHandle superClass = this.typeProvider.getTypeHandle(this.classNode.superName);
return superClass;
if (this.classNode.superName == null) {
return null;
}
return this.typeProvider.getTypeHandle(this.classNode.superName);
}
/* (non-Javadoc)
@@ -196,6 +191,14 @@ public class TypeHandleASM extends TypeHandle {
return false;
}
/* (non-Javadoc)
* @see org.spongepowered.tools.obfuscation.mirror.TypeHandle#isInterface()
*/
@Override
public boolean isNotInterface() {
return (this.classNode.access & Opcodes.ACC_INTERFACE) == 0;
}
/* (non-Javadoc)
* @see org.spongepowered.tools.obfuscation.mirror.TypeHandle#findDescriptor
* (org.spongepowered.asm.mixin.injection.selectors.ITargetSelectorByName)
@@ -272,7 +275,11 @@ public class TypeHandleASM extends TypeHandle {
InputStream is = null;
try {
Filer filer = ap.getProcessingEnvironment().getFiler();
is = filer.getResource(StandardLocation.CLASS_PATH, pkg.getQualifiedName(), name + ".class").openInputStream();
try {
is = filer.getResource(StandardLocation.CLASS_PATH, pkg.getQualifiedName(), name + ".class").openInputStream();
} catch (FileNotFoundException ignored) {
is = filer.getResource(StandardLocation.PLATFORM_CLASS_PATH, pkg.getQualifiedName(), name + ".class").openInputStream();
}
ClassNode classNode = new ClassNode();
new ClassReader(is).accept(classNode, 0);
TypeHandleASM typeHandle = new TypeHandleASM(pkg, fqName, classNode, ap.getTypeProvider());
@@ -35,6 +35,7 @@ import javax.lang.model.type.TypeMirror;
import org.spongepowered.asm.mixin.injection.selectors.ITargetSelectorByName;
import org.spongepowered.asm.obfuscation.mapping.common.MappingMethod;
import org.spongepowered.asm.util.SignaturePrinter;
import org.spongepowered.tools.obfuscation.interfaces.ITypeHandleProvider;
/**
* A simulated type handle, used with virtual (pseudo) mixins. For obfuscation
@@ -48,12 +49,12 @@ public class TypeHandleSimulated extends TypeHandle {
private final TypeElement simulatedType;
public TypeHandleSimulated(String name, TypeMirror type) {
this(TypeUtils.getPackage(type), name, type);
public TypeHandleSimulated(String name, TypeMirror type, ITypeHandleProvider typeProvider) {
this(TypeUtils.getPackage(type), name, type, typeProvider);
}
public TypeHandleSimulated(PackageElement pkg, String name, TypeMirror type) {
super(pkg, name);
public TypeHandleSimulated(PackageElement pkg, String name, TypeMirror type, ITypeHandleProvider typeProvider) {
super(pkg, name, typeProvider);
this.simulatedType = (TypeElement)((DeclaredType)type).asElement();
}
@@ -152,14 +153,14 @@ public class TypeHandleSimulated extends TypeHandle {
String rawSignature = TypeUtils.stripGenerics(signature);
// Try to locate a member anywhere in the hierarchy which matches
MethodHandle method = TypeHandleSimulated.findMethodRecursive(this, name, signature, rawSignature, true);
MethodHandle method = TypeHandleSimulated.findMethodRecursive(this, name, signature, rawSignature, true, this.typeProvider);
// If we find one, return it otherwise just simulate the method
return method != null ? method.asMapping(true) : super.getMappingMethod(name, desc);
}
private static MethodHandle findMethodRecursive(TypeHandle target, String name, String signature, String rawSignature, boolean matchCase) {
private static MethodHandle findMethodRecursive(TypeHandle target, String name, String signature, String rawSignature, boolean matchCase, ITypeHandleProvider typeProvider) {
TypeElement elem = target.getTargetElement();
if (elem == null) {
return null;
@@ -171,7 +172,7 @@ public class TypeHandleSimulated extends TypeHandle {
}
for (TypeMirror iface : elem.getInterfaces()) {
method = TypeHandleSimulated.findMethodRecursive(iface, name, signature, rawSignature, matchCase);
method = TypeHandleSimulated.findMethodRecursive(iface, name, signature, rawSignature, matchCase, typeProvider);
if (method != null) {
return method;
}
@@ -182,15 +183,14 @@ public class TypeHandleSimulated extends TypeHandle {
return null;
}
return TypeHandleSimulated.findMethodRecursive(superClass, name, signature, rawSignature, matchCase);
return TypeHandleSimulated.findMethodRecursive(superClass, name, signature, rawSignature, matchCase, typeProvider);
}
private static MethodHandle findMethodRecursive(TypeMirror target, String name, String signature, String rawSignature, boolean matchCase) {
private static MethodHandle findMethodRecursive(TypeMirror target, String name, String signature, String rawSignature, boolean matchCase, ITypeHandleProvider typeProvider) {
if (!(target instanceof DeclaredType)) {
return null;
}
TypeElement element = (TypeElement)((DeclaredType)target).asElement();
return TypeHandleSimulated.findMethodRecursive(new TypeHandle(element), name, signature, rawSignature, matchCase);
return TypeHandleSimulated.findMethodRecursive(typeProvider.getTypeHandle(target), name, signature, rawSignature, matchCase, typeProvider);
}
}
@@ -24,6 +24,8 @@
*/
package org.spongepowered.tools.obfuscation.mirror;
import org.spongepowered.tools.obfuscation.interfaces.ITypeHandleProvider;
import java.io.Serializable;
import javax.annotation.processing.ProcessingEnvironment;
@@ -82,15 +84,14 @@ public class TypeReference implements Serializable, Comparable<TypeReference> {
/**
* Fetch or attempt to generate the type handle
*
* @param processingEnv environment to create handle if it needs to be
* @param typeHandleProvider provider to create handle if it needs to be
* regenerated
* @return type handle
*/
public TypeHandle getHandle(ProcessingEnvironment processingEnv) {
public TypeHandle getHandle(ITypeHandleProvider typeHandleProvider) {
if (this.handle == null) {
TypeElement element = processingEnv.getElementUtils().getTypeElement(this.getClassName());
try {
this.handle = new TypeHandle(element);
this.handle = typeHandleProvider.getTypeHandle(this.name);
} catch (Exception ex) {
// Class probably doesn't exist in scope :/
ex.printStackTrace();
@@ -29,9 +29,6 @@ import java.util.Collection;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker;
@@ -94,8 +91,7 @@ public class TargetValidator extends MixinValidator {
}
for (TypeHandle target : targets) {
TypeElement targetType = target.getElement();
if (targetType != null && !(targetType.getKind() == ElementKind.INTERFACE)) {
if (target != null && target.isNotInterface()) {
this.messager.printMessage(MessageType.TARGET_VALIDATOR, "Targetted type '" + target + " of " + mixin + " is not an interface",
mixin);
}
@@ -103,54 +99,27 @@ public class TargetValidator extends MixinValidator {
}
private void validateClassMixin(TypeElement mixin, Collection<TypeHandle> targets) {
TypeMirror superClass = mixin.getSuperclass();
TypeHandle superClass = this.typeHandleProvider.getTypeHandle(TypeUtils.getInternalName(mixin)).getSuperclass();
for (TypeHandle target : targets) {
TypeMirror targetType = target.getTypeMirror();
if (targetType != null && !this.validateSuperClass(targetType, superClass)) {
if (target != null && !this.validateSuperClass(target, superClass)) {
this.messager.printMessage(MessageType.TARGET_VALIDATOR, "Superclass " + superClass + " of " + mixin
+ " was not found in the hierarchy of target class " + targetType, mixin);
+ " was not found in the hierarchy of target class " + target, mixin);
}
}
}
private boolean validateSuperClass(TypeMirror targetType, TypeMirror superClass) {
if (TypeUtils.isAssignable(this.processingEnv, targetType, superClass)) {
return true;
}
return this.validateSuperClassRecursive(targetType, superClass);
private boolean validateSuperClass(TypeHandle targetType, TypeHandle superClass) {
return superClass.isAssignableFrom(targetType) || this.checkMixinsFor(targetType, superClass);
}
private boolean validateSuperClassRecursive(TypeMirror targetType, TypeMirror superClass) {
if (!(targetType instanceof DeclaredType)) {
return false;
}
if (TypeUtils.isAssignable(this.processingEnv, targetType, superClass)) {
return true;
}
TypeElement targetElement = (TypeElement)((DeclaredType)targetType).asElement();
TypeMirror targetSuper = targetElement.getSuperclass();
if (targetSuper.getKind() == TypeKind.NONE) {
return false;
}
if (this.checkMixinsFor(targetSuper, superClass)) {
return true;
}
return this.validateSuperClassRecursive(targetSuper, superClass);
}
private boolean checkMixinsFor(TypeMirror targetType, TypeMirror superClass) {
for (TypeMirror mixinType : this.getMixinsTargeting(targetType)) {
if (TypeUtils.isAssignable(this.processingEnv, mixinType, superClass)) {
private boolean checkMixinsFor(TypeHandle targetType, TypeHandle superClass) {
for (TypeHandle mixinType : this.getMixinsTargeting(targetType)) {
if (mixinType.isAssignableFrom(superClass)) {
return true;
}
}
return false;
return targetType.getSuperclass() != null && this.checkMixinsFor(targetType.getSuperclass(), superClass);
}
}