Consider all supertypes for serialization constructors

loicottet · Oct 28, 2024 · da249b0 · da249b0
1 parent dea1968
commit da249b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...le.svm.core/src/com/oracle/svm/core/configure/LegacySerializationConfigurationParser.java b/...le.svm.core/src/com/oracle/svm/core/configure/LegacySerializationConfigurationParser.java
@@ -88,7 +88,7 @@ protected void parseSerializationDescriptorObject(EconomicMap<String, Object> da
         } else {
             checkAttributes(data, "serialization descriptor object", Collections.singleton(NAME_KEY), Arrays.asList(CUSTOM_TARGET_CONSTRUCTOR_CLASS_KEY, CONDITIONAL_KEY));
         }
-        RuntimeReflectionSupport.increaseCount(false);
+        RuntimeReflectionSupport.increaseCount(true);
 
         ConfigurationTypeDescriptor targetSerializationClass = new NamedConfigurationTypeDescriptor(asString(data.get(NAME_KEY)));
         UnresolvedConfigurationCondition unresolvedCondition = parseCondition(data, false);

diff --git a/...rc/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationMetadataParser.java b/...rc/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationMetadataParser.java
@@ -65,7 +65,7 @@ protected void parseSerializationDescriptorObject(EconomicMap<String, Object> da
 
         Object optionalCustomCtorValue = data.get(CUSTOM_TARGET_CONSTRUCTOR_CLASS_KEY);
         if (optionalCustomCtorValue != null) {
-            RuntimeReflectionSupport.increaseCount(false);
+            RuntimeReflectionSupport.increaseCount(true);
         }
         registerType(targetSerializationClass.get(), condition.get(), optionalCustomCtorValue);
     }

diff --git a/...m.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java b/...m.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java
@@ -553,9 +553,11 @@ public void registerWithTargetConstructorClass(ConfigurationCondition condition,
                         return;
                     }
                 }
-                Optional.ofNullable(addConstructorAccessor(cnd, serializationTargetClass, customTargetConstructorClass))
-                                .map(ReflectionUtil::lookupConstructor)
-                                .ifPresent(methods -> ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), false, methods));
+                for (Class<?> superclass = serializationTargetClass.getSuperclass(); superclass != null; superclass = superclass.getSuperclass()) {
+                    Optional.ofNullable(addConstructorAccessor(cnd, serializationTargetClass, superclass))
+                                    .map(ReflectionUtil::lookupConstructor)
+                                    .ifPresent(methods -> ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), false, methods));
+                }
 
                 Class<?> superclass = serializationTargetClass.getSuperclass();
                 if (superclass != null) {