Use symbolName to compare MethodEntrys

Author: zakkak

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

@@ -355,7 +355,7 @@ public MethodEntry ensureMethodEntryForDebugRangeInfo(DebugRangeInfo debugRangeI
         ListIterator<MethodEntry> methodIterator = methods.listIterator();
         while (methodIterator.hasNext()) {
             MethodEntry methodEntry = methodIterator.next();
-            int comparisonResult = methodEntry.compareTo(methodName, paramSignature, returnTypeName);
+            int comparisonResult = methodEntry.compareTo(debugRangeInfo.symbolNameForMethod());
             if (comparisonResult == 0) {
                 methodEntry.setInRange(debugInfoBase, debugRangeInfo);
                 return methodEntry;

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

@@ -115,33 +115,8 @@ public String getSymbolName() {
         return symbolName;
     }
 
-    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;
+    public int compareTo(String symbolNameForMethod) {
+        return symbolName.compareTo(symbolNameForMethod);
     }
 
     public boolean isDeoptTarget() {
@@ -150,25 +125,6 @@ public boolean isDeoptTarget() {
 
     @Override
     public int compareTo(MethodEntry other) {
-        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;
+        return symbolName.compareTo(other.symbolName);
     }
 }