Fix CustomAttributeData in the presence of generic attributes #56879
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Generic attributes need to force the actual exact method to be loaded not just the canonical scenario - GenericAttribute testing had been disabled due to dotnet/msbuild#6734 - Move GenericAttribute test project to Pri0 as its the only generic custom attribute runtime testing that will occur before .NET 6.0 ships
src/tests/reflection/GenericAttribute/GenericAttributeMetadata.il
Outdated
Show resolved
Hide resolved
src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeCustomAttributeData.cs
Outdated
Show resolved
Hide resolved
steveharter
approved these changes
Aug 5, 2021
| @@ -273,6 +273,13 @@ private RuntimeCustomAttributeData(RuntimeModule scope, MetadataToken caCtorToke | |||
| m_scope = scope; | |||
| m_ctor = (RuntimeConstructorInfo)RuntimeType.GetMethodBase(scope, caCtorToken)!; | |||
|
|
|||
| if (m_ctor!.DeclaringType!.IsGenericType) | |||
There was a problem hiding this comment.
nit: I don't think the ! is needed for m_ctor
There was a problem hiding this comment.
It appears this is optimized for the non-generic case, since in the generic case we re-set m_ctor. However, without measuring perf, the current approach might be better than getting the "is generic" information from scope.ResolveType(...).IsGenericType and only setting m_ctor once.
There was a problem hiding this comment.
Correct, this is optimized for the non-generic case, and is probably non-ideal for the generic case. OTOH, the non-generic case is the perf critical case, so this should be a pretty good result.
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #56492