Skip to content

Fixed Reference copy and move assignment operators #125723

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixed Reference copy and move assignment operators #125723

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92860b2
[libc++] [test] Further improve proxy Reference class in the test aga…
Feb 20, 2025
a850162
Merge branch 'main' into proxy-ref
2LoS Feb 23, 2025
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
47 changes: 11 additions & 36 deletions libcxx/test/std/algorithms/robust_against_proxy_iterators_lifetime_bugs.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,24 +143,11 @@ class LifetimeIterator {
lifetime_cache.insert(this);
}

Reference& operator=(const Reference& rhs) {
Reference operator=(const Reference& rhs) const {
assert(lifetime_cache.contains(this) && lifetime_cache.contains(&rhs));
assert(!moved_from_);
assert(!rhs.moved_from_);

*v_ = *rhs.v_;
moved_from_ = false;

return *this;
}

Reference& operator=(Reference&& rhs) noexcept {
assert(lifetime_cache.contains(this) && lifetime_cache.contains(&rhs));

assert(!rhs.moved_from_);
rhs.moved_from_ = true;

*v_ = *rhs.v_;
moved_from_ = false;

return *this;
}
Expand All @@ -172,12 +159,10 @@ class LifetimeIterator {
return *v_;
}

Reference& operator=(Value v) {
Reference operator=(Value v) const {
assert(lifetime_cache.contains(this));
assert(!moved_from_);

*v_ = v;
moved_from_ = false;

return *this;
}
Expand Down Expand Up @@ -366,40 +351,30 @@ class ConstexprIterator {
constexpr Reference(int& v) : v_(&v) { }

constexpr Reference(const Reference& rhs) = default;
constexpr Reference& operator=(const Reference& rhs) {
constexpr Reference operator=(const Reference& rhs) const {
assert(!rhs.moved_from_);
v_ = rhs.v_;
moved_from_ = false;
assert(!moved_from_);
*v_ = *rhs.v_;

return *this;
}
constexpr Reference operator=(int v) const {
assert(!moved_from_);
*v_ = v;

constexpr Reference(Reference&& rhs) noexcept : v_(rhs.v_) {
assert(!rhs.moved_from_);
rhs.moved_from_ = true;
return *this;
}

constexpr Reference& operator=(Reference&& rhs) noexcept {
constexpr Reference(Reference&& rhs) noexcept : v_(rhs.v_) {
assert(!rhs.moved_from_);
rhs.moved_from_ = true;
moved_from_ = false;

v_ = rhs.v_;
return *this;
}

constexpr operator int() const {
assert(!moved_from_);
return *v_;
}

constexpr Reference& operator=(int v) {
*v_ = v;
moved_from_ = false;

return *this;
}

friend constexpr bool operator<(const Reference& lhs, const Reference& rhs) {
assert(!lhs.moved_from_ && !rhs.moved_from_);
return *lhs.v_ < *rhs.v_;
Expand Down