Skip to content

[release/7.0] Fix handling generic custom attributes #78304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 1 commit into from
Nov 15, 2022
Merged

[release/7.0] Fix handling generic custom attributes #78304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix handling generic custom attributes 
Fixes #78200.
  • Loading branch information
@MichalStrehovsky
MichalStrehovsky authored and github-actions committed Nov 14, 2022
commit 3678f40de356b7c79355f1533408b89d24e8ba92
4 changes: 2 additions & 2 deletions ...ystem/Reflection/Runtime/CustomAttributes/NativeFormat/NativeFormatCustomAttributeData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down