From 139f45e56b85b7e643d7e4f81cb5cdf640cd9021 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Sun, 15 Oct 2023 08:35:00 -0700
Subject: [PATCH] Workaround for #93442 (#93523)

* Revert "Disable value_numbering_checked_arithmetic_with_constants_ro (#93507)"

This reverts commit 28cf63fb01101f9d6a21ba8f0b725435c35bf827.

* Revert "Disable failing win-arm64 JIT tests (#93451)"

This reverts commit 1e8379d98e309724248c0151d09df2530a848e84.

* Workaround for https://github.com/dotnet/runtime/issues/93442
---
 src/coreclr/inc/safemath.h |  8 ++++++++
 src/tests/issues.targets   | 18 ------------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/coreclr/inc/safemath.h b/src/coreclr/inc/safemath.h
index 3f6d5c5716bdb4..fcd51af3de8cb0 100644
--- a/src/coreclr/inc/safemath.h
+++ b/src/coreclr/inc/safemath.h
@@ -688,6 +688,10 @@ template<typename T> class ClrSafeInt
     INDEBUG( mutable bool m_checkedOverflow; )
 };
 
+#if defined(_MSC_VER) && defined(HOST_ARM64) // Workaround for https://github.com/dotnet/runtime/issues/93442
+#pragma optimize("", off)
+#endif
+
 template <>
 inline bool ClrSafeInt<int64_t>::multiply(int64_t lhs, int64_t rhs, int64_t &result)
 {
@@ -874,6 +878,10 @@ inline bool ClrSafeInt<uint8_t>::multiply(uint8_t lhs, uint8_t rhs, uint8_t &res
     return true;
 }
 
+#if defined(_MSC_VER) && defined(HOST_ARM64) // Workaround for https://github.com/dotnet/runtime/issues/93442
+#pragma optimize("", on)
+#endif
+
 // Allows creation of a ClrSafeInt corresponding to the type of the argument.
 template <typename T>
 ClrSafeInt<T> AsClrSafeInt(T t)
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index 7d5fee0178cf47..e20d3d4508f0e0 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -332,24 +332,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/Regressions/coreclr/GitHub_45929/test45929/*">
             <Issue>https://github.com/dotnet/runtime/issues/60152</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4/**">
-            <Issue>https://github.com/dotnet/runtime/issues/93441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/rtchecks/overflow/overflow02_mul/**">
-            <Issue>https://github.com/dotnet/runtime/issues/93442</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/**">
-            <Issue>https://github.com/dotnet/runtime/issues/93443</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/**">
-            <Issue>https://github.com/dotnet/runtime/issues/93444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/opt/AssertionPropagation/ArrBoundElim/**">
-            <Issue>https://github.com/dotnet/runtime/issues/93441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/ConstantFolding/value_numbering_checked_arithmetic_with_constants_ro/**">
-           <Issue>https://github.com/dotnet/runtime/issues/93506</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- The following are x64 Unix failures on CoreCLR. -->