Track 'unsafe allocated' preserved state in ClassForNameSupport

Author: DSouzaM

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

@@ -296,13 +296,14 @@ private void registerKnownClassName(AccessCondition condition, String className,
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    public void registerUnsafeAllocated(AccessCondition condition, Class<?> clazz) {
+    public void registerUnsafeAllocated(AccessCondition condition, Class<?> clazz, boolean preserved) {
         if (!clazz.isArray() && !clazz.isInterface() && !Modifier.isAbstract(clazz.getModifiers())) {
             /* Otherwise, UNSAFE.allocateInstance results in InstantiationException */
             if (!previousLayerUnsafe.contains(clazz.getName())) {
-                var conditionSet = unsafeInstantiatedClasses.putIfAbsent(clazz, RuntimeConditionSet.createHosted(condition, false));
+                var conditionSet = unsafeInstantiatedClasses.putIfAbsent(clazz, RuntimeConditionSet.createHosted(condition, preserved));
                 if (conditionSet != null) {
                     conditionSet.addCondition(condition);
+                    conditionSet.reportReregistered(preserved);
                 }
             }
         }
@@ -463,6 +464,17 @@ public static boolean isPreserved(Class<?> jClass) {
         return false;
     }
 
+    public static boolean isUnsafeAllocatedPreserved(Class<?> jClass) {
+        Objects.requireNonNull(jClass);
+        for (var singleton : layeredSingletons()) {
+            RuntimeConditionSet conditionSet = singleton.unsafeInstantiatedClasses.get(jClass);
+            if (conditionSet != null) {
+                return conditionSet.preserved();
+            }
+        }
+        return false;
+    }
+
     public static boolean isRegisteredClass(String className) {
         if (respectClassLoader()) {
             RuntimeConditionSet conditionSet = getConditionForName(className);

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/FieldsOffsetsFeature.java

@@ -167,7 +167,7 @@ private static void registerFields(FieldIntrospection<?> introspection, BeforeAn
 
             /* The partial evaluator allocates Node classes via Unsafe. */
             AnalysisType nodeType = config.getMetaAccess().lookupJavaType(nodeClass.getJavaClass());
-            nodeType.registerInstantiatedCallback(_ -> config.registerAsUnsafeAllocated(nodeType));
+            nodeType.registerInstantiatedCallback(_ -> config.registerAsUnsafeAllocated(nodeType, false));
 
             Fields dataFields = nodeClass.getData();
             registerFields(dataFields, config, "Graal node data field");

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

@@ -415,15 +415,15 @@ public void registerAsInHeap(AnalysisType aType, Object reason) {
 
         @Override
         public void registerAsUnsafeAllocated(Class<?> clazz) {
-            registerAsUnsafeAllocated(getMetaAccess().lookupJavaType(clazz));
+            registerAsUnsafeAllocated(getMetaAccess().lookupJavaType(clazz), false);
         }
 
-        public void registerAsUnsafeAllocated(AnalysisType aType) {
+        public void registerAsUnsafeAllocated(AnalysisType aType, boolean preserved) {
             if (aType.isAbstract()) {
                 throw UserError.abort("Cannot register an abstract class as instantiated: " + aType.toJavaName(true));
             }
             aType.registerAsUnsafeAllocated("From feature");
-            classForNameSupport.registerUnsafeAllocated(AccessCondition.unconditional(), aType.getJavaClass());
+            classForNameSupport.registerUnsafeAllocated(AccessCondition.unconditional(), aType.getJavaClass(), preserved);
         }
 
         @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java

@@ -461,7 +461,7 @@ public void addMethod(Executable method, boolean preserved, DuringAnalysisAccess
                  * Constructors can be invoked on objects allocated separately via AllocObject,
                  * which we implement via Unsafe.
                  */
-                access.registerAsUnsafeAllocated(aTargetMethod.getDeclaringClass());
+                access.registerAsUnsafeAllocated(aTargetMethod.getDeclaringClass(), preserved);
                 newObjectMethod = aFactoryMethod.getWrapped();
             }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java

@@ -299,7 +299,7 @@ private void registerClass(AccessCondition condition, Class<?> clazz, boolean un
         type.registerAsReachable("Is registered for reflection.");
         if (unsafeInstantiated) {
             type.registerAsUnsafeAllocated("Is registered via reflection metadata.");
-            classForNameSupport.registerUnsafeAllocated(condition, clazz);
+            classForNameSupport.registerUnsafeAllocated(condition, clazz, preserved);
         }
 
         if (allowForName) {