Skip to content

Fix NullabilityInfoContext.Create to properly analyze types with nested generic types #63556

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 3 commits into from
Jan 18, 2022
Merged

Fix NullabilityInfoContext.Create to properly analyze types with nested generic types #63556

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39b7ef6
Fix to make index ref
Shane32 Jan 9, 2022
186ba9d
Update src/libraries/System.Private.CoreLib/src/System/Reflection/Nul…
Shane32 Jan 9, 2022
0c7d5d7
Add some tests
Shane32 Jan 16, 2022
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
43 changes: 23 additions & 20 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 @@ -341,10 +341,13 @@ private NotAnnotatedStatus PopulateAnnotationInfo(IList<CustomAttributeData> cus
return NotAnnotatedStatus.None;
}

private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes) =>
GetNullabilityInfo(memberInfo, type, customAttributes, 0);
private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes)
{
int index = 0;
return GetNullabilityInfo(memberInfo, type, customAttributes, ref index);
}

private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes, int index)
private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, IList<CustomAttributeData> customAttributes, ref int index)
{
NullabilityState state = NullabilityState.Unknown;
NullabilityInfo? elementState = null;
Expand All @@ -364,17 +367,22 @@ private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, ILi
underlyingType = type;
state = NullabilityState.NotNull;
}

if (underlyingType.IsGenericType)
{
index++;
}
}
else
{
if (!ParseNullableState(customAttributes, index, ref state))
if (!ParseNullableState(customAttributes, index++, ref state))
{
state = GetNullableContext(memberInfo);
}

if (type.IsArray)
{
elementState = GetNullabilityInfo(memberInfo, type.GetElementType()!, customAttributes, index + 1);
elementState = GetNullabilityInfo(memberInfo, type.GetElementType()!, customAttributes, ref index);
}
}

Expand All @@ -383,16 +391,9 @@ private NullabilityInfo GetNullabilityInfo(MemberInfo memberInfo, Type type, ILi
Type[] genericArguments = underlyingType.GetGenericArguments();
genericArgumentsState = new NullabilityInfo[genericArguments.Length];

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

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

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

Expand Down Expand Up @@ -424,10 +425,10 @@ private static bool ParseNullableState(IList<CustomAttributeData> customAttribut
else if (o is ReadOnlyCollection<CustomAttributeTypedArgument> args &&
index < args.Count &&
args[index].Value is byte elementB)
{
state = TranslateByte(elementB);
return true;
}
{
state = TranslateByte(elementB);
return true;
}
Comment thread
Shane32 marked this conversation as resolved.
Outdated

break;
}
Expand Down Expand Up @@ -500,7 +501,8 @@ private void CheckGenericParameters(NullabilityInfo nullability, MemberInfo meta
{
if (genericArguments[i].IsGenericParameter)
{
NullabilityInfo n = GetNullabilityInfo(metaMember, genericArguments[i], genericArguments[i].GetCustomAttributesData(), i + 1);
int index = i + 1;
NullabilityInfo n = GetNullabilityInfo(metaMember, genericArguments[i], genericArguments[i].GetCustomAttributesData(), ref index);
nullability.GenericTypeArguments[i].ReadState = n.ReadState;
nullability.GenericTypeArguments[i].WriteState = n.WriteState;
}
Expand All @@ -523,7 +525,8 @@ private void UpdateGenericArrayElements(NullabilityInfo? elementState, MemberInf
&& metaType.GetElementType()!.IsGenericParameter)
{
Type elementType = metaType.GetElementType()!;
NullabilityInfo n = GetNullabilityInfo(metaMember, elementType, elementType.GetCustomAttributesData(), 0);
int index = 0;
NullabilityInfo n = GetNullabilityInfo(metaMember, elementType, elementType.GetCustomAttributesData(), ref index);
elementState.ReadState = n.ReadState;
elementState.WriteState = n.WriteState;
}
Expand Down