From 8c5d13ed87f92e982a3de489543f77da8a06d7ff Mon Sep 17 00:00:00 2001
From: Thiakil
Date: Mon, 23 Jul 2018 13:07:16 +0800
Subject: remove injected DUP + getClass() + POP instructions

---
 .../java/cuchaz/enigma/TranslatingTypeLoader.java  | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java b/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
index eb780ee9..8300f21c 100644
--- a/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
+++ b/src/main/java/cuchaz/enigma/TranslatingTypeLoader.java
@@ -22,7 +22,10 @@ import cuchaz.enigma.mapping.entry.ReferencedEntryPool;
 import cuchaz.enigma.mapping.Translator;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 
 import java.util.List;
 
@@ -89,6 +92,31 @@ public class TranslatingTypeLoader extends CachingTypeLoader implements ITransla
 			return null;
 		}
 
+
+		// remove <obj>.getClass() calls that are seemingly injected
+		//	DUP
+		//	INVOKEVIRTUAL java/lang/Object.getClass ()Ljava/lang/Class;
+		//	POP
+		for (MethodNode methodNode : node.methods){
+			AbstractInsnNode insnNode = methodNode.instructions.getFirst();
+			while (insnNode != null){
+				if (insnNode instanceof MethodInsnNode && insnNode.getOpcode() == Opcodes.INVOKEVIRTUAL){
+					MethodInsnNode methodInsnNode = (MethodInsnNode)insnNode;
+					if (methodInsnNode.name.equals("getClass") && methodInsnNode.owner.equals("java/lang/Object") && methodInsnNode.desc.equals("()Ljava/lang/Class")){
+						AbstractInsnNode previous = methodInsnNode.getPrevious();
+						AbstractInsnNode next = methodInsnNode.getNext();
+						if (previous.getOpcode() == Opcodes.DUP && next.getOpcode() == Opcodes.POP){
+							insnNode = previous.getPrevious();//reset the iterator so it gets the new next instruction
+							methodNode.instructions.remove(previous);
+							methodNode.instructions.remove(methodInsnNode);
+							methodNode.instructions.remove(next);
+						}
+					}
+				}
+				insnNode = insnNode.getNext();
+			}
+		}
+
 		ClassWriter writer = new ClassWriter(0);
 		transformInto(node, writer);
 
-- 
cgit v1.2.3