[release/9.0] Fix RunClassConstructor trim warning for Nullable<T> (#…

…107039) * Clean up RunClassConstructor test - Fix test name - Run it in ILC tests - Check warnings in analyzer tests * Fix RunClassConstructor intrinsic for Nullable<T> --------- Co-authored-by: Jeff Schwartz <[email protected]>
dotnet · Sep 4, 2024 · af1b39a · af1b39a
1 parent ea363cc
commit af1b39a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/TestCases/TestSuites.cs b/src/coreclr/tools/aot/ILCompiler.Trimming.Tests/TestCases/TestSuites.cs
@@ -74,6 +74,7 @@ public void Reflection (string t)
 			case "ParametersUsedViaReflection":
 			case "UnsafeAccessor":
 			case "TypeUsedViaReflection":
+			case "RunClassConstructor":
 				Run (t);
 				break;
 			default:

diff --git a/src/tools/illink/src/ILLink.Shared/TrimAnalysis/HandleCallAction.cs b/src/tools/illink/src/ILLink.Shared/TrimAnalysis/HandleCallAction.cs
@@ -293,6 +293,8 @@ ValueWithDynamicallyAccessedMembers valueWithDynamicallyAccessedMembers
 					} else if (typeHandleValue is RuntimeTypeHandleForValueWithDynamicallyAccessedMembers damAnnotatedHandle
 						&& (damAnnotatedHandle.UnderlyingTypeValue.DynamicallyAccessedMemberTypes & DynamicallyAccessedMemberTypes.NonPublicConstructors) != 0) {
 						// No action needed, NonPublicConstructors keeps the static constructor on the type
+					} else if (typeHandleValue is RuntimeTypeHandleForNullableSystemTypeValue) {
+						// No action needed, RunClassConstructor does not run the class constructor of the underlying type of Nullable<T>
 					} else {
 						_diagnosticContext.AddDiagnostic (DiagnosticId.UnrecognizedTypeInRuntimeHelpersRunClassConstructor, calledMethod.GetDisplayName ());
 					}

diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ReflectionTests.cs b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ReflectionTests.cs
@@ -160,6 +160,12 @@ public Task PropertiesUsedViaReflection ()
 			return RunTest ();
 		}
 
+		[Fact]
+		public Task RunClassConstructor ()
+		{
+			return RunTest ();
+		}
+
 		[Fact]
 		public Task RuntimeReflectionExtensionsCalls ()
 		{

diff --git a/...alyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/ReflectionTests.g.cs b/...alyzer.Tests.Generator/ILLink.RoslynAnalyzer.Tests.TestCaseGenerator/ReflectionTests.g.cs
@@ -55,12 +55,6 @@ public Task ParametersUsedViaReflection ()
 			return RunTest (allowMissingWarnings: true);
 		}
 
-		[Fact]
-		public Task RunClassConstructorUsedViaReflection ()
-		{
-			return RunTest (allowMissingWarnings: true);
-		}
-
 		[Fact]
 		public Task TypeHierarchyLibraryModeSuppressions ()
 		{

diff --git a/...n/RunClassConstructorUsedViaReflection.cs → ...s.Cases/Reflection/RunClassConstructor.cs b/...n/RunClassConstructorUsedViaReflection.cs → ...s.Cases/Reflection/RunClassConstructor.cs
@@ -8,7 +8,7 @@ namespace Mono.Linker.Tests.Cases.Reflection
 {
 	[SetupCSharpCompilerToUse ("csc")]
 	[ExpectedNoWarnings]
-	public class RunClassConstructorUsedViaReflection
+	public class RunClassConstructor
 	{
 		public static void Main ()
 		{
@@ -21,6 +21,7 @@ public static void Main ()
 			TestPublicConstructorDataFlowType ();
 			TestIfElseUsingRuntimeTypeHandle (1);
 			TestIfElseUsingType (1);
+			TestNullableValueType ();
 		}
 
 		[Kept]
@@ -125,6 +126,12 @@ static void TestIfElseUsingType (int i)
 			RuntimeHelpers.RunClassConstructor (myType.TypeHandle);
 		}
 
+		[Kept]
+		static void TestNullableValueType ()
+		{
+			RuntimeHelpers.RunClassConstructor (typeof (int?).TypeHandle);
+		}
+
 		[Kept]
 		[KeptMember (".cctor()")]
 		class OnlyUsedViaReflection