From 107e822659b227f6b34be2bb01319e82554b78ff Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Thu, 15 Jul 2021 12:42:01 +0200 Subject: [PATCH] [mono] Allow overriding CustomAttributeData accessors * Use Constructor, ConstructorArguments, and NamedArguments in internal routines to allow them being overridden (like with CoreCLR). --- .../System/Reflection/CustomAttributeData.cs | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/CustomAttributeData.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/CustomAttributeData.cs index f5b70f502e9d8b..11c099cf158a58 100644 --- a/src/mono/System.Private.CoreLib/src/System/Reflection/CustomAttributeData.cs +++ b/src/mono/System.Private.CoreLib/src/System/Reflection/CustomAttributeData.cs @@ -152,30 +152,28 @@ public static IList GetCustomAttributes(ParameterInfo targe public virtual Type AttributeType { - get { return ctorInfo.DeclaringType!; } + get { return Constructor.DeclaringType!; } } public override string ToString() { - ResolveArguments(); - StringBuilder sb = new StringBuilder(); - sb.Append('[').Append(ctorInfo.DeclaringType!.FullName).Append('('); - for (int i = 0; i < ctorArgs.Count; i++) + sb.Append('[').Append(Constructor.DeclaringType!.FullName).Append('('); + for (int i = 0; i < ConstructorArguments.Count; i++) { - sb.Append(ctorArgs[i].ToString()); - if (i + 1 < ctorArgs.Count) + sb.Append(ConstructorArguments[i].ToString()); + if (i + 1 < ConstructorArguments.Count) sb.Append(", "); } - if (namedArgs.Count > 0) + if (NamedArguments.Count > 0) sb.Append(", "); - for (int j = 0; j < namedArgs.Count; j++) + for (int j = 0; j < NamedArguments.Count; j++) { - sb.Append(namedArgs[j].ToString()); - if (j + 1 < namedArgs.Count) + sb.Append(NamedArguments[j].ToString()); + if (j + 1 < NamedArguments.Count) sb.Append(", "); } sb.Append(")]");