Move tracing before missing registration checks.

DSouzaM · DSouzaM · commit 8a4c8d0173cf · 2025-07-08T15:11:16.000-04:00
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java
@@ -500,6 +500,12 @@ public static Throwable getSavedException(String className) {
      */
     public static boolean canUnsafeInstantiateAsInstance(DynamicHub hub) {
         Class<?> clazz = DynamicHub.toClass(hub);
+        if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
+            ConfigurationType type = MetadataTracer.singleton().traceReflectionType(clazz.getName());
+            if (type != null) {
+                type.setUnsafeAllocated();
+            }
+        }
         RuntimeConditionSet conditionSet = null;
         for (var singleton : layeredSingletons()) {
             conditionSet = singleton.unsafeInstantiatedClasses.get(clazz);
@@ -508,12 +514,6 @@ public static boolean canUnsafeInstantiateAsInstance(DynamicHub hub) {
             }
         }
         if (conditionSet != null) {
-            if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
-                ConfigurationType type = MetadataTracer.singleton().traceReflectionType(clazz.getName());
-                if (type != null) {
-                    type.setUnsafeAllocated();
-                }
-            }
             return conditionSet.satisfied();
         }
         return false;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
@@ -1973,14 +1973,19 @@ public DynamicHub arrayType() {
         if (toClass(this) == void.class) {
             throw new UnsupportedOperationException(new IllegalArgumentException());
         }
+        if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
+            MetadataTracer.singleton().traceReflectionType(arrayTypeName());
+        }
         if (companion.arrayHub == null) {
-            MissingReflectionRegistrationUtils.reportClassAccess(getTypeName() + "[]");
-        } else if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
-            MetadataTracer.singleton().traceReflectionType(companion.arrayHub.getTypeName());
+            MissingReflectionRegistrationUtils.reportClassAccess(arrayTypeName());
         }
         return companion.arrayHub;
     }
 
+    private String arrayTypeName() {
+        return getTypeName() + "[]";
+    }
+
     @KeepOriginal
     private native Class<?> elementType();
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaIOSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaIOSubstitutions.java
@@ -65,12 +65,12 @@ static ObjectStreamClass lookup(Class<?> cl, boolean all) {
         }
 
         if (Serializable.class.isAssignableFrom(cl) && !cl.isArray()) {
-            if (!DynamicHub.fromClass(cl).isRegisteredForSerialization()) {
-                MissingSerializationRegistrationUtils.reportSerialization(cl);
-            }
             if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
                 MetadataTracer.singleton().traceSerializationType(cl.getName());
             }
+            if (!DynamicHub.fromClass(cl).isRegisteredForSerialization()) {
+                MissingSerializationRegistrationUtils.reportSerialization(cl);
+            }
         }
 
         return Target_java_io_ObjectStreamClass_Caches.localDescs0.get(cl);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
@@ -294,10 +294,10 @@ public boolean isRegisteredBundleLookup(String baseName, Locale locale, Object c
             /* Those cases will throw a NullPointerException before any lookup */
             return true;
         }
+        if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
+            MetadataTracer.singleton().traceResourceBundle(baseName);
+        }
         if (registeredBundles.containsKey(baseName)) {
-            if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
-                MetadataTracer.singleton().traceResourceBundle(baseName);
-            }
             return registeredBundles.get(baseName).satisfied();
         }
         return false;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java
@@ -273,19 +273,19 @@ public static JNIMethodId getDeclaredMethodID(Class<?> classObject, JNIAccessibl
     }
 
     private static JNIAccessibleMethod getDeclaredMethod(Class<?> classObject, JNIAccessibleMethodDescriptor descriptor, String dumpLabel) {
+        if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
+            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getName());
+            if (clazzType != null) {
+                clazzType.addMethod(descriptor.getNameConvertToString(), descriptor.getSignatureConvertToString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED);
+            }
+        }
         boolean foundClass = false;
         for (var dictionary : layeredSingletons()) {
             JNIAccessibleClass clazz = dictionary.classesByClassObject.get(classObject);
             if (clazz != null) {
                 foundClass = true;
                 JNIAccessibleMethod method = clazz.getMethod(descriptor);
                 if (method != null) {
-                    if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
-                        ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getName());
-                        if (clazzType != null) {
-                            clazzType.addMethod(descriptor.getNameConvertToString(), descriptor.getSignatureConvertToString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED);
-                        }
-                    }
                     return method;
                 }
             }
