Enable serialization in -H:Preserve

Author: vjovanov

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

@@ -44,6 +44,7 @@
 import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport;
 import org.graalvm.nativeimage.impl.RuntimeProxyCreationSupport;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
+import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
 
 import com.oracle.graal.pointsto.ClassInclusionPolicy;
 import com.oracle.svm.core.SubstrateOptions;
@@ -152,6 +153,7 @@ public static void registerPreservedClasses(NativeImageClassLoaderSupport classL
         final RuntimeReflectionSupport reflection = ImageSingletons.lookup(RuntimeReflectionSupport.class);
         final RuntimeJNIAccessSupport jni = ImageSingletons.lookup(RuntimeJNIAccessSupport.class);
         final RuntimeProxyCreationSupport proxy = ImageSingletons.lookup(RuntimeProxyCreationSupport.class);
+        final RuntimeSerializationSupport<ConfigurationCondition> serialization = RuntimeSerializationSupport.singleton();
         final ConfigurationCondition always = ConfigurationCondition.alwaysTrue();
 
         /*
@@ -207,7 +209,7 @@ public static void registerPreservedClasses(NativeImageClassLoaderSupport classL
         classesToPreserve.reversed().forEach(c -> {
             reflection.registerAllFields(always, c);
             reflection.registerAllMethodsQuery(always, false, c);
-            // RuntimeSerialization.register(c);
+            serialization.register(always, c);
         });
 
         for (String className : classLoaderSupport.getClassNamesToPreserve()) {

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

@@ -554,15 +554,24 @@ public void registerAllDeclaredFields(ConfigurationCondition condition, Class<?>
         registerAllDeclaredFieldsQuery(condition, false, clazz);
     }
 
+    private record AllDeclaredFieldsQuery(ConfigurationCondition condition, boolean queriedOnly, Class<?> clazz) {
+    }
+
+    private Set<AllDeclaredFieldsQuery> existingAllDeclaredFieldsQuery = ConcurrentHashMap.newKeySet();
+
     public void registerAllDeclaredFieldsQuery(ConfigurationCondition condition, boolean queriedOnly, Class<?> clazz) {
-        runConditionalInAnalysisTask(condition, (cnd) -> {
-            setQueryFlag(clazz, ALL_DECLARED_FIELDS_FLAG);
-            try {
-                registerFields(cnd, queriedOnly, clazz.getDeclaredFields());
-            } catch (LinkageError e) {
-                registerLinkageError(clazz, e, fieldLookupExceptions);
-            }
-        });
+        final var query = new AllDeclaredFieldsQuery(condition, queriedOnly, clazz);
+        if (!existingAllDeclaredFieldsQuery.contains(query)) {
+            runConditionalInAnalysisTask(condition, (cnd) -> {
+                setQueryFlag(clazz, ALL_DECLARED_FIELDS_FLAG);
+                try {
+                    registerFields(cnd, queriedOnly, clazz.getDeclaredFields());
+                } catch (LinkageError e) {
+                    registerLinkageError(clazz, e, fieldLookupExceptions);
+                }
+            });
+            existingAllDeclaredFieldsQuery.add(query);
+        }
     }
 
     private void registerFields(ConfigurationCondition cnd, boolean queriedOnly, Field[] reflectFields) {
@@ -1137,6 +1146,7 @@ protected void afterAnalysis() {
         if (!throwMissingRegistrationErrors()) {
             pendingRecordClasses = null;
         }
+        existingAllDeclaredFieldsQuery = null;
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java

@@ -604,6 +604,9 @@ private Constructor<?> newConstructorForSerialization(Class<?> serializationTarg
         } else {
             constructorToCall = customConstructorToCall;
         }
+        if (constructorToCall == null) {
+            return null;
+        }
         ConstructorAccessor acc = getConstructorAccessor(serializationTargetClass, constructorToCall);
         JavaLangReflectAccess langReflectAccess = ReflectionUtil.readField(ReflectionFactory.class, "langReflectAccess", ReflectionFactory.getReflectionFactory());
         Method newConstructorWithAccessor = ReflectionUtil.lookupMethod(JavaLangReflectAccess.class, "newConstructorWithAccessor", Constructor.class, ConstructorAccessor.class);

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ReflectionUtil.java

@@ -123,7 +123,7 @@ public static <T> Constructor<T> lookupConstructor(boolean optional, Class<T> de
             openModule(declaringClass);
             result.setAccessible(true);
             return result;
-        } catch (ReflectiveOperationException | NoClassDefFoundError ex) {
+        } catch (ReflectiveOperationException | LinkageError ex) {
             if (optional) {
                 return null;
             }