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.

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

[libc++] Fix __split_buffer::reserve() #105681

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion libcxx/include/__split_buffer
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::swap(__split

template <class _Tp, class _Allocator>
_LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::reserve(size_type __n) {
if (__n < capacity()) {
if (__n > capacity()) {
__split_buffer<value_type, __alloc_rr&> __t(__n, 0, __alloc());
__t.__construct_at_end(move_iterator<pointer>(__begin_), move_iterator<pointer>(__end_));
std::swap(__first_, __t.__first_);
Expand Down
69 changes: 69 additions & 0 deletions libcxx/test/libcxx/utilities/split_buffer.pass.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include <__split_buffer>
#include <__config>
#include <cassert>
#include <memory>
#include <type_traits>
#include <string>

#include "test_macros.h"

struct simple_test_type {
int value;
};

struct complex_test_type {
std::string value;
complex_test_type(const std::string& v) : value(v) {}
};

template <class TEST_TYPE>
_LIBCPP_CONSTEXPR_SINCE_CXX20 int capacity_after_initialization() {
std::__split_buffer<TEST_TYPE> sb;
return sb.capacity();
}

template <class TEST_TYPE>
_LIBCPP_CONSTEXPR_SINCE_CXX20 int capacity_after_reserve(const std::size_t n) {
std::__split_buffer<TEST_TYPE> sb;
sb.reserve(n);
return sb.capacity();
}

int main() {
{ // check test_types' features
#if _LIBCPP_STD_VER >= 17
static_assert(std::is_trivially_copyable_v<simple_test_type>);
static_assert(not std::is_trivially_copyable_v<complex_test_type>);
#endif
}

{ // test simple_test_type at run-time
assert(0 == capacity_after_initialization<simple_test_type>());
assert(42 == capacity_after_reserve<simple_test_type>(42));
}

{ // test complex_test_type at run-time
assert(0 == capacity_after_initialization<complex_test_type>());
assert(42 == capacity_after_reserve<complex_test_type>(42));
}

#if _LIBCPP_STD_VER >= 20
{ // test simple_test_type at compile-time
static_assert(0 == capacity_after_initialization<simple_test_type>());
static_assert(42 == capacity_after_reserve<simple_test_type>(42));
}

{ // test complex_test_type at compile-time
static_assert(0 == capacity_after_initialization<complex_test_type>());
static_assert(42 == capacity_after_reserve<complex_test_type>(42));
}
#endif
}
Loading