Removed workload return types from code gen.

Author: timcassell

Diff for: src/BenchmarkDotNet/Code/CodeGenerator.cs

@@ -37,16 +37,12 @@ internal static string Generate(BuildPartition buildPartition)
 
                 string passArguments = GetPassArguments(benchmark);
 
-                string compilationId = $"{provider.ReturnsDefinition}_{buildInfo.Id}";
-
                 AddNonEmptyUnique(additionalLogic, benchmark.Descriptor.AdditionalLogic);
 
                 string benchmarkTypeCode = new SmartStringBuilder(ResourceHelper.LoadTemplate("BenchmarkType.txt"))
                     .Replace("$ID$", buildInfo.Id.ToString())
                     .Replace("$OperationsPerInvoke$", provider.OperationsPerInvoke)
                     .Replace("$WorkloadTypeName$", provider.WorkloadTypeName)
-                    .Replace("$WorkloadMethodReturnType$", provider.WorkloadMethodReturnTypeName)
-                    .Replace("$WorkloadMethodReturnTypeModifiers$", provider.WorkloadMethodReturnTypeModifiers)
                     .Replace("$GlobalSetupMethodName$", provider.GlobalSetupMethodName)
                     .Replace("$GlobalCleanupMethodName$", provider.GlobalCleanupMethodName)
                     .Replace("$IterationSetupMethodName$", provider.IterationSetupMethodName)
@@ -61,7 +57,7 @@ internal static string Generate(BuildPartition buildPartition)
                     .Replace("$MeasureExtraStats$", buildInfo.Config.HasExtraStatsDiagnoser() ? "true" : "false")
                     .Replace("$DisassemblerEntryMethodName$", DisassemblerConstants.DisassemblerEntryMethodName)
                     .Replace("$WorkloadMethodCall$", provider.GetWorkloadMethodCall(passArguments))
-                    .RemoveRedundantIfDefines(compilationId);
+                    .ToString();
 
                 benchmarkTypeCode = Unroll(benchmarkTypeCode, benchmark.Job.ResolveValue(RunMode.UnrollFactorCharacteristic, EnvironmentResolver.Instance));
 
@@ -301,31 +297,6 @@ public SmartStringBuilder Replace(string oldValue, string? newValue)
                 return this;
             }
 
-            public string RemoveRedundantIfDefines(string id)
-            {
-                var oldLines = builder.ToString().Split('\n');
-                var newLines = new List<string>();
-                bool keepAdding = true;
-
-                foreach (string line in oldLines)
-                {
-                    if (line.StartsWith("#if RETURNS") || line.StartsWith("#elif RETURNS"))
-                    {
-                        keepAdding = line.Contains(id);
-                    }
-                    else if (line.StartsWith("#endif // RETURNS"))
-                    {
-                        keepAdding = true;
-                    }
-                    else if (keepAdding)
-                    {
-                        newLines.Add(line);
-                    }
-                }
-
-                return string.Join("\n", newLines);
-            }
-
             public override string ToString() => builder.ToString();
         }
     }

Diff for: src/BenchmarkDotNet/Templates/BenchmarkType.txt

@@ -127,6 +127,13 @@
             }
         }
 
+        // Prevent inlining the method invoke.
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)]
+        private void __WorkloadWrapper($ArgumentsDefinition$)
+        {
+            $WorkloadMethodCall$;
+        }
+
         [System.Runtime.CompilerServices.MethodImpl(BenchmarkDotNet.Portability.CodeGenHelper.AggressiveOptimizationOption)]
         private void WorkloadActionUnroll(System.Int64 invokeCount)
         {
@@ -147,59 +154,6 @@
             }
         }
 
-#if RETURNS_NON_VOID_$ID$
-
-        // Prevent inlining the method invoke.
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)]
-        private $WorkloadMethodReturnType$ __WorkloadWrapper($ArgumentsDefinition$)
-        {
-            return $WorkloadMethodCall$;
-        }
-
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-        public $WorkloadMethodReturnType$ $DisassemblerEntryMethodName$()
-        {
-            if (NotEleven == 11)
-            {
-                $LoadArguments$
-                return $WorkloadMethodCall$;
-            }
-            
-            return default($WorkloadMethodReturnType$);
-        }
-
-#elif RETURNS_BYREF_$ID$
-
-        // Prevent inlining the method invoke.
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)]
-        private $WorkloadMethodReturnTypeModifiers$ $WorkloadMethodReturnType$ __WorkloadWrapper($ArgumentsDefinition$)
-        {
-            return ref $WorkloadMethodCall$;
-        }
-
-        private $WorkloadMethodReturnType$ __disassemblerDefaultValueHolder = default($WorkloadMethodReturnType$);
-        
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-        public $WorkloadMethodReturnTypeModifiers$ $WorkloadMethodReturnType$ $DisassemblerEntryMethodName$()
-        {
-            if (NotEleven == 11)
-            {
-                $LoadArguments$
-                return ref $WorkloadMethodCall$;
-            }
-            
-            return ref __disassemblerDefaultValueHolder;
-        }
-
-#elif RETURNS_VOID_$ID$
-
-        // Prevent inlining the method invoke.
-        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)]
-        private void __WorkloadWrapper($ArgumentsDefinition$)
-        {
-            $WorkloadMethodCall$;
-        }
-
         [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoOptimization | System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         public void $DisassemblerEntryMethodName$()
         {
@@ -209,5 +163,4 @@
                 $WorkloadMethodCall$;
             }
         }
-#endif // RETURNS
     }