Skip to content

[libc++] Refactor vector move constructor with allocator #116449

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
merged 2 commits into from
Nov 26, 2024
Merged

[libc++] Refactor vector move constructor with allocator #116449

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
7f5e11e
Refactor vector move-ctor with allocator
winner245 Nov 15, 2024
e356689
Add exception test for element-wise move ctor
winner245 Nov 25, 2024
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
4 changes: 1 addition & 3 deletions libcxx/include/__vector/vector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,9 +964,7 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_
__x.__begin_ = __x.__end_ = __x.__cap_ = nullptr;
} else {
typedef move_iterator<iterator> _Ip;
auto __guard = std::__make_exception_guard(__destroy_vector(*this));
assign(_Ip(__x.begin()), _Ip(__x.end()));
__guard.__complete();
__init_with_size(_Ip(__x.begin()), _Ip(__x.end()), __x.size());
}
}

Expand Down
18 changes: 11 additions & 7 deletions libcxx/test/std/containers/sequences/vector/vector.cons/exceptions.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <vector>

#include "count_new.h"
#include "test_allocator.h"
#include "test_iterators.h"

template <class T>
Expand All @@ -36,7 +37,9 @@ struct Allocator {
void deallocate(T* ptr, std::size_t n) { std::allocator<T>().deallocate(ptr, n); }

template <class U>
friend bool operator==(const Allocator&, const Allocator<U>&) { return true; }
friend bool operator==(const Allocator&, const Allocator<U>&) {
return true;
}
};

struct ThrowingT {
Expand Down Expand Up @@ -138,7 +141,7 @@ int main(int, char**) {
} catch (int) {
}
check_new_delete_called();
#endif // TEST_STD_VER >= 14
#endif // TEST_STD_VER >= 14

try { // Throw in vector(size_type, value_type, const allocator_type&) from the type
int throw_after = 1;
Expand Down Expand Up @@ -217,11 +220,12 @@ int main(int, char**) {
}
check_new_delete_called();

try { // Throw in vector(vector&&, const allocator_type&) from type
std::vector<ThrowingT, Allocator<ThrowingT> > vec(Allocator<ThrowingT>(false));
int throw_after = 1;
vec.emplace_back(throw_after);
std::vector<ThrowingT, Allocator<ThrowingT> > vec2(std::move(vec), Allocator<ThrowingT>(false));
try { // Throw in vector(vector&&, const allocator_type&) from type during element-wise move
std::vector<ThrowingT, test_allocator<ThrowingT> > vec(test_allocator<ThrowingT>(1));
int throw_after = 10;
ThrowingT v(throw_after);
vec.insert(vec.end(), 6, v);
std::vector<ThrowingT, test_allocator<ThrowingT> > vec2(std::move(vec), test_allocator<ThrowingT>(2));
} catch (int) {
}
check_new_delete_called();
Expand Down
Loading