Skip to content
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

Defend sequence container constructors from bad CTAD #4254

Merged
merged 2 commits into from
Dec 14, 2023
Merged

Defend sequence container constructors from bad CTAD #4254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c584946
Product fix: Defend sequence container constructors from bad CTAD.
StephanTLavavej Dec 8, 2023
8fa6d41
Update libcxx/expected_results.txt for passing tests.
StephanTLavavej Dec 10, 2023
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
3 changes: 3 additions & 0 deletions stl/inc/deque
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,9 @@ public:
_Construct_n(_Count, _Val);
}

#if _HAS_CXX17
template <class _Alloc2 = _Alloc, enable_if_t<_Is_allocator<_Alloc2>::value, int> = 0>
#endif // _HAS_CXX17
deque(_CRT_GUARDOVERFLOW size_type _Count, const _Ty& _Val, const _Alloc& _Al)
: _Mypair(_One_then_variadic_args_t{}, _Al) {
_Construct_n(_Count, _Val);
Expand Down
3 changes: 3 additions & 0 deletions stl/inc/forward_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,9 @@ public:
_Insert_op._Attach_after(_Mypair._Myval2._Before_head());
}

#if _HAS_CXX17
template <class _Alloc2 = _Alloc, enable_if_t<_Is_allocator<_Alloc2>::value, int> = 0>
#endif // _HAS_CXX17
forward_list(_CRT_GUARDOVERFLOW size_type _Count, const _Ty& _Val, const _Alloc& _Al)
: _Mypair(_One_then_variadic_args_t{}, _Al) { // construct list from _Count * _Val, allocator
_Flist_insert_after_op2<_Alnode> _Insert_op(_Getal());
Expand Down
3 changes: 3 additions & 0 deletions stl/inc/list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,9 @@ public:
_Construct_n(_Count, _Val);
}

#if _HAS_CXX17
template <class _Alloc2 = _Alloc, enable_if_t<_Is_allocator<_Alloc2>::value, int> = 0>
#endif // _HAS_CXX17
list(_CRT_GUARDOVERFLOW size_type _Count, const _Ty& _Val, const _Alloc& _Al)
: _Mypair(_One_then_variadic_args_t{}, _Al) { // construct list from _Count * _Val, allocator
_Construct_n(_Count, _Val);
Expand Down
3 changes: 3 additions & 0 deletions stl/inc/vector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,9 @@ public:
_Construct_n(_Count);
}

#if _HAS_CXX17
template <class _Alloc2 = _Alloc, enable_if_t<_Is_allocator<_Alloc2>::value, int> = 0>
#endif // _HAS_CXX17
_CONSTEXPR20 vector(_CRT_GUARDOVERFLOW const size_type _Count, const _Ty& _Val, const _Alloc& _Al = _Alloc())
: _Mypair(_One_then_variadic_args_t{}, _Al) {
_Construct_n(_Count, _Val);
Expand Down
3 changes: 3 additions & 0 deletions stl/inc/xstring
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2547,6 +2547,9 @@ public:
_Construct<_Construct_strategy::_From_ptr>(_Ptr, _Count);
}

#if _HAS_CXX17
template <class _Alloc2 = _Alloc, enable_if_t<_Is_allocator<_Alloc2>::value, int> = 0>
#endif // _HAS_CXX17
_CONSTEXPR20 basic_string(
_In_reads_(_Count) const _Elem* const _Ptr, _CRT_GUARDOVERFLOW const size_type _Count, const _Alloc& _Al)
: _Mypair(_One_then_variadic_args_t{}, _Al) {
Expand Down
6 changes: 0 additions & 6 deletions tests/libcxx/expected_results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,6 @@ std/containers/associative/map/map.cons/deduct_const.pass.cpp FAIL
std/containers/associative/multimap/multimap.cons/deduct.pass.cpp FAIL
std/containers/associative/multimap/multimap.cons/deduct_const.pass.cpp FAIL
std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.pass.cpp FAIL
std/containers/sequences/list/list.cons/deduct.pass.cpp FAIL
std/containers/unord/unord.map/unord.map.cnstr/deduct.pass.cpp FAIL
std/containers/unord/unord.map/unord.map.cnstr/deduct_const.pass.cpp FAIL
std/containers/unord/unord.multimap/unord.multimap.cnstr/deduct.pass.cpp FAIL
Expand Down Expand Up @@ -943,11 +942,6 @@ std/utilities/memory/allocator.traits/allocator.traits.members/destroy.pass.cpp
# Not analyzed. Error mentions allocator<const T>.
std/utilities/memory/specialized.algorithms/specialized.construct/construct_at.pass.cpp FAIL

# Not analyzed. Looks like deduction guide SFINAE failure.
std/containers/sequences/deque/deque.cons/deduct.pass.cpp FAIL
std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp FAIL
std/containers/sequences/vector/vector.cons/deduct.pass.cpp FAIL

# Not analyzed. Seems to force a sign conversion error?
std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp SKIPPED

Expand Down