Add more tests for nested functions

- Suppression on method applies to nested functions
- Suppressions on nested functions don't apply to inner nested functions for linker

Author: sbomer

src/linker/Linker/CompilerGeneratedState.cs

@@ -29,7 +29,6 @@ public CompilerGeneratedState (LinkContext context)
 		static bool HasRoslynCompilerGeneratedName (TypeDefinition type) =>
 			CompilerGeneratedNames.IsGeneratedMemberName (type.Name) || (type.DeclaringType != null && HasRoslynCompilerGeneratedName (type.DeclaringType));
 
-
 		void PopulateCacheForType (TypeDefinition type)
 		{
 			// Avoid repeat scans of the same type

test/Mono.Linker.Tests.Cases/RequiresCapability/RequiresInCompilerGeneratedCode.cs

@@ -681,6 +681,21 @@ static void TestCall ()
 				void LocalFunction () => MethodWithRequires ();
 			}
 
+			[RequiresUnreferencedCode ("Suppress in body")]
+			[RequiresAssemblyFiles ("Suppress in body")]
+			[RequiresDynamicCode ("Suppress in body")]
+			static void TestCallFromNestedLocalFunction ()
+			{
+				LocalFunction ();
+
+				void LocalFunction ()
+				{
+					NestedLocalFunction ();
+
+					void NestedLocalFunction () => MethodWithRequires ();
+				}
+			}
+
 			[RequiresUnreferencedCode ("Suppress in body")]
 			[RequiresAssemblyFiles ("Suppress in body")]
 			[RequiresDynamicCode ("Suppress in body")]
@@ -870,7 +885,7 @@ public static void TestCallMethodWithRequiresInDynamicallyAccessedLocalFunction
 			[ExpectedWarning ("IL2026")]
 			[ExpectedWarning ("IL3002", ProducedBy = ProducedBy.Analyzer)]
 			[ExpectedWarning ("IL3050", ProducedBy = ProducedBy.Analyzer)]
-			static void TestSuppressionLocalFunction ()
+			static void TestSuppressionOnLocalFunction ()
 			{
 				LocalFunction (); // This will produce a warning since the local function has Requires on it
 
@@ -884,6 +899,27 @@ void LocalFunction (Type unknownType = null)
 				}
 			}
 
+			[ExpectedWarning ("IL2026")]
+			[ExpectedWarning ("IL3002", ProducedBy = ProducedBy.Analyzer)]
+			[ExpectedWarning ("IL3050", ProducedBy = ProducedBy.Analyzer)]
+			static void TestSuppressionOnLocalFunctionWithNestedLocalFunction ()
+			{
+				LocalFunction (); // This will produce a warning since the local function has Requires on it
+
+				[RequiresUnreferencedCode ("Suppress in body")]
+				[RequiresAssemblyFiles ("Suppress in body")]
+				[RequiresDynamicCode ("Suppress in body")]
+				void LocalFunction ()
+				{
+					NestedLocalFunction ();
+
+					// The linker doesn't have enough information to associate the RUC on LocalFunction
+					// with this nested local function.
+					[ExpectedWarning ("IL2026", ProducedBy = ProducedBy.Trimmer)]
+					void NestedLocalFunction () => MethodWithRequires ();
+				}
+			}
+
 			[RequiresUnreferencedCode ("Suppress in body")]
 			[RequiresAssemblyFiles ("Suppress in body")]
 			[RequiresDynamicCode ("Suppress in body")]
@@ -939,6 +975,7 @@ static void Outer (int i)
 			public static void Test ()
 			{
 				TestCall ();
+				TestCallFromNestedLocalFunction ();
 				TestCallWithClosure ();
 				TestReflectionAccess ();
 				TestLdftn ();
@@ -954,7 +991,8 @@ public static void Test ()
 				TestCallMethodWithRequiresInLtftnLocalFunction ();
 				DynamicallyAccessedLocalFunction.TestCallMethodWithRequiresInDynamicallyAccessedLocalFunction ();
 				DynamicallyAccessedLocalFunctionUnused.TestCallMethodWithRequiresInDynamicallyAccessedLocalFunction ();
-				TestSuppressionLocalFunction ();
+				TestSuppressionOnLocalFunction ();
+				TestSuppressionOnLocalFunctionWithNestedLocalFunction ();
 				TestSuppressionOnOuterAndLocalFunction ();
 				TestSuppressionOnOuterWithSameName.Test ();
 			}
@@ -1075,6 +1113,16 @@ static void TestCall ()
 				() => MethodWithRequires ();
 			}
 
+			[RequiresUnreferencedCode ("Suppress in body")]
+			[RequiresAssemblyFiles ("Suppress in body")]
+			[RequiresDynamicCode ("Suppress in body")]
+			static void TestCallFromNestedLambda ()
+			{
+				Action lambda = () => {
+					Action nestedLambda = () => MethodWithRequires ();
+				};
+			}
+
 			[RequiresUnreferencedCode ("Suppress in body")]
 			[RequiresAssemblyFiles ("Suppress in body")]
 			[RequiresDynamicCode ("Suppress in body")]
@@ -1192,6 +1240,26 @@ static void TestSuppressionOnLambda ()
 				lambda (); // This will produce a warning since the lambda has Requires on it
 			}
 
+			[ExpectedWarning ("IL2026")]
+			[ExpectedWarning ("IL3002", ProducedBy = ProducedBy.Analyzer)]
+			[ExpectedWarning ("IL3050", ProducedBy = ProducedBy.Analyzer)]
+			static void TestSuppressionOnLambdaWithNestedLambda ()
+			{
+				var lambda =
+				[RequiresUnreferencedCode ("Suppress in body")]
+				[RequiresAssemblyFiles ("Suppress in body")]
+				[RequiresDynamicCode ("Suppress in body")]
+				() => {
+					// The linker doesn't have enough information to associate the RUC on lambda
+					// with this nested lambda.
+					var nestedLambda =
+					[ExpectedWarning ("IL2026", ProducedBy = ProducedBy.Trimmer)]
+					() => MethodWithRequires ();
+				};
+
+				lambda (); // This will produce a warning since the local function has Requires on it
+			}
+
 			[RequiresUnreferencedCode ("Suppress in body")]
 			[RequiresAssemblyFiles ("Suppress in body")]
 			[RequiresDynamicCode ("Suppress in body")]
@@ -1249,6 +1317,7 @@ static void Outer (int i)
 			public static void Test ()
 			{
 				TestCall ();
+				TestCallFromNestedLambda ();
 				TestCallWithReflectionAnalysisWarning ();
 				TestCallWithClosure ();
 				TestReflectionAccess ();
@@ -1259,6 +1328,7 @@ public static void Test ()
 				TestGenericMethodParameterRequirement<TestType> ();
 				TestGenericTypeParameterRequirement<TestType> ();
 				TestSuppressionOnLambda ();
+				TestSuppressionOnLambdaWithNestedLambda ();
 				TestSuppressionOnOuterAndLambda ();
 				TestSuppressionOnOuterWithSameName.Test ();
 			}