perf: eliminate closure and Func creation

TimothyMakkison · TimothyMakkison · commit cd5418d4e111 · 2026-01-19T11:12:06.000Z
diff --git a/TUnit.Core/ContextProvider.cs b/TUnit.Core/ContextProvider.cs
@@ -63,17 +63,20 @@ public AssemblyHookContext GetOrCreateAssemblyContext(Assembly assembly)
     /// <summary>
     /// Gets or creates a class context
     /// </summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2111",
+        Justification = "Type parameter is annotated at the method boundary.")]
     public ClassHookContext GetOrCreateClassContext(
         [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicMethods)]
         Type classType)
     {
-        return _classContexts.GetOrAdd(classType, type =>
+        return _classContexts.GetOrAdd(classType, static ([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicMethods)]
+            type, state) =>
         {
-            return new ClassHookContext(GetOrCreateAssemblyContext(classType.Assembly))
+            return new ClassHookContext(state.GetOrCreateAssemblyContext(type.Assembly))
             {
-                ClassType = classType
+                ClassType = type
             };
-        });
+        }, this);
     }
 
     /// <summary>
diff --git a/TUnit.Engine/Discovery/ReflectionTestDataCollector.cs b/TUnit.Engine/Discovery/ReflectionTestDataCollector.cs
@@ -170,15 +170,15 @@ public async IAsyncEnumerable<TestMetadata> CollectTestsStreamingAsync(
             // Stream tests from this assembly
             await foreach (var test in DiscoverTestsInAssemblyStreamingAsync(assembly, cancellationToken))
             {
-                ImmutableInterlocked.Update(ref _discoveredTests, list => list.Add(test));
+                ImmutableInterlocked.Update(ref _discoveredTests, static (list, test) => list.Add(test), test);
                 yield return test;
             }
         }
 
         // Stream dynamic tests
         await foreach (var dynamicTest in DiscoverDynamicTestsStreamingAsync(testSessionId, cancellationToken))
         {
-            ImmutableInterlocked.Update(ref _discoveredTests, list => list.Add(dynamicTest));
+            ImmutableInterlocked.Update(ref _discoveredTests, static (list, dynamicTest) => list.Add(dynamicTest), dynamicTest);
             yield return dynamicTest;
         }
     }
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet10_0.verified.txt
@@ -419,6 +419,7 @@ namespace
         public .TestSessionContext TestSessionContext { get; }
         public .TestContext CreateTestContext(string testName, [.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  classType, .TestBuilderContext testBuilderContext, .CancellationToken cancellationToken) { }
         public .AssemblyHookContext GetOrCreateAssemblyContext(.Assembly assembly) { }
+        [.("Trimming", "IL2111", Justification="Type parameter is annotated at the method boundary.")]
         public .ClassHookContext GetOrCreateClassContext([.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  classType) { }
     }
     public class CultureExecutor : .DedicatedThreadExecutor
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet8_0.verified.txt
@@ -419,6 +419,7 @@ namespace
         public .TestSessionContext TestSessionContext { get; }
         public .TestContext CreateTestContext(string testName, [.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  classType, .TestBuilderContext testBuilderContext, .CancellationToken cancellationToken) { }
         public .AssemblyHookContext GetOrCreateAssemblyContext(.Assembly assembly) { }
+        [.("Trimming", "IL2111", Justification="Type parameter is annotated at the method boundary.")]
         public .ClassHookContext GetOrCreateClassContext([.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  classType) { }
     }
     public class CultureExecutor : .DedicatedThreadExecutor
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.DotNet9_0.verified.txt
@@ -419,6 +419,7 @@ namespace
         public .TestSessionContext TestSessionContext { get; }
         public .TestContext CreateTestContext(string testName, [.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  classType, .TestBuilderContext testBuilderContext, .CancellationToken cancellationToken) { }
         public .AssemblyHookContext GetOrCreateAssemblyContext(.Assembly assembly) { }
+        [.("Trimming", "IL2111", Justification="Type parameter is annotated at the method boundary.")]
         public .ClassHookContext GetOrCreateClassContext([.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..PublicMethods | ..PublicProperties)]  classType) { }
     }
     public class CultureExecutor : .DedicatedThreadExecutor
diff --git a/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt b/TUnit.PublicAPI/Tests.Core_Library_Has_No_API_Changes.Net4_7.verified.txt
@@ -399,6 +399,7 @@ namespace
         public .TestSessionContext TestSessionContext { get; }
         public .TestContext CreateTestContext(string testName,  classType, .TestBuilderContext testBuilderContext, .CancellationToken cancellationToken) { }
         public .AssemblyHookContext GetOrCreateAssemblyContext(.Assembly assembly) { }
+        [.("Trimming", "IL2111", Justification="Type parameter is annotated at the method boundary.")]
         public .ClassHookContext GetOrCreateClassContext( classType) { }
     }
     public class CultureExecutor : .DedicatedThreadExecutor

