Update Setup/Cleanup IL to match workload.

dotnet · Mar 11, 2022 · e004ec6 · e004ec6
1 parent 9e7c339
commit e004ec6
Showing 1 changed file with 7 additions and 30 deletions.
diff --git a/src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Emitters/RunnableEmitter.cs b/src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Emitters/RunnableEmitter.cs
@@ -971,19 +971,15 @@ private void EmitAwaitableSetupTeardown(
                 IL_0000: call string [BenchmarkDotNet]BenchmarkDotNet.Samples.SampleBenchmark::GlobalCleanup()
                 IL_0005: pop
             */
-            LocalBuilder callResultLocal;
+            ilBuilder.Emit(OpCodes.Ldarg_0);
+            /*
+                IL_0026: ldarg.0
+                IL_0027: ldfld class BenchmarkDotNet.Helpers.AwaitHelper BenchmarkDotNet.Helpers.Runnable_0::awaitHelper
+            */
+            ilBuilder.Emit(OpCodes.Ldarg_0);
+            ilBuilder.Emit(OpCodes.Ldfld, awaitHelperField);
             if (targetMethod.IsStatic)
             {
-                ilBuilder.Emit(OpCodes.Ldarg_0);
-                var callResultType = returnTypeInfo.OriginMethodReturnType;
-
-                /*
-                    .locals init (
-                        [0] class [System.Private.CoreLib]System.Threading.Tasks.Task task
-                    )
-                 */
-                callResultLocal = ilBuilder.DeclareLocal(callResultType);
-
                 ilBuilder.Emit(OpCodes.Call, targetMethod);
 
             }
@@ -994,33 +990,14 @@ [0] class [System.Private.CoreLib]System.Threading.Tasks.Task task
             }
             else
             {
-                ilBuilder.Emit(OpCodes.Ldarg_0);
-                var callResultType = returnTypeInfo.OriginMethodReturnType;
-
-                /*
-                    .locals init (
-                        [0] class [System.Private.CoreLib]System.Threading.Tasks.Task task
-                    )
-                 */
-                callResultLocal = ilBuilder.DeclareLocal(callResultType);
-
                 ilBuilder.Emit(OpCodes.Ldarg_0);
                 ilBuilder.Emit(OpCodes.Call, targetMethod);
             }
 
             /*
                 // awaitHelper.GetResult(...);
-                IL_0006: stloc.0
-                IL_0007: ldarg.0
-                IL_0008: ldfld class BenchmarkDotNet.Helpers.AwaitHelper BenchmarkDotNet.Helpers.Runnable_0::awaitHelper
-                IL_000d: ldloc.0
                 IL_000e: callvirt instance void BenchmarkDotNet.Helpers.AwaitHelper::GetResult(class [System.Private.CoreLib]System.Threading.Tasks.Task)
             */
-
-            ilBuilder.EmitStloc(callResultLocal);
-            ilBuilder.Emit(OpCodes.Ldarg_0);
-            ilBuilder.Emit(OpCodes.Ldfld, awaitHelperField);
-            ilBuilder.Emit(OpCodes.Ldloc_0);
             ilBuilder.Emit(OpCodes.Callvirt, returnTypeInfo.GetResultMethod);
 
             if (targetMethod.ReturnType != typeof(void))