Remove --enable-generic-cycle-detection

Author: BrzVlad

src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunCodegenCompilationBuilder.cs

@@ -43,8 +43,8 @@ public sealed class ReadyToRunCodegenCompilationBuilder : CompilationBuilder
         private CompositeImageSettings _compositeImageSettings;
         private ulong _imageBase;
         private NodeFactoryOptimizationFlags _nodeFactoryOptimizationFlags = new NodeFactoryOptimizationFlags();
-        private int _genericCycleDetectionDepthCutoff = ReadyToRunCompilerContext.DefaultGenericCycleDepthCutoff;
-        private int _genericCycleDetectionBreadthCutoff = ReadyToRunCompilerContext.DefaultGenericCycleBreadthCutoff;
+        private int _genericCycleDetectionDepthCutoff = -1;
+        private int _genericCycleDetectionBreadthCutoff = -1;
         private ReadyToRunContainerFormat _format = ReadyToRunContainerFormat.PE;
 
         private string _jitPath;

src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs

@@ -88,8 +88,6 @@ internal class Crossgen2RootCommand : RootCommand
             new("--imagebase") { Description = SR.ImageBase };
         public Option<string> TargetArchitecture { get; } =
             new("--targetarch") { Description = SR.TargetArchOption };
-        public Option<bool> EnableGenericCycleDetection { get; } =
-            new("--enable-generic-cycle-detection") { Description = SR.EnableGenericCycleDetection };
         public Option<int> GenericCycleDepthCutoff { get; } =
             new("--maxgenericcycle") { DefaultValueFactory = _ => ReadyToRunCompilerContext.DefaultGenericCycleDepthCutoff, Description = SR.GenericCycleDepthCutoff };
         public Option<int> GenericCycleBreadthCutoff { get; } =
@@ -197,7 +195,6 @@ public Crossgen2RootCommand(string[] args) : base(SR.Crossgen2BannerText)
             Options.Add(SupportIbc);
             Options.Add(Resilient);
             Options.Add(ImageBase);
-            Options.Add(EnableGenericCycleDetection);
             Options.Add(GenericCycleDepthCutoff);
             Options.Add(GenericCycleBreadthCutoff);
             Options.Add(TargetArchitecture);

src/coreclr/tools/aot/crossgen2/Program.cs

@@ -679,12 +679,9 @@ private void RunSingleCompilation(Dictionary<string, string> inFilePaths, Instru
                         .UseCompilationRoots(compilationRoots)
                         .UseOptimizationMode(optimizationMode);
 
-                    if (Get(_command.EnableGenericCycleDetection))
-                    {
-                        builder.UseGenericCycleDetection(
-                            depthCutoff: Get(_command.GenericCycleDepthCutoff),
-                            breadthCutoff: Get(_command.GenericCycleBreadthCutoff));
-                    }
+                    builder.UseGenericCycleDetection(
+                        depthCutoff: Get(_command.GenericCycleDepthCutoff),
+                        breadthCutoff: Get(_command.GenericCycleBreadthCutoff));
 
                     builder.UsePrintReproInstructions(CreateReproArgumentString);
 

src/coreclr/tools/aot/crossgen2/Properties/Resources.resx

@@ -423,9 +423,6 @@
   <data name="TypeValidation" xml:space="preserve">
     <value>Configure the runtime's behavior around validating the correctness of types defined in assemblies compiled via crossgen2</value>
   </data>
-  <data name="EnableGenericCycleDetection" xml:space="preserve">
-    <value>Perform generic cycle detection during compilation (incurs longer compilation time)</value>
-  </data>
   <data name="GenericCycleBreadthCutoff" xml:space="preserve">
     <value>Total number of occurrences of potentially cyclic generic types within a generic type to cut off</value>
   </data>

src/tests/readytorun/GenericCycleDetection/Breadth1Test.csproj

@@ -6,7 +6,7 @@
     <!-- This is an explicit crossgen test -->
     <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2>
     <!-- Without this flag Crossgen2 crashes after several minutes with arithmetic overflow -->
-    <CrossGen2TestExtraArguments>--enable-generic-cycle-detection --maxgenericcycle:1 --maxgenericcyclebreadth:1</CrossGen2TestExtraArguments>
+    <CrossGen2TestExtraArguments>--maxgenericcycle:1 --maxgenericcyclebreadth:1</CrossGen2TestExtraArguments>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />

src/tests/readytorun/GenericCycleDetection/Depth1Test.csproj

@@ -6,7 +6,7 @@
     <!-- This is an explicit crossgen test -->
     <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2>
     <!-- Without this flag Crossgen2 crashes after several minutes with arithmetic overflow -->
-    <CrossGen2TestExtraArguments>--enable-generic-cycle-detection --maxgenericcycle:1 --maxgenericcyclebreadth:-1</CrossGen2TestExtraArguments>
+    <CrossGen2TestExtraArguments>--maxgenericcycle:1 --maxgenericcyclebreadth:-1</CrossGen2TestExtraArguments>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />

src/tests/readytorun/GenericCycleDetection/Depth3Test.csproj

@@ -6,7 +6,7 @@
     <!-- This is an explicit crossgen test -->
     <AlwaysUseCrossGen2>true</AlwaysUseCrossGen2>
     <!-- Without this flag Crossgen2 crashes after several minutes with arithmetic overflow -->
-    <CrossGen2TestExtraArguments>--enable-generic-cycle-detection --maxgenericcycle:3 --maxgenericcyclebreadth:-1</CrossGen2TestExtraArguments>
+    <CrossGen2TestExtraArguments>--maxgenericcycle:3 --maxgenericcyclebreadth:-1</CrossGen2TestExtraArguments>
     <!-- This test OOMs Crossgen2 when running in 32-bit address space -->
     <CLRTestTargetUnsupported Condition="'$(TargetBits)' == '32'">true</CLRTestTargetUnsupported>
   </PropertyGroup>