Fix handling of null deobf mappings

4 files changed, 15 insertions, 32 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
index e5133937..1e6c3a19 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
@@ -323,7 +323,7 @@ public class ClassMapping implements Comparable<ClassMapping> {
                 }
                 boolean wasAdded = methodsByObf.put(obfKey, methodMapping) == null;
                 assert (wasAdded);
-                if (methodMapping.getDeobfName() != null) {
+                if (!methodMapping.isObfuscated()) {
                         String deobfKey = getMethodKey(methodMapping.getDeobfName(), methodMapping.getObfDesc());
                         if (methodsByDeobf.containsKey(deobfKey)) {
                                 throw new Error("Already have mapping for " + deobfName + "." + deobfKey);
@@ -338,7 +338,7 @@ public class ClassMapping implements Comparable<ClassMapping> {
         public void removeMethodMapping(MethodMapping methodMapping) {
                 boolean obfWasRemoved = methodsByObf.remove(getMethodKey(methodMapping.getObfName(), methodMapping.getObfDesc())) != null;
                 assert (obfWasRemoved);
-                if (methodMapping.getDeobfName() != null) {
+                if (!methodMapping.isObfuscated()) {
                         boolean deobfWasRemoved = methodsByDeobf.remove(getMethodKey(methodMapping.getDeobfName(), methodMapping.getObfDesc())) != null;
                         assert (deobfWasRemoved);
                 }
@@ -371,7 +371,7 @@ public class ClassMapping implements Comparable<ClassMapping> {
                 MethodMapping methodMapping = methodsByObf.get(getMethodKey(obfName, obfDescriptor));
                 if (methodMapping == null) {
                         methodMapping = createMethodMapping(obfName, obfDescriptor);
-                } else if (methodMapping.getDeobfName() != null) {
+                } else if (!methodMapping.isObfuscated()) {
                         boolean wasRemoved = methodsByDeobf.remove(getMethodKey(methodMapping.getDeobfName(), methodMapping.getObfDesc())) != null;
                         assert (wasRemoved);
                 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
index 19299778..4e29a465 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
@@ -135,7 +135,7 @@ public class MappingsEnigmaWriter {
         }
 
         private void write(PrintWriter out, MethodMapping methodMapping, int depth) throws IOException {
-                if (methodMapping.getDeobfName() == null) {
+                if (methodMapping.isObfuscated()) {
                         out.format("%sMETHOD %s %s%s\n", getIndent(depth), methodMapping.getObfName(), methodMapping.getObfDesc(),
                                 methodMapping.getModifier() == Mappings.EntryModifier.UNCHANGED ? "" : methodMapping.getModifier().getFormattedName());
                 } else {
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
index 363bab80..2f10144e 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
@@ -76,6 +76,9 @@ public class MethodMapping implements Comparable<MethodMapping>, MemberMapping<M
         }
 
         public String getDeobfName() {
+                if (deobfName == null) {
+                        return obfName;
+                }
                 return this.deobfName;
         }
 
@@ -200,4 +203,8 @@ public class MethodMapping implements Comparable<MethodMapping>, MemberMapping<M
         public void setModifier(Mappings.EntryModifier modifier) {
                 this.modifier = modifier;
         }
+
+        public boolean isObfuscated() {
+                return deobfName == null || deobfName.equals(obfName);
+        }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/entry/ProcyonEntryFactory.java b/src/main/java/cuchaz/enigma/mapping/entry/ProcyonEntryFactory.java
index 5892a03e..73770c53 100644
--- a/src/main/java/cuchaz/enigma/mapping/entry/ProcyonEntryFactory.java
+++ b/src/main/java/cuchaz/enigma/mapping/entry/ProcyonEntryFactory.java
@@ -11,14 +11,14 @@
 
 package cuchaz.enigma.mapping.entry;
 
-import com.strobel.assembler.metadata.*;
+import com.strobel.assembler.metadata.FieldDefinition;
+import com.strobel.assembler.metadata.MemberReference;
+import com.strobel.assembler.metadata.MethodDefinition;
 import cuchaz.enigma.bytecode.AccessFlags;
 import cuchaz.enigma.mapping.MethodDescriptor;
 import cuchaz.enigma.mapping.Signature;
 import cuchaz.enigma.mapping.TypeDescriptor;
 
-import java.util.List;
-
 public class ProcyonEntryFactory {
         private final ReferencedEntryPool entryPool;
 
@@ -26,30 +26,6 @@ public class ProcyonEntryFactory {
                 this.entryPool = entryPool;
         }
 
-        private String getErasedSignature(MemberReference def) {
-                if (!(def instanceof MethodReference))
-                        return def.getErasedSignature();
-                MethodReference methodReference = (MethodReference) def;
-                StringBuilder builder = new StringBuilder("(");
-                for (ParameterDefinition param : methodReference.getParameters()) {
-                        TypeReference paramType = param.getParameterType();
-                        if (paramType.getErasedSignature().equals("Ljava/lang/Object;") && paramType.hasExtendsBound() && paramType.getExtendsBound() instanceof CompoundTypeReference) {
-                                List<TypeReference> interfaces = ((CompoundTypeReference) paramType.getExtendsBound()).getInterfaces();
-                                interfaces.forEach((inter) -> builder.append(inter.getErasedSignature()));
-                        } else
-                                builder.append(paramType.getErasedSignature());
-                }
-                builder.append(")");
-
-                TypeReference returnType = methodReference.getReturnType();
-                if (returnType.getErasedSignature().equals("Ljava/lang/Object;") && returnType.hasExtendsBound() && returnType.getExtendsBound() instanceof CompoundTypeReference) {
-                        List<TypeReference> interfaces = ((CompoundTypeReference) returnType.getExtendsBound()).getInterfaces();
-                        interfaces.forEach((inter) -> builder.append(inter.getErasedSignature()));
-                } else
-                        builder.append(returnType.getErasedSignature());
-                return builder.toString();
-        }
-
         public FieldEntry getFieldEntry(MemberReference def) {
                 ClassEntry classEntry = entryPool.getClass(def.getDeclaringType().getInternalName());
                 return entryPool.getField(classEntry, def.getName(), def.getErasedSignature());
@@ -62,7 +38,7 @@ public class ProcyonEntryFactory {
 
         public MethodEntry getMethodEntry(MemberReference def) {
                 ClassEntry classEntry = entryPool.getClass(def.getDeclaringType().getInternalName());
-                return entryPool.getMethod(classEntry, def.getName(), getErasedSignature(def));
+                return entryPool.getMethod(classEntry, def.getName(), def.getErasedSignature());
         }
 
         public MethodDefEntry getMethodDefEntry(MethodDefinition def) {