Refactor runtime-specific logic out of CustomAttributeData

CustomAttributeData is meant to be abstract base class of reflection object model. Move the runtime-specific part
into a separate RuntimeCustomAttributeData type.

src/coreclr/System.Private.CoreLib/System.Private.CoreLib.csproj

@@ -155,7 +155,6 @@
     <Compile Include="$(BclSourcesRoot)\System\Reflection\AssemblyName.CoreCLR.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Associates.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\ConstructorInfo.CoreCLR.cs" />
-    <Compile Include="$(BclSourcesRoot)\System\Reflection\CustomAttribute.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\AssemblyBuilder.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\AssemblyBuilderData.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\Emit\ConstructorBuilder.cs" />
@@ -194,6 +193,7 @@
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RtFieldInfo.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeAssembly.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeConstructorInfo.cs" />
+    <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeCustomAttributeData.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeEventInfo.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeExceptionHandlingClause.cs" />
     <Compile Include="$(BclSourcesRoot)\System\Reflection\RuntimeFieldInfo.cs" />

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs

@@ -322,7 +322,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
 
         internal static RuntimeAssembly InternalLoad(string assemblyName, ref StackCrawlMark stackMark, AssemblyLoadContext? assemblyLoadContext = null)

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeConstructorInfo.cs

@@ -198,7 +198,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
         #endregion
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/CustomAttribute.cs → src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs

