Show debuginfo generation runtime on image build output

Author: olpaw

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -451,7 +451,7 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Integer o
         }
     };
 
-    private static void defaultDebugInfoValueUpdateHandler(EconomicMap<OptionKey<?>, Object> values, @SuppressWarnings("unused") Integer oldValue, Integer newValue) {
+    public static void defaultDebugInfoValueUpdateHandler(EconomicMap<OptionKey<?>, Object> values, @SuppressWarnings("unused") Integer oldValue, Integer newValue) {
         // force update of TrackNodeSourcePosition and DeleteLocalSymbols
         TrackNodeSourcePosition.update(values, newValue > 0);
         DeleteLocalSymbols.update(values, newValue == 0);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java

@@ -663,7 +663,7 @@ private void doRun(Map<Method, CEntryPointData> entryPoints,
                         featureHandler.forEachFeature(feature -> feature.afterHeapLayout(config));
 
                         this.image = AbstractBootImage.create(k, hUniverse, hMetaAccess, nativeLibraries, heap, codeCache, hostedEntryPoints, loader.getClassLoader());
-                        image.build(debug);
+                        image.build(imageName, debug);
                         if (NativeImageOptions.PrintUniverse.getValue()) {
                             /*
                              * This debug output must be printed _after_ and not _during_ image

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/AbstractBootImage.java

@@ -123,7 +123,7 @@ public NativeLibraries getNativeLibs() {
      * Build the image. Calling this method is a precondition to calling {@link #write}. It
      * typically finalizes content of the object. It does not build debug information.
      */
-    public abstract void build(DebugContext debug);
+    public abstract void build(String imageName, DebugContext debug);
 
     /**
      * Write the image to the named file. This also writes debug information -- either to the same

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeBootImage.java

@@ -62,6 +62,7 @@
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.graal.pointsto.util.Timer;
 import com.oracle.objectfile.BasicProgbitsSectionImpl;
 import com.oracle.objectfile.BuildDependency;
 import com.oracle.objectfile.LayoutDecision;
@@ -400,7 +401,7 @@ private ObjectFile.Symbol defineRelocationForSymbol(String name, long position)
      */
     @Override
     @SuppressWarnings("try")
-    public void build(DebugContext debug) {
+    public void build(String imageName, DebugContext debug) {
         try (DebugContext.Scope buildScope = debug.scope("NativeBootImage.build")) {
             final CGlobalDataFeature cGlobals = CGlobalDataFeature.singleton();
 
@@ -450,9 +451,11 @@ public void build(DebugContext debug) {
              * If we constructed debug info give the object file a chance to install it
              */
             if (SubstrateOptions.GenerateDebugInfo.getValue(HostedOptionValues.singleton()) > 0) {
-                ImageSingletons.add(SourceManager.class, new SourceManager());
-                DebugInfoProvider provider = new NativeImageDebugInfoProvider(debug, codeCache, heap);
-                objectFile.installDebugInfo(provider);
+                try (Timer.StopTimer t = new Timer(imageName, "dbginfo").start()) {
+                    ImageSingletons.add(SourceManager.class, new SourceManager());
+                    DebugInfoProvider provider = new NativeImageDebugInfoProvider(debug, codeCache, heap);
+                    objectFile.installDebugInfo(provider);
+                }
             }
             // - Write the heap to its own section.
             // Dynamic linkers/loaders generally don't ensure any alignment to more than page