Skip to content

Workaround for #93442 #93523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/coreclr/inc/safemath.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
Expand Down
18 changes: 0 additions & 18 deletions src/tests/issues.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down