From 98747f440b982a1ac2a20e61bfd93745d7c5ceef Mon Sep 17 00:00:00 2001
From: Tomas Rylek <trylek@microsoft.com>
Date: Wed, 12 Oct 2022 21:17:36 +0200
Subject: [PATCH 1/2] Disable the hugeexpr1 test failing intermittently with
 issue #74555

---
 src/tests/issues.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index b59a656853bbd..d157d10a1ab79 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -303,6 +303,9 @@
         <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/regress/vsw/373472/**">
             <Issue>Allocates large contiguous array that is not consistently available on 32-bit platforms</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/hugeexpr1/**">
+            <Issue>https://github.com/dotnet/runtime/issues/74555</Issue>
+        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/GitHub_34094/Test34094/*">
             <Issue>https://github.com/dotnet/runtime/issues/57458</Issue>
         </ExcludeList>

From dbb2b23f432cab4f7619efb631a8f87d591e9d44 Mon Sep 17 00:00:00 2001
From: Tomas Rylek <trylek@microsoft.com>
Date: Wed, 12 Oct 2022 21:24:21 +0200
Subject: [PATCH 2/2] Fix the exclusion to be Crossgen2-specific

---
 src/tests/issues.targets | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index d157d10a1ab79..60d510014a613 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -303,9 +303,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/regress/vsw/373472/**">
             <Issue>Allocates large contiguous array that is not consistently available on 32-bit platforms</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/hugeexpr1/**">
-            <Issue>https://github.com/dotnet/runtime/issues/74555</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/GitHub_34094/Test34094/*">
             <Issue>https://github.com/dotnet/runtime/issues/57458</Issue>
         </ExcludeList>
@@ -918,6 +915,13 @@
         </ExcludeList>
     </ItemGroup>
 
+    <!-- Crossgen2 x86 specific excludes -->
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'crossgen2' and '$(RuntimeFlavor)' == 'coreclr' and '$(TargetArchitecture)' == 'x86'">
+        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/hugeexpr1/**">
+            <Issue>https://github.com/dotnet/runtime/issues/74555</Issue>
+        </ExcludeList>
+    </ItemGroup>
+
     <!-- Crossgen2 arm32 specific excludes -->
     <ItemGroup Condition="'$(XunitTestBinBase)' != '' and ('$(TestBuildMode)' == 'crossgen2' or '$(TestBuildMode)' == 'crossgen') and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetArchitecture)' == 'arm' or '$(AltJitArch)' == 'arm')">
         <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/Runtime_34170/Runtime_34170/*">