@@ -334,19 +334,19 @@ private static JNIAccessibleMethod checkMethod(JNIAccessibleMethod method, Class
     }
 
     private static JNIAccessibleField getDeclaredField(Class<?> classObject, CharSequence name, boolean isStatic, String dumpLabel) {
+        if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
+            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getName());
+            if (clazzType != null) {
+                clazzType.addField(name.toString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED, false);
+            }
+        }
         boolean foundClass = false;
         for (var dictionary : layeredSingletons()) {
             JNIAccessibleClass clazz = dictionary.classesByClassObject.get(classObject);
             if (clazz != null) {
                 foundClass = true;
                 JNIAccessibleField field = clazz.getField(name);
                 if (field != null && (field.isStatic() == isStatic || field.isNegative())) {
-                    if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
-                        ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getName());
-                        if (clazzType != null) {
-                            clazzType.addField(name.toString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED, false);
-                        }
-                    }
                     return field;
                 }
             }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java
@@ -267,12 +267,12 @@ public static Object getSerializationConstructorAccessor(Class<?> serializationT
                 return constructorAccessor;
             }
         } else {
+            if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
+                MetadataTracer.singleton().traceSerializationType(declaringClass.getName());
+            }
             for (var singleton : layeredSingletons()) {
                 Object constructorAccessor = singleton.getSerializationConstructorAccessor0(declaringClass, targetConstructorClass);
                 if (constructorAccessor != null) {
-                    if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {
-                        MetadataTracer.singleton().traceSerializationType(declaringClass.getName());
-                    }
                     return constructorAccessor;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,12 @@ static ObjectStreamClass lookup(Class<?> cl, boolean all) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (Serializable.class.isAssignableFrom(cl) && !cl.isArray()) {`
`68`		`- if (!DynamicHub.fromClass(cl).isRegisteredForSerialization()) {`
`69`		`- MissingSerializationRegistrationUtils.reportSerialization(cl);`
`70`		`- }`
`71`	`68`	`if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {`
`72`	`69`	`MetadataTracer.singleton().traceSerializationType(cl.getName());`
`73`	`70`	`}`
	`71`	`+ if (!DynamicHub.fromClass(cl).isRegisteredForSerialization()) {`
	`72`	`+ MissingSerializationRegistrationUtils.reportSerialization(cl);`
	`73`	`+ }`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`return Target_java_io_ObjectStreamClass_Caches.localDescs0.get(cl);`
Original file line number	Diff line number	Diff line change
`@@ -294,10 +294,10 @@ public boolean isRegisteredBundleLookup(String baseName, Locale locale, Object c`
`294`	`294`	`/* Those cases will throw a NullPointerException before any lookup */`
`295`	`295`	`return true;`
`296`	`296`	`}`
	`297`	`+ if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {`
	`298`	`+ MetadataTracer.singleton().traceResourceBundle(baseName);`
	`299`	`+ }`
`297`	`300`	`if (registeredBundles.containsKey(baseName)) {`
`298`		`- if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {`
`299`		`- MetadataTracer.singleton().traceResourceBundle(baseName);`
`300`		`- }`
`301`	`301`	`return registeredBundles.get(baseName).satisfied();`
`302`	`302`	`}`
`303`	`303`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -267,12 +267,12 @@ public static Object getSerializationConstructorAccessor(Class<?> serializationT`
`267`	`267`	`return constructorAccessor;`
`268`	`268`	`}`
`269`	`269`	`} else {`
	`270`	`+ if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {`
	`271`	`+ MetadataTracer.singleton().traceSerializationType(declaringClass.getName());`
	`272`	`+ }`
`270`	`273`	`for (var singleton : layeredSingletons()) {`
`271`	`274`	`Object constructorAccessor = singleton.getSerializationConstructorAccessor0(declaringClass, targetConstructorClass);`
`272`	`275`	`if (constructorAccessor != null) {`
`273`		`- if (MetadataTracer.Options.MetadataTracingSupport.getValue() && MetadataTracer.singleton().enabled()) {`
`274`		`- MetadataTracer.singleton().traceSerializationType(declaringClass.getName());`
`275`		`- }`
`276`	`276`	`return constructorAccessor;`
`277`	`277`	`}`
`278`	`278`	`}`