Skip to content

Reflection nullability API: improve test coverage, fix bug found #58479

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
buyaa-n merged 5 commits into from
Sep 11, 2021
Merged

Reflection nullability API: improve test coverage, fix bug found #58479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
842e286
Add/remove more tests, fix generics indexing bug
buyaa-n Aug 31, 2021
61f3e09
Use StartsWith instead Contains
buyaa-n Sep 1, 2021
e22d23c
Update to check if GenericType instead ValueTuple
buyaa-n Sep 1, 2021
55bb3ee
Add tests for generic struct
buyaa-n Sep 2, 2021
027ceec
Apply feedback
buyaa-n Sep 3, 2021
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
8 changes: 5 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/Reflection/NullabilityInfoContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,14 @@ private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, ILi

for (int i = 0, offset = 0; i < genericArguments.Length; i++)
{
if (!genericArguments[i].IsValueType)
Type t = Nullable.GetUnderlyingType(genericArguments[i]) ?? genericArguments[i];

if (!t.IsValueType || t.IsGenericType)
{
offset++;
}

genericArgumentsState[i] = GetNullabilityInfo(memberInfo, genericArguments[i], customAttributes, offset);
genericArgumentsState[i] = GetNullabilityInfo(memberInfo, genericArguments[i], customAttributes, index + offset);
}
}

Expand Down Expand Up @@ -480,7 +482,7 @@ private void CheckGenericParameters(NullabilityInfo nullability, MemberInfo meta
{
NullabilityState state = nullability.ReadState;

if (!ParseNullableState(metaType.GetCustomAttributesData(), 0, ref state))
if (state == NullabilityState.NotNull && !ParseNullableState(metaType.GetCustomAttributesData(), 0, ref state))
{
state = GetNullableContext(metaType);
}
Expand Down
Loading