Original file line number	Diff line number	Diff line change
`@@ -63,17 +63,20 @@ public AssemblyHookContext GetOrCreateAssemblyContext(Assembly assembly)`
`63`	`63`	`/// <summary>`
`64`	`64`	`/// Gets or creates a class context`
`65`	`65`	`/// </summary>`
	`66`	`+ [UnconditionalSuppressMessage("Trimming", "IL2111",`
	`67`	`+ Justification = "Type parameter is annotated at the method boundary.")]`
`66`	`68`	`public ClassHookContext GetOrCreateClassContext(`
`67`	`69`	`[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors \| DynamicallyAccessedMemberTypes.PublicProperties \| DynamicallyAccessedMemberTypes.PublicMethods)]`
`68`	`70`	`Type classType)`
`69`	`71`	`{`
`70`		`- return _classContexts.GetOrAdd(classType, type =>`
	`72`	`+ return _classContexts.GetOrAdd(classType, static ([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors \| DynamicallyAccessedMemberTypes.PublicProperties \| DynamicallyAccessedMemberTypes.PublicMethods)]`
	`73`	`+ type, state) =>`
`71`	`74`	`{`
`72`		`- return new ClassHookContext(GetOrCreateAssemblyContext(classType.Assembly))`
	`75`	`+ return new ClassHookContext(state.GetOrCreateAssemblyContext(type.Assembly))`
`73`	`76`	`{`
`74`		`- ClassType = classType`
	`77`	`+ ClassType = type`
`75`	`78`	`};`
`76`		`- });`
	`79`	`+ }, this);`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -170,15 +170,15 @@ public async IAsyncEnumerable<TestMetadata> CollectTestsStreamingAsync(`
`170`	`170`	`// Stream tests from this assembly`
`171`	`171`	`await foreach (var test in DiscoverTestsInAssemblyStreamingAsync(assembly, cancellationToken))`
`172`	`172`	`{`
`173`		`- ImmutableInterlocked.Update(ref _discoveredTests, list => list.Add(test));`
	`173`	`+ ImmutableInterlocked.Update(ref _discoveredTests, static (list, test) => list.Add(test), test);`
`174`	`174`	`yield return test;`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`// Stream dynamic tests`
`179`	`179`	`await foreach (var dynamicTest in DiscoverDynamicTestsStreamingAsync(testSessionId, cancellationToken))`
`180`	`180`	`{`
`181`		`- ImmutableInterlocked.Update(ref _discoveredTests, list => list.Add(dynamicTest));`
	`181`	`+ ImmutableInterlocked.Update(ref _discoveredTests, static (list, dynamicTest) => list.Add(dynamicTest), dynamicTest);`
`182`	`182`	`yield return dynamicTest;`
`183`	`183`	`}`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,7 @@ namespace`
`419`	`419`	`public .TestSessionContext TestSessionContext { get; }`
`420`	`420`	`public .TestContext CreateTestContext(string testName, [.(..None \| ..PublicParameterlessConstructor \| ..PublicConstructors \| ..PublicMethods \| ..PublicProperties)] classType, .TestBuilderContext testBuilderContext, .CancellationToken cancellationToken) { }`
`421`	`421`	`public .AssemblyHookContext GetOrCreateAssemblyContext(.Assembly assembly) { }`
	`422`	`+ [.("Trimming", "IL2111", Justification="Type parameter is annotated at the method boundary.")]`
`422`	`423`	`public .ClassHookContext GetOrCreateClassContext([.(..None \| ..PublicParameterlessConstructor \| ..PublicConstructors \| ..PublicMethods \| ..PublicProperties)] classType) { }`
`423`	`424`	`}`
`424`	`425`	`public class CultureExecutor : .DedicatedThreadExecutor`
Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ namespace`
`399`	`399`	`public .TestSessionContext TestSessionContext { get; }`
`400`	`400`	`public .TestContext CreateTestContext(string testName, classType, .TestBuilderContext testBuilderContext, .CancellationToken cancellationToken) { }`
`401`	`401`	`public .AssemblyHookContext GetOrCreateAssemblyContext(.Assembly assembly) { }`
	`402`	`+ [.("Trimming", "IL2111", Justification="Type parameter is annotated at the method boundary.")]`
`402`	`403`	`public .ClassHookContext GetOrCreateClassContext( classType) { }`
`403`	`404`	`}`
`404`	`405`	`public class CultureExecutor : .DedicatedThreadExecutor`