Bridge Method Fixes (#111)

* Detect synthetic bridges not marked as bridges, and add back flags to produced bytecode

* Remove debug check

* Remove more test code

* Remove unneeded change to `TranslationClassVisitor`

1 files changed, 43 insertions, 0 deletions

diff --git a/src/main/java/cuchaz/enigma/bytecode/translators/SourceFixVisitor.java b/src/main/java/cuchaz/enigma/bytecode/translators/SourceFixVisitor.java
new file mode 100644
index 0000000..99eef6a
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/bytecode/translators/SourceFixVisitor.java
@@ -0,0 +1,43 @@
+package cuchaz.enigma.bytecode.translators;
+
+import cuchaz.enigma.analysis.index.BridgeMethodIndex;
+import cuchaz.enigma.analysis.index.JarIndex;
+import cuchaz.enigma.translation.representation.entry.ClassDefEntry;
+import cuchaz.enigma.translation.representation.entry.MethodDefEntry;
+import cuchaz.enigma.translation.representation.entry.MethodEntry;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+public class SourceFixVisitor extends ClassVisitor {
+        private final JarIndex index;
+        private ClassDefEntry ownerEntry;
+
+        public SourceFixVisitor(int api, ClassVisitor visitor, JarIndex index) {
+                super(api, visitor);
+                this.index = index;
+        }
+
+        @Override
+        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+                ownerEntry = ClassDefEntry.parse(access, name, signature, superName, interfaces);
+                super.visit(version, access, name, signature, superName, interfaces);
+        }
+
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+                MethodDefEntry methodEntry = MethodDefEntry.parse(ownerEntry, access, name, descriptor, signature);
+
+                BridgeMethodIndex bridgeIndex = index.getBridgeMethodIndex();
+                if (bridgeIndex.isBridgeMethod(methodEntry)) {
+                        access |= Opcodes.ACC_BRIDGE;
+                } else {
+                        MethodEntry bridgeMethod = bridgeIndex.getBridgeFromAccessed(methodEntry);
+                        if (bridgeMethod != null) {
+                                name = bridgeMethod.getName();
+                        }
+                }
+
+                return super.visitMethod(access, name, descriptor, signature, exceptions);
+        }
+}