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

Orphan before reallocation in vector<:ghost:> #2441

Merged
merged 5 commits into from
Mar 17, 2022
Merged

Orphan before reallocation in vector<:ghost:> #2441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96e947f
Orphan before reallocation in vector<:ghost:>
CaseyCarter Dec 21, 2021
3b40e98
`<deque>`: remove extraneous `public`
CaseyCarter Dec 21, 2021
ab46ae0
Review comments
CaseyCarter Dec 22, 2021
f717d40
Merge branch 'main' into vector_boo
StephanTLavavej Mar 2, 2022
dea1476
Code review feedback.
StephanTLavavej Mar 2, 2022
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
1 change: 0 additions & 1 deletion stl/inc/deque
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,6 @@ public:
_Take_contents(_Right);
}

public:
Copy link
Contributor Author

@CaseyCarter CaseyCarter Dec 21, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reviewers: I'm removing this since it's redundant with public on line 703. Yes, this is 100% drive-by - it could be easily split into a different PR.

deque& operator=(deque&& _Right) noexcept(_Alty_traits::is_always_equal::value) {
if (this == _STD addressof(_Right)) {
return *this;
Expand Down
13 changes: 3 additions & 10 deletions stl/inc/vector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2727,11 +2727,6 @@ public:

template <class _Iter, enable_if_t<_Is_iterator_v<_Iter>, int> = 0>
_CONSTEXPR20 vector(_Iter _First, _Iter _Last, const _Alloc& _Al = _Alloc()) : _Mybase(_Al) {
_BConstruct(_First, _Last);
}

template <class _Iter>
_CONSTEXPR20 void _BConstruct(_Iter _First, _Iter _Last) {
insert(begin(), _First, _Last);
}

Expand Down Expand Up @@ -3197,7 +3192,9 @@ public:
_Xlen(); // result too long
}

// worth doing
#if _ITERATOR_DEBUG_LEVEL == 2
_Orphan_range(static_cast<size_type>(_Realloc ? 0 : _Off), this->_Mysize);
#endif // _ITERATOR_DEBUG_LEVEL == 2
this->_Myvec.resize(this->_Nw(size() + _Count), 0);
if (empty()) {
this->_Mysize += _Count;
Expand All @@ -3206,10 +3203,6 @@ public:
this->_Mysize += _Count;
_STD copy_backward(begin() + _Off, _Oldend, end());
}

#if _ITERATOR_DEBUG_LEVEL == 2
_Orphan_range(static_cast<size_type>(_Realloc ? 0 : _Off), this->_Mysize);
#endif // _ITERATOR_DEBUG_LEVEL == 2
}

return static_cast<size_type>(_Off);
Expand Down
45 changes: 45 additions & 0 deletions tests/std/tests/P1004R2_constexpr_vector_bool/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,39 @@ using namespace std;
static constexpr bool input[] = {true, false, true, true, false, true};
static constexpr bool input_flipped[] = {false, true, false, false, true, false};

struct demoterator { // demote pointer to input iterator
using iterator_category = input_iterator_tag;
using value_type = int;
using difference_type = ptrdiff_t;
using reference = const int&;
using pointer = void;

constexpr bool operator==(const demoterator& that) const {
return ptr == that.ptr;
}

constexpr reference operator*() const {
return *ptr;
}

constexpr demoterator& operator++() {
++ptr;
return *this;
}
constexpr void operator++(int) {
++*this;
}

const int* ptr;
};

// Just long enough to force a reallocation when inserting
static constexpr int numbers[33] = { //
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, //
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, //
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, //
0, 1, 2};

template <typename T>
struct soccc_allocator {
using value_type = T;
Expand Down Expand Up @@ -462,6 +495,18 @@ constexpr bool test_interface() {

emplaced.erase(emplaced.begin(), emplaced.begin() + 2);
assert(emplaced.size() == 22);

{
// GH-2440: we were incorrectly reallocating _before_ orphaning iterators
// (resulting in UB) while inserting ranges of unknown length

vector<bool> input_inserted;
const auto result =
input_inserted.insert(input_inserted.end(), demoterator{begin(numbers)}, demoterator{end(numbers)});
static_assert(is_same_v<decltype(result), const vector<bool>::iterator>);
assert(result == input_inserted.begin());
assert(input_inserted.size() == size(numbers));
}
#endif // __EDG__
}

Expand Down