Skip to content

Understand String.Empty #2653

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
merged 1 commit into from
Feb 25, 2022
Merged

Understand String.Empty #2653

Show file tree
Hide file tree
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
9 changes: 8 additions & 1 deletion src/ILLink.RoslynAnalyzer/TrimAnalysis/TrimAnalysisVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,14 @@ public override MultiValue VisitInstanceReference (IInstanceReferenceOperation i

public override MultiValue VisitFieldReference (IFieldReferenceOperation fieldRef, StateValue state)
{
return fieldRef.Field.Type.IsTypeInterestingForDataflow () ? new FieldValue (fieldRef.Field) : TopValue;
if (!fieldRef.Field.Type.IsTypeInterestingForDataflow ())
return TopValue;

var field = fieldRef.Field;
if (field.Name is "Empty" && field.ContainingType.HasName ("System.String"))
return new KnownStringValue (string.Empty);

return new FieldValue (fieldRef.Field);
}

public override MultiValue VisitTypeOf (ITypeOfOperation typeOfOperation, StateValue state)
Expand Down
5 changes: 3 additions & 2 deletions test/ILLink.RoslynAnalyzer.Tests/DataFlowTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,11 @@ public Task GetNestedTypeOnAllAnnotatedType ()
return RunTest (allowMissingWarnings: true);
}

[Fact (Skip = "https://github.com/dotnet/linker/issues/2273")]
[Fact]
public Task GetTypeDataFlow ()
{
return RunTest (nameof (GetTypeDataFlow));
// https://github.com/dotnet/linker/issues/2273
return RunTest (allowMissingWarnings: true);
}

[Fact]
Expand Down
13 changes: 13 additions & 0 deletions test/Mono.Linker.Tests.Cases/DataFlow/FieldDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public static void Main ()
instance.WriteUnknownValue ();

_ = _annotationOnWrongType;

TestStringEmpty ();
}

[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
Expand Down Expand Up @@ -148,6 +150,17 @@ static void MakeArrayValuesUnknown (object[] array)
}
}

private static void TestStringEmpty ()
{
RequirePublicMethods (string.Empty);
}

private static void RequirePublicMethods (
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicMethods)]
string s)
{
}

private static void RequirePublicParameterlessConstructor (
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
Type type)
Expand Down