Fix array type tracing: replace getName calls with getTypeName

Author: DSouzaM

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

@@ -414,7 +414,7 @@ private Object forName0(String className, ClassLoader classLoader) {
         }
         if (MetadataTracer.enabled()) {
             // NB: the early returns above ensure we do not trace calls with bad type args.
-            MetadataTracer.singleton().traceReflectionType(className);
+            MetadataTracer.singleton().traceReflectionType(ClassNameSupport.reflectionNameToTypeName(className));
         }
         return result == NEGATIVE_QUERY ? new ClassNotFoundException(className) : result;
     }
@@ -502,7 +502,7 @@ public static Throwable getSavedException(String className) {
     public static boolean canUnsafeInstantiateAsInstance(DynamicHub hub) {
         Class<?> clazz = DynamicHub.toClass(hub);
         if (MetadataTracer.enabled()) {
-            ConfigurationType type = MetadataTracer.singleton().traceReflectionType(clazz.getName());
+            ConfigurationType type = MetadataTracer.singleton().traceReflectionType(clazz.getTypeName());
             if (type != null) {
                 type.setUnsafeAllocated();
             }

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

@@ -786,7 +786,7 @@ private static boolean isClassFlagSet(int mask, ReflectionMetadata reflectionMet
     }
 
     private void traceClassFlagQuery(int mask) {
-        ConfigurationType type = MetadataTracer.singleton().traceReflectionType(getName());
+        ConfigurationType type = MetadataTracer.singleton().traceReflectionType(getTypeName());
         if (type == null) {
             return;
         }
@@ -1397,15 +1397,15 @@ private void traceFieldLookup(String fieldName, Field field, boolean publicOnly)
         ConfigurationMemberDeclaration declaration = publicOnly ? ConfigurationMemberDeclaration.PRESENT : ConfigurationMemberDeclaration.DECLARED;
         if (field != null) {
             // register declaring type and field
-            ConfigurationType declaringType = MetadataTracer.singleton().traceReflectionType(field.getDeclaringClass().getName());
+            ConfigurationType declaringType = MetadataTracer.singleton().traceReflectionType(field.getDeclaringClass().getTypeName());
             if (declaringType != null) {
                 declaringType.addField(fieldName, declaration, false);
             }
             // register receiver type
-            MetadataTracer.singleton().traceReflectionType(getName());
+            MetadataTracer.singleton().traceReflectionType(getTypeName());
         } else {
             // register receiver type and negative field query
-            ConfigurationType receiverType = MetadataTracer.singleton().traceReflectionType(getName());
+            ConfigurationType receiverType = MetadataTracer.singleton().traceReflectionType(getTypeName());
             if (receiverType != null) {
                 receiverType.addField(fieldName, declaration, false);
             }
@@ -1482,15 +1482,15 @@ private void traceMethodLookup(String methodName, Class<?>[] parameterTypes, Exe
         ConfigurationMemberDeclaration declaration = publicOnly ? ConfigurationMemberDeclaration.PRESENT : ConfigurationMemberDeclaration.DECLARED;
         if (method != null) {
             // register declaring type and method
-            ConfigurationType declaringType = MetadataTracer.singleton().traceReflectionType(method.getDeclaringClass().getName());
+            ConfigurationType declaringType = MetadataTracer.singleton().traceReflectionType(method.getDeclaringClass().getTypeName());
             if (declaringType != null) {
                 declaringType.addMethod(methodName, toInternalSignature(parameterTypes), declaration);
             }
             // register receiver type
-            MetadataTracer.singleton().traceReflectionType(getName());
+            MetadataTracer.singleton().traceReflectionType(getTypeName());
         } else {
             // register receiver type and negative method query
-            ConfigurationType receiverType = MetadataTracer.singleton().traceReflectionType(getName());
+            ConfigurationType receiverType = MetadataTracer.singleton().traceReflectionType(getTypeName());
             if (receiverType != null) {
                 receiverType.addMethod(methodName, toInternalSignature(parameterTypes), declaration, ConfigurationMemberAccessibility.QUERIED);
             }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaIOSubstitutions.java

@@ -66,7 +66,7 @@ static ObjectStreamClass lookup(Class<?> cl, boolean all) {
 
         if (Serializable.class.isAssignableFrom(cl) && !cl.isArray()) {
             if (MetadataTracer.enabled()) {
-                MetadataTracer.singleton().traceSerializationType(cl.getName());
+                MetadataTracer.singleton().traceSerializationType(cl.getTypeName());
             }
             if (!DynamicHub.fromClass(cl).isRegisteredForSerialization()) {
                 MissingSerializationRegistrationUtils.reportSerialization(cl);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangReflectSubstitutions.java

@@ -388,7 +388,7 @@ private static void set(Object a, int index, Object value) {
     private static Object newArray(Class<?> componentType, int length)
                     throws NegativeArraySizeException {
         if (MetadataTracer.enabled()) {
-            MetadataTracer.singleton().traceReflectionType(componentType.arrayType().getName());
+            MetadataTracer.singleton().traceReflectionType(componentType.arrayType().getTypeName());
         }
         return KnownIntrinsics.unvalidatedNewArray(componentType, length);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java

@@ -274,7 +274,7 @@ public static JNIMethodId getDeclaredMethodID(Class<?> classObject, JNIAccessibl
 
     private static JNIAccessibleMethod getDeclaredMethod(Class<?> classObject, JNIAccessibleMethodDescriptor descriptor, String dumpLabel) {
         if (MetadataTracer.enabled()) {
-            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getName());
+            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getTypeName());
             if (clazzType != null) {
                 clazzType.addMethod(descriptor.getNameConvertToString(), descriptor.getSignatureConvertToString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED);
             }
@@ -335,7 +335,7 @@ private static JNIAccessibleMethod checkMethod(JNIAccessibleMethod method, Class
 
     private static JNIAccessibleField getDeclaredField(Class<?> classObject, CharSequence name, boolean isStatic, String dumpLabel) {
         if (MetadataTracer.enabled()) {
-            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getName());
+            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getTypeName());
             if (clazzType != null) {
                 clazzType.addField(name.toString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED, false);
             }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/metadata/MetadataTracer.java

@@ -145,8 +145,8 @@ private ConfigurationSet getConfigurationSetForTracing() {
      * @return the corresponding {@link ConfigurationType} or {@code null} if tracing is not active
      *         (e.g., during shutdown).
      */
-    public ConfigurationType traceReflectionType(String className) {
-        return traceReflectionTypeImpl(new NamedConfigurationTypeDescriptor(className));
+    public ConfigurationType traceReflectionType(String typeName) {
+        return traceReflectionTypeImpl(new NamedConfigurationTypeDescriptor(typeName));
     }
 
     /**
@@ -171,9 +171,9 @@ private ConfigurationType traceReflectionTypeImpl(ConfigurationTypeDescriptor ty
      * @return the corresponding {@link ConfigurationType} or {@code null} if tracing is not active
      *         (e.g., during shutdown).
      */
-    public ConfigurationType traceJNIType(String className) {
+    public ConfigurationType traceJNIType(String typeName) {
         assert enabledAtRunTime();
-        ConfigurationType result = traceReflectionType(className);
+        ConfigurationType result = traceReflectionType(typeName);
         if (result != null) {
             result.setJniAccessible();
         }
@@ -206,9 +206,9 @@ public void traceResourceBundle(String baseName) {
     /**
      * Marks the given type as serializable.
      */
-    public void traceSerializationType(String className) {
+    public void traceSerializationType(String typeName) {
         assert enabledAtRunTime();
-        ConfigurationType result = traceReflectionType(className);
+        ConfigurationType result = traceReflectionType(typeName);
         if (result != null) {
             result.setSerializable();
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java

@@ -268,7 +268,7 @@ public static Object getSerializationConstructorAccessor(Class<?> serializationT
             }
         } else {
             if (MetadataTracer.enabled()) {
-                MetadataTracer.singleton().traceSerializationType(declaringClass.getName());
+                MetadataTracer.singleton().traceSerializationType(declaringClass.getTypeName());
             }
             for (var singleton : layeredSingletons()) {
                 Object constructorAccessor = singleton.getSerializationConstructorAccessor0(declaringClass, targetConstructorClass);