Skip to content

<xtree>: Fixes _Tree move constructor #1357

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
StephanTLavavej merged 14 commits into from
Oct 29, 2020
Merged

<xtree>: Fixes _Tree move constructor #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cbb03fa
resolve the issue
Arzaghi Oct 8, 2020
6664146
update _Move_assign
Arzaghi Oct 10, 2020
7b21262
fixes move assignment
Arzaghi Oct 10, 2020
0e3104c
add tests
Arzaghi Oct 10, 2020
41c3aae
try to pass the tests
Arzaghi Oct 11, 2020
a0ec670
Merge branch 'master' into gh1357_xtree
StephanTLavavej Oct 27, 2020
54b5f0b
Fix typo: "constuctible" => "constructible"
StephanTLavavej Oct 27, 2020
28124c0
Change std:: to _STD in product code.
StephanTLavavej Oct 27, 2020
52c2e9b
In _Move_assign overloads, restore comparator copy assignment.
StephanTLavavej Oct 27, 2020
f0a7558
Centralize code into _Swap_val_excluding_comp.
StephanTLavavej Oct 27, 2020
0e1ae51
Centralize code even more by removing _Swap_val.
StephanTLavavej Oct 27, 2020
7659f38
Cleanup: Add top-level const to _Right_scary (a pointer).
StephanTLavavej Oct 27, 2020
7663aa2
Comment when we're intentionally copying comparators.
StephanTLavavej Oct 27, 2020
2b121e3
Cite LWG-2227.
StephanTLavavej Oct 28, 2020
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
37 changes: 19 additions & 18 deletions stl/inc/xtree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,10 +905,10 @@ public:
}

_Tree(_Tree&& _Right)
: _Mypair(
_One_then_variadic_args_t{}, _Right.key_comp(), _One_then_variadic_args_t{}, _STD move(_Right._Getal())) {
: _Mypair(_One_then_variadic_args_t{}, _Right.key_comp(), // intentionally copy comparator, see LWG-2227
_One_then_variadic_args_t{}, _STD move(_Right._Getal())) {
_Alloc_sentinel_and_proxy();
_Swap_val(_Right);
_Swap_val_excluding_comp(_Right);
}

private:
Expand All @@ -925,7 +925,8 @@ private:

public:
_Tree(_Tree&& _Right, const allocator_type& _Al)
: _Mypair(_One_then_variadic_args_t{}, _Right.key_comp(), _One_then_variadic_args_t{}, _Al) {
: _Mypair(_One_then_variadic_args_t{}, _Right.key_comp(), // intentionally copy comparator, see LWG-2227
_One_then_variadic_args_t{}, _Al) {
if _CONSTEXPR_IF (!_Alnode_traits::is_always_equal::value) {
if (_Getal() != _Right._Getal()) {
_Different_allocator_move_construct(_STD move(_Right));
Expand All @@ -934,30 +935,30 @@ public:
}

_Alloc_sentinel_and_proxy();
_Swap_val(_Right);
_Swap_val_excluding_comp(_Right);
}

private:
void _Move_assign(_Tree& _Right, _Equal_allocators) noexcept(is_nothrow_move_assignable_v<key_compare>) {
clear();
_Getcomp() = _Right._Getcomp();
_Getcomp() = _Right._Getcomp(); // intentionally copy comparator, see LWG-2227
_Pocma(_Getal(), _Right._Getal());
_Swap_val(_Right);
_Swap_val_excluding_comp(_Right);
}

void _Move_assign(_Tree& _Right, _Propagate_allocators) {
if (_Getal() == _Right._Getal()) {
_Move_assign(_Right, _Equal_allocators{});
} else {
clear();
_Getcomp() = _Right._Getcomp();
_Getcomp() = _Right._Getcomp(); // intentionally copy comparator, see LWG-2227
auto&& _Alproxy = _GET_PROXY_ALLOCATOR(_Alnode, _Getal());
auto&& _Right_alproxy = _GET_PROXY_ALLOCATOR(_Alnode, _Right._Getal());
_Container_proxy_ptr<_Alty> _Proxy(_Right_alproxy, _Leave_proxy_unbound{});
const auto _Scary = _Get_scary();
auto _Right_scary = _Right._Get_scary();
const auto _Newhead = _STD exchange(_Right_scary->_Myhead, _Node::_Buyheadnode(_Right._Getal()));
const auto _Newsize = _STD exchange(_Right_scary->_Mysize, size_type{0});
const auto _Scary = _Get_scary();
const auto _Right_scary = _Right._Get_scary();
const auto _Newhead = _STD exchange(_Right_scary->_Myhead, _Node::_Buyheadnode(_Right._Getal()));
const auto _Newsize = _STD exchange(_Right_scary->_Mysize, size_type{0});
_Scary->_Erase_head(_Getal());
_Pocma(_Getal(), _Right._Getal());
_Scary->_Myhead = _Newhead;
Expand All @@ -972,7 +973,7 @@ private:
_Move_assign(_Right, _Equal_allocators{});
} else {
clear();
_Getcomp() = _Right._Getcomp();
_Getcomp() = _Right._Getcomp(); // intentionally copy comparator, see LWG-2227
_Copy(_Right, _Move_tag{});
}
}
Expand All @@ -987,11 +988,10 @@ public:
}

private:
void _Swap_val(_Tree& _Right) { // swap contents with _Right, equal allocators
const auto _Scary = _Get_scary();
auto _Right_scary = _Right._Get_scary();
void _Swap_val_excluding_comp(_Tree& _Right) { // swap contents (except comparator) with _Right, equal allocators
const auto _Scary = _Get_scary();
const auto _Right_scary = _Right._Get_scary();
_Scary->_Swap_proxy_and_iterators(*_Right_scary);
_Swap_adl(_Getcomp(), _Right._Getcomp());
_Swap_adl(_Scary->_Myhead, _Right_scary->_Myhead);
_STD swap(_Scary->_Mysize, _Right_scary->_Mysize);
}
Expand Down Expand Up @@ -1575,7 +1575,8 @@ public:
void swap(_Tree& _Right) noexcept(_Is_nothrow_swappable<key_compare>::value) /* strengthened */ {
if (this != _STD addressof(_Right)) {
_Pocs(_Getal(), _Right._Getal());
_Swap_val(_Right);
_Swap_val_excluding_comp(_Right);
_Swap_adl(_Getcomp(), _Right._Getcomp());
}
}

Expand Down
4 changes: 4 additions & 0 deletions tests/std/tests/Dev11_0437519_container_requirements/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,6 +1714,10 @@ DEFINE_TEST(test_ordered_associative_default_constructor_with_comparer,
copy_constructible_compare<erasable> const c((key()));
(container_type(c));
container_type a(c);

// GH-1037 containers should be move constructible with a non-assignable comparator
container_type b{std::move(a)};
container_type d = std::move(b);
}

// X() and X a;
Expand Down