From 8ad3d89891587a571f144945893bd681b288790f Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivdiazsa@microsoft.com>
Date: Wed, 19 Jul 2023 16:29:34 -0700
Subject: [PATCH 1/7] Removed the Crossgen2 -O option from
 CLRTest.CrossGen.targets file.

---
 src/tests/Common/CLRTest.CrossGen.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets
index a69ae678bb32c9..e70fabe50b2182 100644
--- a/src/tests/Common/CLRTest.CrossGen.targets
+++ b/src/tests/Common/CLRTest.CrossGen.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-CLRTest.Execute.targets
+CLRTest.CrossGen.targets
 
 WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
           created a backup copy.  Incorrect changes to this file will make it
@@ -113,7 +113,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
         fi
         echo --targetarch:$(TargetArchitecture)>>$__ResponseFile
         echo --targetos:$(TargetOS)>>$__ResponseFile
-        echo -O>>$__ResponseFile
 
         echo "Response file: $__ResponseFile"
         cat $__ResponseFile

From 7abb8abf7b2c0d0b9c9cb65b8abc697a1817d7be Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivdiazsa@microsoft.com>
Date: Mon, 24 Jul 2023 15:28:36 -0700
Subject: [PATCH 2/7] Removed the remaining Crossgen2-related -O's I could
 find. Not sure if all of them should be removed though.

---
 src/coreclr/crossgen-corelib.proj                 | 1 -
 src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs | 2 --
 src/tests/Common/CLRTest.CrossGen.targets         | 1 -
 src/tests/Common/scripts/crossgen2_comparison.py  | 1 -
 4 files changed, 5 deletions(-)

diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
index 2dc62b8151a3ce..e0bef5d3b31546 100644
--- a/src/coreclr/crossgen-corelib.proj
+++ b/src/coreclr/crossgen-corelib.proj
@@ -127,7 +127,6 @@
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetos:$(TargetOS)</CrossGenDllCmd>
       <CrossGenDllCmd Condition="'$(UsingToolIbcOptimization)' != 'true' and '$(EnableNgenOptimization)' == 'true'">$(CrossGenDllCmd) -m:$(MergedMibcPath) --embed-pgo-data</CrossGenDllCmd>
-      <CrossGenDllCmd>$(CrossGenDllCmd) -O</CrossGenDllCmd>
       <CrossGenDllCmd  Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">$(CrossGenDllCmd) --verify-type-and-field-layout</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) @(CoreLib)</CrossGenDllCmd>
     </PropertyGroup>
diff --git a/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs b/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
index 38ca23fedee837..b1f4421558a519 100644
--- a/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
+++ b/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
@@ -313,8 +313,6 @@ private string GenerateCrossgen2ResponseFile()
                 result.AppendLine($"--targetarch:{Crossgen2Tool.GetMetadata(MetadataKeys.TargetArch)}");
             }
 
