From 02aa220a36f4adc0c5ba44cd106b0d09ef335fc5 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Sun, 1 Mar 2015 20:25:36 +0000 Subject: [PATCH] Improve handling of TypeInsns and INVOKEVIRTUAL in mixins, closes #21 --- .../asm/mixin/transformer/ClassInfo.java | 25 ++++++++ .../mixin/transformer/MixinTargetContext.java | 57 +++++++++++++------ 2 files changed, 65 insertions(+), 17 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 9979c5c9..3f73578c 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -664,6 +664,31 @@ class ClassInfo extends TreeInfo { return false; } + + /** + * Find out whether this (non-mixin) class has a mixin targetting + * any of its superclasses. This method always returns false for + * mixin classes. + * + * @return true if and only if one or more classes in this class's hierarchy + * are targetted by a mixin + */ + public boolean hasMixinTargetInHierarchy() { + if (this.isMixin) { + return false; + } + + ClassInfo superClass = this.getSuperClass(); + + while (superClass != null && superClass != ClassInfo.OBJECT) { + if (superClass.mixins.size() > 0) { + return true; + } + superClass = superClass.getSuperClass(); + } + + return false; + } /** * Finds the specified private or protected method in this class's hierarchy diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 15ff52cf..d030c5c2 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -89,6 +89,11 @@ public class MixinTargetContext implements IReferenceMapperContext { * True if this mixin inherits from a mixin at any point in its hierarchy */ private final boolean inheritsFromMixin; + + /** + * True if this mixin's superclass is detached from the target superclass + */ + private final boolean detachedSuper; /** * ctor @@ -102,7 +107,8 @@ public class MixinTargetContext implements IReferenceMapperContext { this.classNode = mixin; this.targetClass = target; this.targetClassInfo = ClassInfo.forName(target.name); - this.inheritsFromMixin = info.getClassInfo().hasMixinInHierarchy(); + this.inheritsFromMixin = info.getClassInfo().hasMixinInHierarchy() || this.targetClassInfo.hasMixinTargetInHierarchy(); + this.detachedSuper = !this.getClassNode().superName.equals(this.targetClass.superName); } /* (non-Javadoc) @@ -231,9 +237,6 @@ public class MixinTargetContext implements IReferenceMapperContext { this.transformDescriptor(method); - String fromClass = this.getClassRef(); - boolean detached = !this.getClassNode().superName.equals(this.targetClass.superName); - Iterator iter = method.instructions.iterator(); while (iter.hasNext()) { AbstractInsnNode insn = iter.next(); @@ -241,10 +244,14 @@ public class MixinTargetContext implements IReferenceMapperContext { if (insn instanceof MethodInsnNode) { MethodInsnNode methodInsn = (MethodInsnNode)insn; this.transformDescriptor(methodInsn); - if (methodInsn.owner.equals(fromClass)) { + if (methodInsn.owner.equals(this.getClassRef())) { methodInsn.owner = this.targetClass.name; - } else if (detached && methodInsn.getOpcode() == Opcodes.INVOKESPECIAL) { - this.updateStaticBindings(method, methodInsn); + } else if ((this.detachedSuper || this.inheritsFromMixin)) { + if (methodInsn.getOpcode() == Opcodes.INVOKESPECIAL) { + this.updateStaticBinding(method, methodInsn); + } else if (methodInsn.getOpcode() == Opcodes.INVOKEVIRTUAL && ClassInfo.forName(methodInsn.owner).isMixin()) { + this.updateDynamicBinding(method, methodInsn); + } } } else if (insn instanceof FieldInsnNode) { FieldInsnNode fieldInsn = (FieldInsnNode)insn; @@ -253,7 +260,7 @@ public class MixinTargetContext implements IReferenceMapperContext { iter.remove(); } this.transformDescriptor(fieldInsn); - if (fieldInsn.owner.equals(fromClass)) { + if (fieldInsn.owner.equals(this.getClassRef())) { fieldInsn.owner = this.targetClass.name; } } else if (insn instanceof TypeInsnNode) { @@ -301,7 +308,7 @@ public class MixinTargetContext implements IReferenceMapperContext { MethodInsnNode methodNode = (MethodInsnNode)insn; if (methodNode.owner.equals(this.getClassRef()) && methodNode.name.equals(method.name) && methodNode.desc.equals(method.desc)) { methodNode.setOpcode(Opcodes.INVOKESPECIAL); - this.updateStaticBindings(method, methodNode); + this.updateStaticBinding(method, methodNode); return; } } @@ -314,26 +321,42 @@ public class MixinTargetContext implements IReferenceMapperContext { * Update INVOKESPECIAL opcodes to target the topmost class in the hierarchy * which contains the specified method. * - * @param method - * @param insn + * @param method Method containing the instruction + * @param insn INVOKE instruction node */ - private void updateStaticBindings(MethodNode method, MethodInsnNode insn) { + private void updateStaticBinding(MethodNode method, MethodInsnNode insn) { + this.updateBinding(method, insn, Traversal.SUPER); + } + + /** + * Update INVOKEVIRTUAL opcodes to target the topmost class in the hierarchy + * which contains the specified method. + * + * @param method Method containing the instruction + * @param insn INVOKE instruction node + */ + private void updateDynamicBinding(MethodNode method, MethodInsnNode insn) { + this.updateBinding(method, insn, Traversal.ALL); + } + + private void updateBinding(MethodNode method, MethodInsnNode insn, Traversal traversal) { if (INIT.equals(method.name) || insn.owner.equals(this.targetClass.name) || this.targetClass.name.startsWith("<")) { return; } - Method superMethod = this.targetClassInfo.findMethodInHierarchy(insn.name, insn.desc, false, Traversal.SUPER); + Method superMethod = this.targetClassInfo.findMethodInHierarchy(insn.name, insn.desc, traversal == Traversal.ALL, traversal); if (superMethod != null) { if (superMethod.getOwner().isMixin()) { - throw new InvalidMixinException(this, "Invalid INVOKESPECIAL in " + this + " resolved " + insn.owner + " -> " + superMethod.getOwner() - + " for " + insn.name + insn.desc); + throw new InvalidMixinException(this, "Invalid " + ASMHelper.getOpcodeName(insn) + " in " + this + " resolved " + insn.owner + + " -> " + superMethod.getOwner() + " for " + insn.name + insn.desc); } insn.owner = superMethod.getOwner().getName(); } else if (ClassInfo.forName(insn.owner).isMixin()) { - throw new MixinTransformerError("Error resolving INVOKESPECIAL target for " + insn.owner + "." + insn.name + " in " + this); + throw new MixinTransformerError("Error resolving " + ASMHelper.getOpcodeName(insn) + " target for " + insn.owner + "." + insn.name + + " in " + this); } } - + /** * Transforms a field descriptor in the context of this mixin target *