Skip to content

Fix no-match handling when calling memchr/wmemchr on ARM64EC #5993

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.

Sign up for GitHub

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
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Jan 8, 2026
Merged

Fix no-match handling when calling memchr/wmemchr on ARM64EC #5993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions stl/src/vector_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3730,7 +3730,8 @@ const void* __stdcall __std_find_trivial_unsized_8(const void* const _First, con
const void* __stdcall __std_find_trivial_1(
const void* const _First, const void* const _Last, const uint8_t _Val) noexcept {
#ifdef _M_ARM64EC
return memchr(_First, _Val, _Byte_length(_First, _Last));
auto _Result = memchr(_First, _Val, _Byte_length(_First, _Last));
return _Result ? _Result : _Last;
#else
return _Finding::_Find_impl<_Finding::_Find_traits_1, _Finding::_Predicate::_Equal>(_First, _Last, _Val);
#endif
Expand All @@ -3739,7 +3740,8 @@ const void* __stdcall __std_find_trivial_1(
const void* __stdcall __std_find_trivial_2(
const void* const _First, const void* const _Last, const uint16_t _Val) noexcept {
#ifdef _M_ARM64EC
return wmemchr(static_cast<const wchar_t*>(_First), _Val, _Byte_length(_First, _Last) / sizeof(wchar_t));
auto _Result = wmemchr(static_cast<const wchar_t*>(_First), _Val, _Byte_length(_First, _Last) / sizeof(wchar_t));
return _Result ? _Result : _Last;
#else
return _Finding::_Find_impl<_Finding::_Find_traits_2, _Finding::_Predicate::_Equal>(_First, _Last, _Val);
#endif
Expand Down