-            result.AppendLine("-O");
-
             // 5.0 Crossgen2 doesn't support PDB generation.
             if (!Crossgen2IsVersion5 && _emitSymbols)
             {
diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets
index e70fabe50b2182..481a79a5075d34 100644
--- a/src/tests/Common/CLRTest.CrossGen.targets
+++ b/src/tests/Common/CLRTest.CrossGen.targets
@@ -262,7 +262,6 @@ if defined RunCrossGen2 (
     echo -r:!CORE_ROOT!\xunit.*.dll>>!__ResponseFile!
     echo -r:!CORE_ROOT!\mscorlib.dll>>!__ResponseFile!
     echo -r:!CORE_ROOT!\netstandard.dll>>!__ResponseFile!
-    echo -O>>!__ResponseFile!
 
     if not "$(__CreatePdb)" == "" (
         echo --pdb>>!__ResponseFile!
diff --git a/src/tests/Common/scripts/crossgen2_comparison.py b/src/tests/Common/scripts/crossgen2_comparison.py
index 65b0e062726a0e..ded025b37ded0d 100644
--- a/src/tests/Common/scripts/crossgen2_comparison.py
+++ b/src/tests/Common/scripts/crossgen2_comparison.py
@@ -527,7 +527,6 @@ def _build_args_crossgen_il_file(self, il_filename, ni_filename, platform_assemb
         args.append(self.crossgen_executable_filename)
         args.append('-r')
         args.append('"' + platform_assemblies_paths + self.platform_directory_sep + '*.dll"' )
-        args.append('-O')
         args.append('--determinism-stress')
         args.append('6')
         args.append('--map')

From abb6af02427478cf424312e64315afadf3887a07 Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivdiazsa@microsoft.com>
Date: Wed, 26 Jul 2023 16:04:56 -0700
Subject: [PATCH 3/7] Restored the ReadyToRunCompiler -O option because some
 NativeAOT tests apparently are not happy without it.

---
 src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs b/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
index b1f4421558a519..38ca23fedee837 100644
--- a/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
+++ b/src/tasks/Crossgen2Tasks/RunReadyToRunCompiler.cs
@@ -313,6 +313,8 @@ private string GenerateCrossgen2ResponseFile()
                 result.AppendLine($"--targetarch:{Crossgen2Tool.GetMetadata(MetadataKeys.TargetArch)}");
             }
 
+            result.AppendLine("-O");
+
             // 5.0 Crossgen2 doesn't support PDB generation.
             if (!Crossgen2IsVersion5 && _emitSymbols)
             {

From f38b7642f3a878724fa7d984623c6c0220644217 Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivdiazsa@microsoft.com>
Date: Thu, 27 Jul 2023 11:16:46 -0700
Subject: [PATCH 4/7] Restored crossgen-corelib.proj's -O because
 extra-platforms is still complaining.

---
 src/coreclr/crossgen-corelib.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
index e0bef5d3b31546..2dc62b8151a3ce 100644
--- a/src/coreclr/crossgen-corelib.proj
+++ b/src/coreclr/crossgen-corelib.proj
@@ -127,6 +127,7 @@
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetos:$(TargetOS)</CrossGenDllCmd>
       <CrossGenDllCmd Condition="'$(UsingToolIbcOptimization)' != 'true' and '$(EnableNgenOptimization)' == 'true'">$(CrossGenDllCmd) -m:$(MergedMibcPath) --embed-pgo-data</CrossGenDllCmd>
+      <CrossGenDllCmd>$(CrossGenDllCmd) -O</CrossGenDllCmd>
       <CrossGenDllCmd  Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">$(CrossGenDllCmd) --verify-type-and-field-layout</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) @(CoreLib)</CrossGenDllCmd>
     </PropertyGroup>

From e006df289bcc05ecdc51e5539f3f7dd59c20bbe1 Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivdiazsa@microsoft.com>
Date: Fri, 28 Jul 2023 12:36:02 -0700
Subject: [PATCH 5/7] Restored the -O in a python script to see if Mono stops
 being an annoying pain.

---
 src/tests/Common/scripts/crossgen2_comparison.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tests/Common/scripts/crossgen2_comparison.py b/src/tests/Common/scripts/crossgen2_comparison.py
index ded025b37ded0d..65b0e062726a0e 100644
--- a/src/tests/Common/scripts/crossgen2_comparison.py
+++ b/src/tests/Common/scripts/crossgen2_comparison.py
@@ -527,6 +527,7 @@ def _build_args_crossgen_il_file(self, il_filename, ni_filename, platform_assemb
         args.append(self.crossgen_executable_filename)
         args.append('-r')
         args.append('"' + platform_assemblies_paths + self.platform_directory_sep + '*.dll"' )
+        args.append('-O')
         args.append('--determinism-stress')
         args.append('6')
         args.append('--map')

From e51bc9e75de23210649430af4aa4d665f7dedb7c Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivdiazsa@microsoft.com>
Date: Mon, 31 Jul 2023 12:27:39 -0700
Subject: [PATCH 6/7] Restored even the original change just to see whether
 there is actually a problem with the extra-platforms, or they're just
 trolling at this point.

---
 src/tests/Common/CLRTest.CrossGen.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets
index 481a79a5075d34..8c241a279eeb0c 100644
--- a/src/tests/Common/CLRTest.CrossGen.targets
+++ b/src/tests/Common/CLRTest.CrossGen.targets
@@ -113,6 +113,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
         fi
         echo --targetarch:$(TargetArchitecture)>>$__ResponseFile
         echo --targetos:$(TargetOS)>>$__ResponseFile
+        echo -O>>$__ResponseFile
 
         echo "Response file: $__ResponseFile"
         cat $__ResponseFile
@@ -262,6 +263,7 @@ if defined RunCrossGen2 (
     echo -r:!CORE_ROOT!\xunit.*.dll>>!__ResponseFile!
     echo -r:!CORE_ROOT!\mscorlib.dll>>!__ResponseFile!
     echo -r:!CORE_ROOT!\netstandard.dll>>!__ResponseFile!
+    echo -O>>!__ResponseFile!
 
     if not "$(__CreatePdb)" == "" (
         echo --pdb>>!__ResponseFile!

From abd20efcbd8085af73420963ce838b9f4d9ab99f Mon Sep 17 00:00:00 2001
From: Ivan Diaz <ivdiazsa@microsoft.com>
Date: Mon, 31 Jul 2023 14:39:19 -0700
Subject: [PATCH 7/7] Removed the -O's from Crossgen2 again after discovering
 the extra-platforms pipelines are super broken right now.

---
 src/coreclr/crossgen-corelib.proj         | 1 -
 src/tests/Common/CLRTest.CrossGen.targets | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj
index 2dc62b8151a3ce..e0bef5d3b31546 100644
--- a/src/coreclr/crossgen-corelib.proj
+++ b/src/coreclr/crossgen-corelib.proj
@@ -127,7 +127,6 @@
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) --targetos:$(TargetOS)</CrossGenDllCmd>
       <CrossGenDllCmd Condition="'$(UsingToolIbcOptimization)' != 'true' and '$(EnableNgenOptimization)' == 'true'">$(CrossGenDllCmd) -m:$(MergedMibcPath) --embed-pgo-data</CrossGenDllCmd>
-      <CrossGenDllCmd>$(CrossGenDllCmd) -O</CrossGenDllCmd>
       <CrossGenDllCmd  Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">$(CrossGenDllCmd) --verify-type-and-field-layout</CrossGenDllCmd>
       <CrossGenDllCmd>$(CrossGenDllCmd) @(CoreLib)</CrossGenDllCmd>
     </PropertyGroup>
diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets
index 8c241a279eeb0c..481a79a5075d34 100644
--- a/src/tests/Common/CLRTest.CrossGen.targets
+++ b/src/tests/Common/CLRTest.CrossGen.targets
@@ -113,7 +113,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
         fi
         echo --targetarch:$(TargetArchitecture)>>$__ResponseFile
         echo --targetos:$(TargetOS)>>$__ResponseFile
-        echo -O>>$__ResponseFile
 
         echo "Response file: $__ResponseFile"
         cat $__ResponseFile
@@ -263,7 +262,6 @@ if defined RunCrossGen2 (
     echo -r:!CORE_ROOT!\xunit.*.dll>>!__ResponseFile!
     echo -r:!CORE_ROOT!\mscorlib.dll>>!__ResponseFile!
     echo -r:!CORE_ROOT!\netstandard.dll>>!__ResponseFile!
-    echo -O>>!__ResponseFile!
 
     if not "$(__CreatePdb)" == "" (
         echo --pdb>>!__ResponseFile!