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

…109392)" (#109520) This reverts commit ed77814. Fixes a timeout in CLR_Tools_Tests.
dotnet · Nov 4, 2024 · 10af5e0 · 10af5e0
1 parent 43b5280
commit 10af5e0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 73 deletions.
diff --git a/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/GenericArgumentDataFlow.cs b/src/tools/illink/src/ILLink.RoslynAnalyzer/TrimAnalysis/GenericArgumentDataFlow.cs
@@ -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)
@@ -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;
 
@@ -67,8 +64,6 @@ public static bool RequiresGenericArgumentDataFlow (INamedTypeSymbol type)
 						&& RequiresGenericArgumentDataFlow (namedTypeSymbol))
 						return true;
 				}
-
-				type = type.ContainingType;
 			}
 
 			return false;

diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/RequiresCapabilityTests.cs b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/RequiresCapabilityTests.cs
@@ -64,12 +64,6 @@ public Task RequiresInLibraryAssembly ()
 			return RunTest ();
 		}
 
-		[Fact]
-		public Task RequiresInRootAllAssembly ()
-		{
-			return RunTest ();
-		}
-
 		[Fact]
 		public Task RequiresOnAttribute ()
 		{

diff --git a/...Analyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/DataFlowTests.g.cs b/...Analyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/DataFlowTests.g.cs
@@ -31,12 +31,6 @@ public Task MethodByRefParameterDataFlow ()
 			return RunTest (allowMissingWarnings: true);
 		}
 
-		[Fact]
-		public Task ModifierDataFlow ()
-		{
-			return RunTest (allowMissingWarnings: true);
-		}
-
 		[Fact]
 		public Task StaticInterfaceMethodDataflow ()
 		{

diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/GenericParameterDataFlow.cs
@@ -48,7 +48,6 @@ public static void Main ()
 
 			TestNoWarningsInRUCMethod<TestType> ();
 			TestNoWarningsInRUCType<TestType, TestType> ();
-			TestGenericParameterFlowsToNestedType.Test ();
 		}
 
 		static void TestSingleGenericParameterOnType ()
@@ -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>