[GR-32118] Replace Heap.getInitializedClasses with Heap.getLoadedClasses.

PullRequest: graal/9223

Author: peter-hofer

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ClassHistogramVisitor.java

@@ -36,7 +36,7 @@ public class ClassHistogramVisitor implements ObjectVisitor {
 
     public ClassHistogramVisitor() {
         // NOTE: we cannot use a map because lookups in the visitor must be allocation-free
-        entries = Heap.getHeap().getInitializedClasses().stream().map(Class::getName).sorted()
+        entries = Heap.getHeap().getLoadedClasses().stream().map(Class::getName).sorted()
                         .map(HistogramEntry::new).toArray(HistogramEntry[]::new);
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java

@@ -100,21 +100,21 @@ protected Heap() {
     /** Returns the number of classes in the heap (initialized as well as uninitialized). */
     public abstract int getClassCount();
 
-    /** Return a list of all the initialized classes in the heap. */
-    public List<Class<?>> getInitializedClasses() {
-        List<Class<?>> allClasses = getAllClasses();
-        ArrayList<Class<?>> initializedClasses = new ArrayList<>(allClasses.size());
-        for (Class<?> clazz : allClasses) {
-            if (DynamicHub.fromClass(clazz).isInitialized()) {
-                initializedClasses.add(clazz);
+    /** Returns all loaded classes in the heap (see {@link PredefinedClassesSupport}). */
+    public List<Class<?>> getLoadedClasses() {
+        List<Class<?>> all = getAllClasses();
+        ArrayList<Class<?>> loaded = new ArrayList<>(all.size());
+        for (Class<?> clazz : all) {
+            if (DynamicHub.fromClass(clazz).isLoaded()) {
+                loaded.add(clazz);
             }
         }
-        return initializedClasses;
+        return loaded;
     }
 
     /**
-     * Get all known classes. Intentionally protected to prevent access to uninitialized classes,
-     * including those that have not been "loaded" yet, see {@link PredefinedClassesSupport}.
+     * Get all known classes. Intentionally protected to prevent access to classes that have not
+     * been "loaded" yet, see {@link PredefinedClassesSupport}.
      */
     protected abstract List<Class<?>> getAllClasses();
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -747,7 +747,7 @@ private ClassLoader getClassLoader0() {
         return (ClassLoader) classLoader;
     }
 
-    boolean hasClassLoader() {
+    public boolean isLoaded() {
         return classLoader != FROM_COMPANION || (companion.isPresent() && companion.get().hasClassLoader());
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/PredefinedClassesSupport.java

@@ -136,7 +136,7 @@ public static void throwIfUnresolvable(Class<?> clazz, ClassLoader classLoader)
             return;
         }
         DynamicHub hub = DynamicHub.fromClass(clazz);
-        if (!hub.hasClassLoader()) {
+        if (!hub.isLoaded()) {
             throwResolutionError(clazz.getName());
         }
         if (!isSameOrParent(clazz.getClassLoader(), classLoader)) { // common case: same loader

substratevm/src/com.oracle.svm.jfr/src/com/oracle/svm/jfr/JfrTypeRepository.java

@@ -65,7 +65,7 @@ public int write(JfrChunkWriter writer) {
 
     private TypeInfo collectTypeInfo() {
         TypeInfo typeInfo = new TypeInfo();
-        for (Class<?> clazz : Heap.getHeap().getInitializedClasses()) {
+        for (Class<?> clazz : Heap.getHeap().getLoadedClasses()) {
             if (JfrTraceId.isUsedPreviousEpoch(clazz)) {
                 JfrTraceId.clearUsedPreviousEpoch(clazz);
                 visitClass(typeInfo, clazz);