@@ -12,7 +12,7 @@
 
 namespace System.Reflection
 {
-    public partial class CustomAttributeData
+    public class RuntimeCustomAttributeData : CustomAttributeData
     {
         #region Internal Static Members
         internal static IList<CustomAttributeData> GetCustomAttributesInternal(RuntimeType target)
@@ -103,7 +103,7 @@ private static IList<CustomAttributeData> GetCombinedList(IList<CustomAttributeD
             customAttributes.CopyTo(pca, pseudoAttributes.Count);
             for (int i = 0; i < pseudoAttributes.Count; i++)
             {
-                pca[i] = new CustomAttributeData(pseudoAttributes[i]);
+                pca[i] = new RuntimeCustomAttributeData(pseudoAttributes[i]);
             }
 
             return Array.AsReadOnly(pca);
@@ -181,15 +181,15 @@ private static CustomAttributeEncoding TypeToCustomAttributeEncoding(RuntimeType
         }
         private static CustomAttributeType InitCustomAttributeType(RuntimeType parameterType)
         {
-            CustomAttributeEncoding encodedType = CustomAttributeData.TypeToCustomAttributeEncoding(parameterType);
+            CustomAttributeEncoding encodedType = TypeToCustomAttributeEncoding(parameterType);
             CustomAttributeEncoding encodedArrayType = CustomAttributeEncoding.Undefined;
             CustomAttributeEncoding encodedEnumType = CustomAttributeEncoding.Undefined;
             string? enumName = null;
 
             if (encodedType == CustomAttributeEncoding.Array)
             {
                 parameterType = (RuntimeType)parameterType.GetElementType();
-                encodedArrayType = CustomAttributeData.TypeToCustomAttributeEncoding(parameterType);
+                encodedArrayType = TypeToCustomAttributeEncoding(parameterType);
             }
 
             if (encodedType == CustomAttributeEncoding.Enum || encodedArrayType == CustomAttributeEncoding.Enum)
@@ -210,7 +210,7 @@ private static IList<CustomAttributeData> GetCustomAttributes(RuntimeModule modu
 
             CustomAttributeData[] customAttributes = new CustomAttributeData[records.Length];
             for (int i = 0; i < records.Length; i++)
-                customAttributes[i] = new CustomAttributeData(module, records[i].tkCtor, in records[i].blob);
+                customAttributes[i] = new RuntimeCustomAttributeData(module, records[i].tkCtor, in records[i].blob);
 
             return Array.AsReadOnly(customAttributes);
         }
@@ -262,17 +262,13 @@ internal static CustomAttributeTypedArgument Filter(IList<CustomAttributeData> a
         private IList<CustomAttributeNamedArgument> m_namedArgs = null!;
 
         #region Constructor
-        protected CustomAttributeData()
-        {
-        }
-
         [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2075:UnrecognizedReflectionPattern",
             Justification = "Property setters and fields which are accessed by any attribute instantiation which is present in the code linker has analyzed." +
                             "As such enumerating all fields and properties may return different results after trimming" +
                             "but all those which are needed to actually have data will be there.")]
         [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:UnrecognizedReflectionPattern",
             Justification = "We're getting a MethodBase of a constructor that we found in the metadata. The attribute constructor won't be trimmed.")]
-        private CustomAttributeData(RuntimeModule scope, MetadataToken caCtorToken, in ConstArray blob)
+        private RuntimeCustomAttributeData(RuntimeModule scope, MetadataToken caCtorToken, in ConstArray blob)
         {
             m_scope = scope;
             m_ctor = (RuntimeConstructorInfo)RuntimeType.GetMethodBase(scope, caCtorToken)!;
@@ -301,7 +297,7 @@ private CustomAttributeData(RuntimeModule scope, MetadataToken caCtorToken, in C
         #endregion
 
         #region Pseudo Custom Attribute Constructor
-        internal CustomAttributeData(Attribute attribute)
+        internal RuntimeCustomAttributeData(Attribute attribute)
         {
             if (attribute is DllImportAttribute dllImportAttribute)
                 Init(dllImportAttribute);
@@ -415,9 +411,9 @@ private void Init(object pca)
         #endregion
 
         #region Public Members
-        public virtual ConstructorInfo Constructor => m_ctor;
+        public override ConstructorInfo Constructor => m_ctor;
 
-        public virtual IList<CustomAttributeTypedArgument> ConstructorArguments
+        public override IList<CustomAttributeTypedArgument> ConstructorArguments
         {
             get
             {
@@ -439,7 +435,7 @@ public virtual IList<CustomAttributeTypedArgument> ConstructorArguments
             }
         }
 
-        public virtual IList<CustomAttributeNamedArgument> NamedArguments
+        public override IList<CustomAttributeNamedArgument> NamedArguments
         {
             get
             {
@@ -557,17 +553,6 @@ private static RuntimeType ResolveType(RuntimeModule scope, string typeName)
         }
         #endregion
 
-        private static object CanonicalizeValue(object value)
-        {
-            Debug.Assert(value is not null);
-
-            if (value.GetType().IsEnum)
-            {
-                return ((Enum)value).GetValue();
-            }
-            return value;
-        }
-
         internal CustomAttributeTypedArgument(RuntimeModule scope, CustomAttributeEncodedArgument encodedArg)
         {
             CustomAttributeEncoding encodedType = encodedArg.CustomAttributeType.EncodedType;
@@ -577,22 +562,22 @@ internal CustomAttributeTypedArgument(RuntimeModule scope, CustomAttributeEncode
 
             if (encodedType == CustomAttributeEncoding.Enum)
             {
-                m_argumentType = ResolveType(scope, encodedArg.CustomAttributeType.EnumName!);
-                m_value = EncodedValueToRawValue(encodedArg.PrimitiveValue, encodedArg.CustomAttributeType.EncodedEnumType);
+                _argumentType = ResolveType(scope, encodedArg.CustomAttributeType.EnumName!);
+                _value = EncodedValueToRawValue(encodedArg.PrimitiveValue, encodedArg.CustomAttributeType.EncodedEnumType);
             }
             else if (encodedType == CustomAttributeEncoding.String)
             {
-                m_argumentType = typeof(string);
-                m_value = encodedArg.StringValue;
+                _argumentType = typeof(string);
+                _value = encodedArg.StringValue;
             }
             else if (encodedType == CustomAttributeEncoding.Type)
             {
-                m_argumentType = typeof(Type);
+                _argumentType = typeof(Type);
 
-                m_value = null;
+                _value = null;
 
                 if (encodedArg.StringValue is not null)
-                    m_value = ResolveType(scope, encodedArg.StringValue);
+                    _value = ResolveType(scope, encodedArg.StringValue);
             }
             else if (encodedType == CustomAttributeEncoding.Array)
             {
@@ -608,25 +593,25 @@ internal CustomAttributeTypedArgument(RuntimeModule scope, CustomAttributeEncode
                     elementType = CustomAttributeEncodingToType(encodedType);
                 }
 
-                m_argumentType = elementType.MakeArrayType();
+                _argumentType = elementType.MakeArrayType();
 
                 if (encodedArg.ArrayValue is null)
                 {
-                    m_value = null;
+                    _value = null;
                 }
                 else
                 {
                     CustomAttributeTypedArgument[] arrayValue = new CustomAttributeTypedArgument[encodedArg.ArrayValue.Length];
                     for (int i = 0; i < arrayValue.Length; i++)
                         arrayValue[i] = new CustomAttributeTypedArgument(scope, encodedArg.ArrayValue[i]);
 
-                    m_value = Array.AsReadOnly(arrayValue);
+                    _value = Array.AsReadOnly(arrayValue);
                 }
             }
             else
             {
-                m_argumentType = CustomAttributeEncodingToType(encodedType);
-                m_value = EncodedValueToRawValue(encodedArg.PrimitiveValue, encodedType);
+                _argumentType = CustomAttributeEncodingToType(encodedType);
+                _value = EncodedValueToRawValue(encodedArg.PrimitiveValue, encodedType);
             }
         }
     }
@@ -1168,7 +1153,7 @@ private static void AddCustomAttributes(
             // The derivedAttributes list must be passed by value so that it is not modified with the discovered attributes
             RuntimeType.ListBuilder<object> derivedAttributes)
         {
-            CustomAttributeRecord[] car = CustomAttributeData.GetCustomAttributeRecords(decoratedModule, decoratedMetadataToken);
+            CustomAttributeRecord[] car = RuntimeCustomAttributeData.GetCustomAttributeRecords(decoratedModule, decoratedMetadataToken);
 
             if (attributeFilterType is null && car.Length == 0)
             {
@@ -1435,7 +1420,7 @@ internal static AttributeUsageAttribute GetAttributeUsage(RuntimeType decoratedA
         {
             RuntimeModule decoratedModule = decoratedAttribute.GetRuntimeModule();
             MetadataImport scope = decoratedModule.MetadataImport;
-            CustomAttributeRecord[] car = CustomAttributeData.GetCustomAttributeRecords(decoratedModule, decoratedAttribute.MetadataToken);
+            CustomAttributeRecord[] car = RuntimeCustomAttributeData.GetCustomAttributeRecords(decoratedModule, decoratedAttribute.MetadataToken);
 
             AttributeUsageAttribute? attributeUsageAttribute = null;
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeEventInfo.cs

@@ -104,7 +104,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
         #endregion
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeFieldInfo.cs

@@ -89,7 +89,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
         #endregion
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.cs

@@ -271,7 +271,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
         #endregion
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeModule.cs

@@ -425,7 +425,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
         #endregion
 

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeParameterInfo.cs

@@ -320,8 +320,8 @@ public override bool HasDefaultValue
                 if (raw)
                 {
                     CustomAttributeTypedArgument value =
-                        CustomAttributeData.Filter(
-                            CustomAttributeData.GetCustomAttributes(this), typeof(DateTimeConstantAttribute), 0);
+                        RuntimeCustomAttributeData.Filter(
+                            RuntimeCustomAttributeData.GetCustomAttributes(this), typeof(DateTimeConstantAttribute), 0);
 
                     if (value.ArgumentType != null)
                         return new DateTime((long)value.Value!);
@@ -541,7 +541,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
         #endregion
     }

src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimePropertyInfo.cs

@@ -165,7 +165,7 @@ public override bool IsDefined(Type attributeType, bool inherit)
 
         public override IList<CustomAttributeData> GetCustomAttributesData()
         {
-            return CustomAttributeData.GetCustomAttributesInternal(this);
+            return RuntimeCustomAttributeData.GetCustomAttributesInternal(this);
         }
         #endregion
 

src/coreclr/vm/corelib.h

@@ -257,11 +257,11 @@ DEFINE_FIELD_U(m_type,             CustomAttributeValue,           m_type)
 DEFINE_CLASS(CUSTOM_ATTRIBUTE_ENCODED_ARGUMENT, Reflection, CustomAttributeEncodedArgument)
 
 DEFINE_CLASS_U(Reflection, CustomAttributeNamedParameter, CustomAttributeNamedArgument)
-DEFINE_FIELD_U(m_argumentName,     CustomAttributeNamedArgument,   m_argumentName)
-DEFINE_FIELD_U(m_fieldOrProperty,  CustomAttributeNamedArgument,   m_propertyOrField)
-DEFINE_FIELD_U(m_padding,          CustomAttributeNamedArgument,   m_padding)
-DEFINE_FIELD_U(m_type,             CustomAttributeNamedArgument,   m_type)
-DEFINE_FIELD_U(m_encodedArgument,  CustomAttributeNamedArgument,   m_value)
+DEFINE_FIELD_U(_argumentName,      CustomAttributeNamedArgument,   m_argumentName)
+DEFINE_FIELD_U(_fieldOrProperty,   CustomAttributeNamedArgument,   m_propertyOrField)
+DEFINE_FIELD_U(_padding,           CustomAttributeNamedArgument,   m_padding)
+DEFINE_FIELD_U(_type,              CustomAttributeNamedArgument,   m_type)
+DEFINE_FIELD_U(_encodedArgument,   CustomAttributeNamedArgument,   m_value)
 
 DEFINE_CLASS_U(Reflection, CustomAttributeCtorParameter, CustomAttributeArgument)
 DEFINE_FIELD_U(m_type,             CustomAttributeArgument,        m_type)

src/libraries/System.Private.CoreLib/src/System/Reflection/CustomAttributeData.cs

@@ -6,7 +6,7 @@
 
 namespace System.Reflection
 {
-    public partial class CustomAttributeData
+    public class CustomAttributeData
     {
         #region Public Static Members
         public static IList<CustomAttributeData> GetCustomAttributes(MemberInfo target)
@@ -42,6 +42,10 @@ public static IList<CustomAttributeData> GetCustomAttributes(ParameterInfo targe
         }
         #endregion
 
+        protected CustomAttributeData()
+        {
+        }
+
         #region Object Override
         public override string ToString()
         {
@@ -51,22 +55,26 @@ public override string ToString()
             vsb.Append(Constructor.DeclaringType!.FullName);
             vsb.Append('(');
 
-            bool first = true;
-
-            int count = ConstructorArguments.Count;
+            IList<CustomAttributeTypedArgument> constructorArguments = ConstructorArguments;
+            int count = constructorArguments.Count;
             for (int i = 0; i < count; i++)
             {
-                if (!first) vsb.Append(", ");
-                vsb.Append(ConstructorArguments[i].ToString());
-                first = false;
+                if (i != 0)
+                {
+                    vsb.Append(", ");
+                }
+                vsb.Append(constructorArguments[i].ToString());
             }
 
-            count = NamedArguments.Count;
+            IList<CustomAttributeNamedArgument> namedArguments = NamedArguments;
+            count = namedArguments.Count;
             for (int i = 0; i < count; i++)
             {
-                if (!first) vsb.Append(", ");
-                vsb.Append(NamedArguments[i].ToString());
-                first = false;
+                if (i != 0)
+                {
+                    vsb.Append(", ");
+                }
+                vsb.Append(namedArguments[i].ToString());
             }
 
             vsb.Append(")]");
@@ -79,6 +87,11 @@ public override string ToString()
 
         #region Public Members
         public virtual Type AttributeType => Constructor.DeclaringType!;
+
+        // Expected to be overriden
+        public virtual ConstructorInfo Constructor => null!;
+        public virtual IList<CustomAttributeTypedArgument> ConstructorArguments => null!;
+        public virtual IList<CustomAttributeNamedArgument> NamedArguments => null!;
         #endregion
     }
 }