From b0f2db09de126eb8abc7a239d3adf12a7511ea64 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Dec 2015 16:06:37 +0000 Subject: [PATCH] Fix traversal and mixin-is-own-parent detection, fixes @Deamon5550 --- .../asm/mixin/transformer/ClassInfo.java | 32 +++++++++++++++++-- .../asm/mixin/transformer/MixinInfo.java | 13 +++++++- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java index ac3e1dcd..d44d9767 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -692,6 +692,13 @@ public class ClassInfo extends TreeInfo { public String getName() { return this.name; } + + /** + * Get the class name (java format) + */ + public String getClassName() { + return this.name.replace('/', '.'); + } /** * Get the superclass name (binary name) @@ -880,6 +887,8 @@ public class ClassInfo extends TreeInfo { public ClassInfo findSuperClass(String superClass) { return this.findSuperClass(superClass, Traversal.NONE); } + + public static boolean b; /** * Search for the specified superclass in this class's hierarchy. If found @@ -890,6 +899,14 @@ public class ClassInfo extends TreeInfo { * @return Matched superclass or null if not found */ public ClassInfo findSuperClass(String superClass, Traversal traversal) { + if (ClassInfo.OBJECT.name == superClass) { + return null; + } + + return this.findSuperClass(superClass, traversal, new HashSet()); + } + + private ClassInfo findSuperClass(String superClass, Traversal traversal, Set traversed) { ClassInfo superClassInfo = this.getSuperClass(); if (superClassInfo != null) { List targets = superClassInfo.getTargets(); @@ -898,16 +915,25 @@ public class ClassInfo extends TreeInfo { return superClassInfo; } - ClassInfo found = superTarget.findSuperClass(superClass, traversal.next()); + ClassInfo found = superTarget.findSuperClass(superClass, traversal.next(), traversed); if (found != null) { return found; } } } - + if (traversal.canTraverse()) { for (MixinInfo mixin : this.mixins) { - ClassInfo targetSuper = mixin.getClassInfo().findSuperClass(superClass, traversal); + String mixinClassName = mixin.getClassName(); + if (traversed.contains(mixinClassName)) { + continue; + } + traversed.add(mixinClassName); + ClassInfo mixinClass = mixin.getClassInfo(); + if (superClass.equals(mixinClass.getName())) { + return mixinClass; + } + ClassInfo targetSuper = mixinClass.findSuperClass(superClass, Traversal.ALL, traversed); if (targetSuper != null) { return targetSuper; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 94dd3afb..86bce5d9 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -377,7 +377,18 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { continue; } - if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.IMMEDIATE)) { + if (!targetClass.hasSuperClass(classNode.superName, ClassInfo.Traversal.SUPER)) { + ClassInfo superClass = ClassInfo.forName(classNode.superName); + if (superClass.isMixin()) { + // If superclass is a mixin, check for hierarchy derp + for (ClassInfo superTarget : superClass.getTargets()) { + if (this.targetClasses.contains(superTarget)) { + throw new InvalidMixinException(this, "Illegal hierarchy detected. Derived mixin " + this + " targets the same class " + + superTarget.getClassName() + " as its superclass " + superClass.getClassName()); + } + } + } + throw new InvalidMixinException(this, "Super class '" + classNode.superName.replace('/', '.') + "' of " + this.name + " was not found in the hierarchy of target class '" + targetClass + "'"); }