From 270fd71bd2812a5e423d7c67b354a189cf586aaf Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 30 Apr 2015 12:06:21 +0100 Subject: [PATCH] Transform class literals in applied mixins, properly fixes #43 --- .../mixin/transformer/MixinTargetContext.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 8c4c67eb..89010fed 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -38,6 +38,7 @@ import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldInsnNode; import org.objectweb.asm.tree.FieldNode; +import org.objectweb.asm.tree.LdcInsnNode; import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.TypeInsnNode; @@ -241,6 +242,8 @@ public class MixinTargetContext implements IReferenceMapperContext { this.transformFieldNode(method, iter, (FieldInsnNode)insn); } else if (insn instanceof TypeInsnNode) { this.transformTypeNode(method, iter, (TypeInsnNode)insn); + } else if (insn instanceof LdcInsnNode) { + this.transformConstantNode(method, iter, (LdcInsnNode)insn); } } } @@ -329,6 +332,23 @@ public class MixinTargetContext implements IReferenceMapperContext { this.transformDescriptor(typeInsn); } + /** + * Transforms class literals in the method being processed. + * + * @param method Method being processed + * @param iter Insn interator + * @param ldcInsn Insn to transform + */ + private void transformConstantNode(MethodNode method, Iterator iter, LdcInsnNode ldcInsn) { + if (ldcInsn.cst instanceof Type) { + Type type = (Type)ldcInsn.cst; + String desc = this.transformSingleDescriptor(type); + if (!type.toString().equals(desc)) { + ldcInsn.cst = Type.getType(desc); + } + } + } + /** * Handle "imaginary super" invokations, these are invokations in * non-derived mixins for accessing methods known to exist in a supermixin