Revert "Use symbolName to compare MethodEntrys"

This reverts commit e205cb0.

Author: zakkak

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java

@@ -341,10 +341,13 @@ public ClassEntry getSuperClass() {
 
     public MethodEntry ensureMethodEntryForDebugRangeInfo(DebugRangeInfo debugRangeInfo, DebugInfoBase debugInfoBase, DebugContext debugContext) {
         assert listIsSorted(methods);
+        String methodName = debugInfoBase.uniqueDebugString(debugRangeInfo.name());
+        String paramSignature = debugRangeInfo.paramSignature();
+        String returnTypeName = debugRangeInfo.valueType();
         ListIterator<MethodEntry> methodIterator = methods.listIterator();
         while (methodIterator.hasNext()) {
             MethodEntry methodEntry = methodIterator.next();
-            int comparisonResult = methodEntry.compareTo(debugRangeInfo.symbolNameForMethod());
+            int comparisonResult = methodEntry.compareTo(methodName, paramSignature, returnTypeName);
             if (comparisonResult == 0) {
                 methodEntry.setInRangeAndUpdateFileEntry(debugInfoBase, debugRangeInfo);
                 if (methodEntry.fileEntry != null) {

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/MethodEntry.java

@@ -120,12 +120,56 @@ public String getSymbolName() {
         return symbolName;
     }
 
-    public int compareTo(String symbolNameForMethod) {
-        return symbolName.compareTo(symbolNameForMethod);
+    public int compareTo(String methodName, String paramSignature, String returnTypeName) {
+        int nameComparison = memberName.compareTo(methodName);
+        if (nameComparison != 0) {
+            return nameComparison;
+        }
+        int typeComparison = valueType.getTypeName().compareTo(returnTypeName);
+        if (typeComparison != 0) {
+            return typeComparison;
+        }
+        String[] paramTypeNames = paramSignature.split((","));
+        int length;
+        if (paramSignature.trim().length() == 0) {
+            length = 0;
+        } else {
+            length = paramTypeNames.length;
+        }
+        int paramCountComparison = getParamCount() - length;
+        if (paramCountComparison != 0) {
+            return paramCountComparison;
+        }
+        for (int i = 0; i < getParamCount(); i++) {
+            int paraComparison = getParamTypeName(i).compareTo(paramTypeNames[i].trim());
+            if (paraComparison != 0) {
+                return paraComparison;
+            }
+        }
+        return 0;
     }
 
     @Override
     public int compareTo(MethodEntry other) {
-        return symbolName.compareTo(other.symbolName);
+        assert other != null;
+        int nameComparison = methodName().compareTo(other.methodName());
+        if (nameComparison != 0) {
+            return nameComparison;
+        }
+        int typeComparison = valueType.getTypeName().compareTo(other.valueType.getTypeName());
+        if (typeComparison != 0) {
+            return typeComparison;
+        }
+        int paramCountComparison = getParamCount() - other.getParamCount();
+        if (paramCountComparison != 0) {
+            return paramCountComparison;
+        }
+        for (int i = 0; i < getParamCount(); i++) {
+            int paramComparison = getParamTypeName(i).compareTo(other.getParamTypeName(i));
+            if (paramComparison != 0) {
+                return paramComparison;
+            }
+        }
+        return 0;
     }
 }