Fixed errors after merge upstream.

Author: timcassell

src/BenchmarkDotNet/Templates/BenchmarkType.txt

@@ -1,5 +1,5 @@
     // the type name must be in sync with WindowsDisassembler.BuildArguments
-    public unsafe class Runnable_$ID$ : global::$WorkloadTypeName$
+    public unsafe partial class Runnable_$ID$ : global::$WorkloadTypeName$
     {
         public static void Run(BenchmarkDotNet.Engines.IHost host, System.String benchmarkName)
         {
@@ -57,16 +57,14 @@
 
         public Runnable_$ID$()
         {
-#if RETURNS_AWAITABLE_$ID$
-            continuation = __Continuation;
-#endif
             globalSetupAction = $GlobalSetupMethodName$;
             globalCleanupAction = $GlobalCleanupMethodName$;
             iterationSetupAction = $IterationSetupMethodName$;
             iterationCleanupAction = $IterationCleanupMethodName$;
             overheadDelegate = __Overhead;
             workloadDelegate = $WorkloadMethodDelegate$;
             $InitializeArgumentFields$
+            __SetContinuation();
         }
 
         private System.Func<System.Threading.Tasks.ValueTask> globalSetupAction;
@@ -112,14 +110,18 @@
             $OverheadImplementation$
         }
 
+        partial void __SetContinuation();
+
 #if RETURNS_AWAITABLE_$ID$
 
         private readonly BenchmarkDotNet.Helpers.AutoResetValueTaskSource<Perfolizer.Horology.ClockSpan> valueTaskSource = new BenchmarkDotNet.Helpers.AutoResetValueTaskSource<Perfolizer.Horology.ClockSpan>();
         private System.Int64 repeatsRemaining;
-        private readonly System.Action continuation;
+        private System.Action continuation;
         private Perfolizer.Horology.StartedClock startedClock;
         private $AwaiterTypeName$ currentAwaiter;
 
+        partial void __SetContinuation() => continuation = __Continuation;
+
         // Awaits are not unrolled.
 #if NETCOREAPP3_0_OR_GREATER
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveOptimization)]

src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Emitters/ConsumableConsumeEmitter.cs

@@ -70,7 +70,7 @@ protected override void EmitDisassemblyDiagnoserReturnDefaultOverride(ILGenerato
             ilBuilder.EmitReturnDefault(ConsumableInfo.WorkloadMethodReturnType, disassemblyDiagnoserLocal);
         }
 
-        protected override void OnEmitCtorBodyOverride(ConstructorBuilder constructorBuilder, ILGenerator ilBuilder)
+        protected override void OnEmitCtorBodyOverride(ConstructorBuilder constructorBuilder, ILGenerator ilBuilder, RunnableEmitter runnableEmitter)
         {
             var ctor = typeof(Consumer).GetConstructor(Array.Empty<Type>());
             if (ctor == null)

src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Emitters/ConsumeEmitter.cs

@@ -104,14 +104,14 @@ protected virtual void OnEmitMembersOverride(TypeBuilder runnableBuilder)
         {
         }
 
-        public void OnEmitCtorBody(ConstructorBuilder constructorBuilder, ILGenerator ilBuilder)
+        public void OnEmitCtorBody(ConstructorBuilder constructorBuilder, ILGenerator ilBuilder, RunnableEmitter runnableEmitter)
         {
             AssertNoBuilder();
 
-            OnEmitCtorBodyOverride(constructorBuilder, ilBuilder);
+            OnEmitCtorBodyOverride(constructorBuilder, ilBuilder, runnableEmitter);
         }
 
-        protected virtual void OnEmitCtorBodyOverride(ConstructorBuilder constructorBuilder, ILGenerator ilBuilder)
+        protected virtual void OnEmitCtorBodyOverride(ConstructorBuilder constructorBuilder, ILGenerator ilBuilder, RunnableEmitter runnableEmitter)
         {
         }
 

src/BenchmarkDotNet/Toolchains/InProcess.Emit.Implementation/Emitters/RunnableEmitter.cs

@@ -890,7 +890,7 @@ private void EmitCtorBody()
 
             ilBuilder.EmitCallBaseParameterlessCtor(ctorMethod);
 
-            consumeEmitter.OnEmitCtorBody(ctorMethod, ilBuilder);
+            consumeEmitter.OnEmitCtorBody(ctorMethod, ilBuilder, this);
 
             ilBuilder.EmitSetDelegateToThisField(globalSetupActionField, globalSetupMethod);
             ilBuilder.EmitSetDelegateToThisField(globalCleanupActionField, globalCleanupMethod);