Fix handling generic custom attributes (#78304)

github-actions[bot] · MichalStrehovsky · web-flow · commit 5d71b4c5b50a · 2022-11-15T08:20:15.000-08:00
Fixes #78200. Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/CustomAttributes/NativeFormat/NativeFormatCustomAttributeData.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/CustomAttributes/NativeFormat/NativeFormatCustomAttributeData.cs
@@ -120,7 +120,7 @@ internal sealed override IList<CustomAttributeTypedArgument> GetConstructorArgum
             {
                 Handle typeHandle = ctorTypeHandles[index];
                 Exception? exception = null;
-                RuntimeTypeInfo? argumentType = typeHandle.TryResolve(_reader, new TypeContext(null, null), ref exception);
+                RuntimeTypeInfo? argumentType = typeHandle.TryResolve(_reader, AttributeType.CastToRuntimeTypeInfo().TypeContext, ref exception);
                 if (argumentType == null)
                 {
                     if (throwIfMissingMetadata)
@@ -162,7 +162,7 @@ internal sealed override IList<CustomAttributeNamedArgument> GetNamedArguments(b
                 bool isField = (namedArgument.Flags == NamedArgumentMemberKind.Field);
 
                 Exception? exception = null;
-                RuntimeTypeInfo? argumentType = namedArgument.Type.TryResolve(_reader, new TypeContext(null, null), ref exception);
+                RuntimeTypeInfo? argumentType = namedArgument.Type.TryResolve(_reader, AttributeType.CastToRuntimeTypeInfo().TypeContext, ref exception);
                 if (argumentType == null)
                 {
                     if (throwIfMissingMetadata)

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ internal sealed override IList<CustomAttributeTypedArgument> GetConstructorArgum`
`120`	`120`	`{`
`121`	`121`	`Handle typeHandle = ctorTypeHandles[index];`
`122`	`122`	`Exception? exception = null;`
`123`		`- RuntimeTypeInfo? argumentType = typeHandle.TryResolve(_reader, new TypeContext(null, null), ref exception);`
	`123`	`+ RuntimeTypeInfo? argumentType = typeHandle.TryResolve(_reader, AttributeType.CastToRuntimeTypeInfo().TypeContext, ref exception);`
`124`	`124`	`if (argumentType == null)`
`125`	`125`	`{`
`126`	`126`	`if (throwIfMissingMetadata)`
`@@ -162,7 +162,7 @@ internal sealed override IList<CustomAttributeNamedArgument> GetNamedArguments(b`
`162`	`162`	`bool isField = (namedArgument.Flags == NamedArgumentMemberKind.Field);`
`163`	`163`
`164`	`164`	`Exception? exception = null;`
`165`		`- RuntimeTypeInfo? argumentType = namedArgument.Type.TryResolve(_reader, new TypeContext(null, null), ref exception);`
	`165`	`+ RuntimeTypeInfo? argumentType = namedArgument.Type.TryResolve(_reader, AttributeType.CastToRuntimeTypeInfo().TypeContext, ref exception);`
`166`	`166`	`if (argumentType == null)`
`167`	`167`	`{`
`168`	`168`	`if (throwIfMissingMetadata)`