Refactor: Avoid toJavaName invocations when getting ranges' class

zakkak · zakkak · commit 671e7f9cc031 · 2021-08-25T01:25:44.000+03:00
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugFileInfo;
+import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.debuginfo.DebugInfoProvider;
@@ -103,7 +104,7 @@ public abstract class DebugInfoBase {
     /**
      * index of already seen classes.
      */
-    private Map<String, ClassEntry> primaryClassesIndex = new HashMap<>();
+    private Map<ResolvedJavaType, ClassEntry> primaryClassesIndex = new HashMap<>();
     /**
      * Index of files which contain primary or secondary ranges.
      */
@@ -238,17 +239,17 @@ public void installDebugInfo(DebugInfoProvider debugInfoProvider) {
              */
             String fileName = debugCodeInfo.fileName();
             Path filePath = debugCodeInfo.filePath();
-            String className = TypeEntry.canonicalize(debugCodeInfo.ownerType());
+            ResolvedJavaType ownerType = debugCodeInfo.ownerType();
             String methodName = debugCodeInfo.name();
             int lo = debugCodeInfo.addressLo();
             int hi = debugCodeInfo.addressHi();
             int primaryLine = debugCodeInfo.line();
 
             /* Search for a method defining this primary range. */
-            ClassEntry classEntry = ensureClassEntry(className);
+            ClassEntry classEntry = ensureClassEntry(ownerType);
             MethodEntry methodEntry = classEntry.ensureMethodEntryForDebugRangeInfo(debugCodeInfo, this, debugContext);
             Range primaryRange = new Range(stringTable, methodEntry, lo, hi, primaryLine);
-            debugContext.log(DebugContext.INFO_LEVEL, "PrimaryRange %s.%s %s %s:%d [0x%x, 0x%x]", className, methodName, filePath, fileName, primaryLine, lo, hi);
+            debugContext.log(DebugContext.INFO_LEVEL, "PrimaryRange %s.%s %s %s:%d [0x%x, 0x%x]", ownerType.toJavaName(), methodName, filePath, fileName, primaryLine, lo, hi);
             classEntry.indexPrimary(primaryRange, debugCodeInfo.getFrameSizeChanges(), debugCodeInfo.getFrameSize());
             /*
              * Record all subranges even if they have no line or file so we at least get a symbol
@@ -349,7 +350,6 @@ ClassEntry lookupClassEntry(String typeName) {
      */
     @SuppressWarnings("try")
     private Range recursivelyAddSubRanges(DebugInfoProvider.DebugLineInfo lineInfo, Range primaryRange, ClassEntry classEntry, DebugContext debugContext) {
-        /* Don't process the root method, it is already added as the primary range */
         if (lineInfo == null) {
             return primaryRange;
         }
@@ -359,38 +359,38 @@ private Range recursivelyAddSubRanges(DebugInfoProvider.DebugLineInfo lineInfo,
          * number
          */
         boolean isInline = lineInfo.getCaller() != null;
-        assert (isInline || (lineInfo.name().equals(primaryRange.getMethodName()) && lineInfo.ownerType().equals(primaryRange.getClassName())));
+        assert (isInline || (lineInfo.name().equals(primaryRange.getMethodName()) && TypeEntry.canonicalize(lineInfo.ownerType().toJavaName()).equals(primaryRange.getClassName())));
 
         Range caller = recursivelyAddSubRanges(lineInfo.getCaller(), primaryRange, classEntry, debugContext);
         final String fileName = lineInfo.fileName();
         final Path filePath = lineInfo.filePath();
-        final String className = TypeEntry.canonicalize(lineInfo.ownerType());
+        final ResolvedJavaType ownerType = lineInfo.ownerType();
         final String methodName = lineInfo.name();
         final int lo = primaryRange.getLo() + lineInfo.addressLo();
         final int hi = primaryRange.getLo() + lineInfo.addressHi();
         final int line = lineInfo.line();
-        ClassEntry subRangeClassEntry = ensureClassEntry(className);
+        ClassEntry subRangeClassEntry = ensureClassEntry(ownerType);
         MethodEntry subRangeMethodEntry = subRangeClassEntry.ensureMethodEntryForDebugRangeInfo(lineInfo, this, debugContext);
         Range subRange = new Range(stringTable, subRangeMethodEntry, lo, hi, line, primaryRange, isInline, caller);
         classEntry.indexSubRange(subRange);
         try (DebugContext.Scope s = debugContext.scope("Subranges")) {
             debugContext.log(DebugContext.VERBOSE_LEVEL, "SubRange %s.%s %s %s:%d 0x%x, 0x%x]",
-                            className, methodName, filePath, fileName, line, lo, hi);
+                            ownerType.toJavaName(), methodName, filePath, fileName, line, lo, hi);
         }
         return subRange;
     }
 
-    private ClassEntry ensureClassEntry(String className) {
+    private ClassEntry ensureClassEntry(ResolvedJavaType type) {
         /* See if we already have an entry. */
-        ClassEntry classEntry = primaryClassesIndex.get(className);
+        ClassEntry classEntry = primaryClassesIndex.get(type);
         if (classEntry == null) {
-            TypeEntry typeEntry = typesIndex.get(className);
+            TypeEntry typeEntry = typesIndex.get(TypeEntry.canonicalize(type.toJavaName()));
             assert (typeEntry != null && typeEntry.isClass());
             classEntry = (ClassEntry) typeEntry;
             primaryClasses.add(classEntry);
-            primaryClassesIndex.put(className, classEntry);
+            primaryClassesIndex.put(type, classEntry);
         }
-        assert (classEntry.getTypeName().equals(className));
+        assert (classEntry.getTypeName().equals(TypeEntry.canonicalize(type.toJavaName())));
         return classEntry;
     }
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java
@@ -31,6 +31,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
+import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.compiler.debug.DebugContext;
 
 /**
@@ -187,8 +188,6 @@ interface DebugMemberInfo extends DebugFileInfo {
 
         String name();
 
-        String ownerType();
-
         String valueType();
 
         int modifiers();
@@ -232,6 +231,7 @@ interface DebugMethodInfo extends DebugMemberInfo {
      * {@link com.oracle.objectfile.debugentry.Range}.
      */
     interface DebugRangeInfo extends DebugMethodInfo {
+        ResolvedJavaType ownerType();
     }
 
     /**
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
@@ -436,11 +436,6 @@ public String name() {
             return name;
         }
 
-        @Override
-        public String ownerType() {
-            return ownerType;
-        }
-
         @Override
         public String valueType() {
             return valueType;
@@ -585,11 +580,6 @@ public String name() {
                 return field.getName();
             }
 
-            @Override
-            public String ownerType() {
-                return typeName();
-            }
-
             @Override
             public String valueType() {
                 HostedType valueType = field.getType();
@@ -655,11 +645,6 @@ public String name() {
                 return name;
             }
 
-            @Override
-            public String ownerType() {
-                return typeName();
-            }
-
             @Override
             public String valueType() {
                 return hostedMethod.getSignature().getReturnType(null).toJavaName();
@@ -861,8 +846,8 @@ public void debugContext(Consumer<DebugContext> action) {
         }
 
         @Override
-        public String ownerType() {
-            return getDeclaringClass(hostedMethod, true).toJavaName();
+        public ResolvedJavaType ownerType() {
+            return getDeclaringClass(hostedMethod, true);
         }
 
         @Override
@@ -1072,12 +1057,11 @@ public Path cachePath() {
         }
 
         @Override
-        public String ownerType() {
+        public ResolvedJavaType ownerType() {
             if (method instanceof HostedMethod) {
-                return getDeclaringClass((HostedMethod) method, true).toJavaName();
-            } else {
-                return method.getDeclaringClass().toJavaName();
+                return getDeclaringClass((HostedMethod) method, true);
             }
+            return method.getDeclaringClass();
         }
 
         @Override
