From d460bd58e61b00379b98d76c7c36e473b087eb99 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 17 Sep 2019 13:49:53 +0100 Subject: [PATCH] Don't visit a synthetic inner class with itself, fixes #359 --- .../mixin/transformer/MixinPostProcessor.java | 39 +++++++------------ 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPostProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPostProcessor.java index 8f3632d0..4e80f822 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPostProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPostProcessor.java @@ -36,6 +36,7 @@ import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.tree.AnnotationNode; import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; @@ -148,33 +149,19 @@ class MixinPostProcessor implements MixinConfig.IListener { * new home in the target class */ private void processSyntheticInner(ClassNode classNode) { - ClassVisitor visibilityVisitor = new ClassVisitor(Bytecode.ASM_API_VERSION, classNode) { - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { - super.visit(version, access | Opcodes.ACC_PUBLIC, name, signature, superName, interfaces); - } - - - @Override - public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - if ((access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) == 0) { - access |= Opcodes.ACC_PUBLIC; - } - return super.visitField(access, name, desc, signature, value); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - if ((access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) == 0) { - access |= Opcodes.ACC_PUBLIC; - } - return super.visitMethod(access, name, desc, signature, exceptions); - } - - }; + classNode.access |= Opcodes.ACC_PUBLIC; - classNode.accept(visibilityVisitor); + for (FieldNode field : classNode.fields) { + if ((field.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) == 0) { + field.access |= Opcodes.ACC_PUBLIC; + } + } + + for (MethodNode method : classNode.methods) { + if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED)) == 0) { + method.access |= Opcodes.ACC_PUBLIC; + } + } } private boolean processAccessor(ClassNode classNode, MixinInfo mixin) {