CodeView function names no longer contain parameter lists.

Author: stooke

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVNames.java

@@ -30,9 +30,6 @@
 import com.oracle.objectfile.debugentry.MethodEntry;
 import com.oracle.objectfile.debugentry.TypeEntry;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
 final class CVNames {
 
     static String typeNameToCodeViewName(String typeName) {
@@ -47,25 +44,7 @@ static String staticFieldNameToCodeViewName(FieldEntry fieldEntry) {
         return typeNameToCodeViewName(fieldEntry.ownerType()) + "_" + fieldEntry.fieldName();
     }
 
-    static String staticFunctionNameToCodeViewName(MethodEntry methodEntry) {
-        return typeNameToCodeViewName(methodEntry.ownerType()) + "::" + methodEntry.methodName();
-    }
-
-    static String staticFunctionNameAndArgsToCodeViewName(MethodEntry methodEntry) {
-        return functionNameAndArgsToCodeViewName(methodEntry);
-    }
-
     static String functionNameToCodeViewName(MethodEntry methodEntry) {
         return typeNameToCodeViewName(methodEntry.ownerType()) + "::" + methodEntry.methodName();
     }
-
-    static String functionNameAndArgsToCodeViewName(MethodEntry methodEntry) {
-        final String paramString;
-        if (methodEntry.getParamCount() > 0) {
-            paramString = "_" + Arrays.stream(methodEntry.getParamTypes()).map(CVNames::typeNameToCodeViewName).collect(Collectors.joining("_"));
-        } else {
-            paramString = "";
-        }
-        return functionNameToCodeViewName(methodEntry) + paramString;
-    }
 }

substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSubsectionBuilder.java

@@ -45,7 +45,6 @@ final class CVSymbolSubsectionBuilder {
 
     private final String heapName;
     private final short heapRegister;
-    private boolean noMainFound = true;
 
     CVSymbolSubsectionBuilder(CVDebugInfo cvDebugInfo) {
         this.cvDebugInfo = cvDebugInfo;
@@ -165,16 +164,8 @@ private void buildFunction(PrimaryEntry primaryEntry) {
      * @param range Range contained in the method of interest
      * @return user debugger friendly method name
      */
-    private String getDebuggerName(Range range) {
-        final String methodName;
-        if (noMainFound && Modifier.isStatic(range.getMethodEntry().getModifiers()) && range.getMethodName().equals("main")) {
-            noMainFound = false;
-            methodName = CVNames.staticFunctionNameToCodeViewName(range.getMethodEntry());
-        } else {
-            /* Use a more user-friendly name instead of a hash function. */
-            methodName = CVNames.staticFunctionNameAndArgsToCodeViewName(range.getMethodEntry());
-        }
-        return methodName;
+    private static String getDebuggerName(Range range) {
+        return CVNames.functionNameToCodeViewName(range.getMethodEntry());
     }
 
     private void addLineNumberRecords(PrimaryEntry primaryEntry) {