Skip to content

Revert "Fix missing analyzer warning for generics in containing type" #109520

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
sbomer merged 1 commit into from
Nov 4, 2024
Merged

Revert "Fix missing analyzer warning for generics in containing type" #109520

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: 2 additions & 7 deletions src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/GenericArgumentDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ internal static class GenericArgumentDataFlow
{
public static void ProcessGenericArgumentDataFlow (Location location, INamedTypeSymbol type, Action<Diagnostic> reportDiagnostic)
{
while (type is { IsGenericType: true }) {
ProcessGenericArgumentDataFlow (location, type.TypeArguments, type.TypeParameters, reportDiagnostic);
type = type.ContainingType;
}
ProcessGenericArgumentDataFlow (location, type.TypeArguments, type.TypeParameters, reportDiagnostic);
}

public static void ProcessGenericArgumentDataFlow (Location location, IMethodSymbol method, Action<Diagnostic> reportDiagnostic)
Expand Down Expand Up @@ -58,7 +55,7 @@ static void ProcessGenericArgumentDataFlow (

public static bool RequiresGenericArgumentDataFlow (INamedTypeSymbol type)
{
while (type is { IsGenericType: true }) {
if (type.IsGenericType) {
if (RequiresGenericArgumentDataFlow (type.TypeParameters))
return true;

Expand All @@ -67,8 +64,6 @@ public static bool RequiresGenericArgumentDataFlow (INamedTypeSymbol type)
&& RequiresGenericArgumentDataFlow (namedTypeSymbol))
return true;
}

type = type.ContainingType;
}

return false;
Expand Down
6 changes: 0 additions & 6 deletions src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/RequiresCapabilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ public Task RequiresInLibraryAssembly ()
return RunTest ();
}

[Fact]
public Task RequiresInRootAllAssembly ()
{
return RunTest ();
}

[Fact]
public Task RequiresOnAttribute ()
{
Expand Down
6 changes: 0 additions & 6 deletions ...Analyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/DataFlowTests.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ public Task MethodByRefParameterDataFlow ()
return RunTest (allowMissingWarnings: true);
}

[Fact]
public Task ModifierDataFlow ()
{
return RunTest (allowMissingWarnings: true);
}

[Fact]
public Task StaticInterfaceMethodDataflow ()
{
Expand Down
54 changes: 0 additions & 54 deletions src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ public static void Main ()

TestNoWarningsInRUCMethod<TestType> ();
TestNoWarningsInRUCType<TestType, TestType> ();
TestGenericParameterFlowsToNestedType.Test ();
}

static void TestSingleGenericParameterOnType ()
Expand Down Expand Up @@ -850,59 +849,6 @@ static void TestNoWarningsInRUCType<T, U> ()
rucType.VirtualMethodRequiresPublicMethods<T> ();
}

class TestGenericParameterFlowsToNestedType
{
class Generic<T> {
[ExpectedWarning ("IL2091")]
public T CallNestedMethod () => GenericRequires<T>.Nested.Method ();

[ExpectedWarning ("IL2091")]
public T AccessNestedField () => GenericRequires<T>.Nested.Field;

[ExpectedWarning ("IL2091")]
public T AccessNestedProperty () => GenericRequires<T>.Nested.Property;

[ExpectedWarning ("IL2091")]
public void AccessNestedEvent () => GenericRequires<T>.Nested.Event += null;

[ExpectedWarning ("IL2091")]
public void UseNestedTypeArgument () {
new Generic<GenericRequires<T>.Nested> ();
}

[ExpectedWarning ("IL2091")]
public class DerivedFromNestedType : GenericRequires<T>.Nested
{
[ExpectedWarning ("IL2091")]
public DerivedFromNestedType () {
}
}
}

class GenericRequires<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T> {
public class Nested {
public static T? Method () => default;

public static T? Field = default;

public static T? Property { get; set; } = default;

public static event Action<T>? Event;
}
}

public static void Test ()
{
var instance = new Generic<string> ();
instance.CallNestedMethod ();
instance.AccessNestedField ();
instance.AccessNestedProperty ();
instance.AccessNestedEvent ();
instance.UseNestedTypeArgument ();
new Generic<string>.DerivedFromNestedType ();
}
}

[RequiresUnreferencedCode ("message")]
public class RUCTypeRequiresPublicFields<
[DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.PublicFields)] T>
Expand Down