Removed the number of classes that are in the image heap from the build output.

Author: christianhaeubl

docs/reference-manual/native-image/BuildOutput.md

@@ -29,7 +29,7 @@ GraalVM Native Image: Generating 'helloworld' (executable)...
 [6/7] Compiling methods...    [**]                               (3.7s @ 2.38GB)
 [7/7] Creating image...                                          (2.1s @ 1.04GB)
    3.69MB (27.19%) for code area:    6,955 compilation units
-   5.86MB (43.18%) for image heap:   1,545 classes and 80,528 objects
+   5.86MB (43.18%) for image heap:   80,528 objects
    3.05MB (22.46%) for debug info generated in 1.0s
  997.25KB ( 7.18%) for other data
   13.57MB in total

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

@@ -707,7 +707,7 @@ private void doRun(Map<Method, CEntryPointData> entryPoints,
                 AfterImageWriteAccessImpl afterConfig = new AfterImageWriteAccessImpl(featureHandler, loader, hUniverse, inv, tmpDir, image.getImageKind(), debug);
                 featureHandler.forEachFeature(feature -> feature.afterImageWrite(afterConfig));
             }
-            reporter.printCreationEnd(image.getImageSize(), bb.getUniverse(), heap.getObjectCount(), image.getImageHeapSize(), codeCache.getCodeCacheSize(),
+            reporter.printCreationEnd(image.getImageSize(), heap.getObjectCount(), image.getImageHeapSize(), codeCache.getCodeCacheSize(),
                             numCompilations, image.getDebugInfoSize());
             if (breakdownsPrinter != null) {
                 breakdownsPrinter.reset().flushln();

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

@@ -380,7 +380,7 @@ public void setDebugInfoTimer(Timer timer) {
         this.debugInfoTimer = timer;
     }
 
-    public void printCreationEnd(int imageSize, AnalysisUniverse universe, int numHeapObjects, long imageHeapSize, int codeCacheSize,
+    public void printCreationEnd(int imageSize, int numHeapObjects, long imageHeapSize, int codeCacheSize,
                     int numCompilations, int debugInfoSize) {
         Timer imageTimer = getTimer(TimerCollection.Registry.IMAGE);
         Timer writeTimer = getTimer(TimerCollection.Registry.WRITE);
@@ -389,9 +389,8 @@ public void printCreationEnd(int imageSize, AnalysisUniverse universe, int numHe
         String format = "%9s (%5.2f%%) for ";
         l().a(format, Utils.bytesToHuman(codeCacheSize), codeCacheSize / (double) imageSize * 100)
                         .doclink("code area", "#glossary-code-area").a(":%,9d compilation units", numCompilations).println();
-        long numInstantiatedClasses = universe.getTypes().stream().filter(t -> t.isInstantiated()).count();
         l().a(format, Utils.bytesToHuman(imageHeapSize), imageHeapSize / (double) imageSize * 100)
-                        .doclink("image heap", "#glossary-image-heap").a(":%,8d classes and %,d objects", numInstantiatedClasses, numHeapObjects).println();
+                        .doclink("image heap", "#glossary-image-heap").a(": %,8d objects", numHeapObjects).println();
         if (debugInfoSize > 0) {
             DirectPrinter l = l().a(format, Utils.bytesToHuman(debugInfoSize), debugInfoSize / (double) imageSize * 100)
                             .doclink("debug info", "#glossary-debug-info");