Skip to content

vector_algorithms.cpp: Improve conformance by adding missing template and typename for dependent things #5743

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
Oct 4, 2025
Merged

vector_algorithms.cpp: Improve conformance by adding missing template and typename for dependent things #5743

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
21 changes: 11 additions & 10 deletions stl/src/vector_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4398,21 +4398,21 @@ namespace {
if constexpr (_Needle_length_el_magnitude >= 1) {
_Eq = _Traits::_Cmp_avx(_Data1, _Data2s0);
if constexpr (_Needle_length_el_magnitude >= 2) {
const __m256i _Data2s1 = _Traits::_Shuffle_avx<1>(_Data2s0);
const __m256i _Data2s1 = _Traits::template _Shuffle_avx<1>(_Data2s0);
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s1));
if constexpr (_Needle_length_el_magnitude >= 4) {
const __m256i _Data2s2 = _Traits::_Shuffle_avx<2>(_Data2s0);
const __m256i _Data2s2 = _Traits::template _Shuffle_avx<2>(_Data2s0);
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s2));
const __m256i _Data2s3 = _Traits::_Shuffle_avx<1>(_Data2s2);
const __m256i _Data2s3 = _Traits::template _Shuffle_avx<1>(_Data2s2);
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s3));
if constexpr (_Needle_length_el_magnitude >= 8) {
const __m256i _Data2s4 = _Traits::_Shuffle_avx<4>(_Data2s0);
const __m256i _Data2s4 = _Traits::template _Shuffle_avx<4>(_Data2s0);
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s4));
const __m256i _Data2s5 = _Traits::_Shuffle_avx<1>(_Data2s4);
const __m256i _Data2s5 = _Traits::template _Shuffle_avx<1>(_Data2s4);
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s5));
const __m256i _Data2s6 = _Traits::_Shuffle_avx<2>(_Data2s4);
const __m256i _Data2s6 = _Traits::template _Shuffle_avx<2>(_Data2s4);
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s6));
const __m256i _Data2s7 = _Traits::_Shuffle_avx<1>(_Data2s6);
const __m256i _Data2s7 = _Traits::template _Shuffle_avx<1>(_Data2s6);
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s7));
}
}
Expand All @@ -4429,7 +4429,8 @@ namespace {

const __m256i _Last2val = _mm256_maskload_epi32(
reinterpret_cast<const int*>(_Stop2), _Avx2_tail_mask_32(_Last2_length_el * sizeof(_Ty)));
const __m256i _Last2s0 = _Traits::_Spread_avx<_Last2_length_el_magnitude>(_Last2val, _Last2_length_el);
const __m256i _Last2s0 =
_Traits::template _Spread_avx<_Last2_length_el_magnitude>(_Last2val, _Last2_length_el);

const void* _Stop1 = _First1;
_Advance_bytes(_Stop1, _Haystack_length & ~size_t{0x1F});
Expand Down Expand Up @@ -6914,7 +6915,7 @@ namespace {
template <class _Traits, class _Elem>
void __stdcall _Impl(
_Elem* const _Dest, const void* _Src, size_t _Size_bits, const _Elem _Elem0, const _Elem _Elem1) noexcept {
constexpr size_t _Step_size_bits = sizeof(_Traits::_Value_type) * 8;
constexpr size_t _Step_size_bits = sizeof(typename _Traits::_Value_type) * 8;

const auto _Px0 = _Traits::_Set(_Elem0);
const auto _Px1 = _Traits::_Set(_Elem1);
Expand All @@ -6933,7 +6934,7 @@ namespace {
}

if (_Size_bits > 0) {
__assume(_Size_bits < sizeof(_Traits::_Value_type));
__assume(_Size_bits < sizeof(typename _Traits::_Value_type));
typename _Traits::_Value_type _Val;
memcpy(&_Val, _Src, sizeof(_Val));
const auto _Elems = _Traits::_Step(_Val, _Px0, _Px1);
Expand Down