Export of internal Abseil changes.
-- 8becce38c862a044db194a9aea1b505796a46d6f by Abseil Team <absl-team@google.com>: Updates the FixedArray's constructors to be exception safe by preventing double deletions. Also adds exception safety tests for FixedArray to document/enforce the expected behavior. PiperOrigin-RevId: 201964431 -- 794188b401a602b4be97190fb8738066fe1f9ca5 by Derek Mauro <dmauro@google.com>: Fixes for str_format.h documentation. PiperOrigin-RevId: 201951760 -- beae3bdd6eee2cf61101102fddc35ada188f330b by Alex Strelnikov <strel@google.com>: Add numeric_limits specialization for uint128. Turns out numeric_limits is a case where the consensus is that it is okay to specialize for a user defined type. PiperOrigin-RevId: 201944736 -- b2b3444a52b36878ade1ae8801e69932b05fc4f9 by Shaindel Schwartz <shaindel@google.com>: Internal change. PiperOrigin-RevId: 201718662 -- aa924c459922f39caabfc193998c58d0f4981ac0 by Abseil Team <absl-team@google.com>: Typo fix. PiperOrigin-RevId: 201692176 -- bbfcaa7b1af331d9b97c92470608240c5c864fbc by Xiaoyi Zhang <zhangxy@google.com>: Use ABSL_HAVE_ANY/OPTIONAL/VARIANT to conditionally compile out the definition of absl::bad_any_cast, absl::bad_optional_access, absl::bad_variant_access. This would fix the issues where users #include those header directly in C++17 modes. PiperOrigin-RevId: 201683792 GitOrigin-RevId: 8becce38c862a044db194a9aea1b505796a46d6f Change-Id: I60a7ad043136a439d82c374d225a1804016b0509
This commit is contained in:
parent
4491d606df
commit
87a4c07856
20 changed files with 422 additions and 48 deletions
|
|
@ -62,6 +62,17 @@ cc_test(
|
|||
],
|
||||
)
|
||||
|
||||
cc_test(
|
||||
name = "fixed_array_exception_safety_test",
|
||||
srcs = ["fixed_array_exception_safety_test.cc"],
|
||||
copts = ABSL_TEST_COPTS + ABSL_EXCEPTIONS_FLAG,
|
||||
deps = [
|
||||
":fixed_array",
|
||||
"//absl/base:exception_safety_testing",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
)
|
||||
|
||||
cc_test(
|
||||
name = "fixed_array_benchmark",
|
||||
srcs = ["fixed_array_benchmark.cc"],
|
||||
|
|
|
|||
|
|
@ -84,6 +84,25 @@ absl_test(
|
|||
)
|
||||
|
||||
|
||||
# test fixed_array_exception_safety_test
|
||||
set(FIXED_ARRAY_EXCEPTION_SAFETY_TEST_SRC "fixed_array_exception_safety_test.cc")
|
||||
set(FIXED_ARRAY_EXCEPTION_SAFETY_TEST_PUBLIC_LIBRARIES
|
||||
absl::container
|
||||
absl_base_internal_exception_safety_testing
|
||||
)
|
||||
|
||||
absl_test(
|
||||
TARGET
|
||||
fixed_array_exception_safety_test
|
||||
SOURCES
|
||||
${FIXED_ARRAY_EXCEPTION_SAFETY_TEST_SRC}
|
||||
PUBLIC_LIBRARIES
|
||||
${FIXED_ARRAY_EXCEPTION_SAFETY_TEST_PUBLIC_LIBRARIES}
|
||||
PRIVATE_COMPILE_FLAGS
|
||||
${ABSL_EXCEPTIONS_FLAG}
|
||||
)
|
||||
|
||||
|
||||
# test inlined_vector_test
|
||||
set(INLINED_VECTOR_TEST_SRC "inlined_vector_test.cc")
|
||||
set(INLINED_VECTOR_TEST_PUBLIC_LIBRARIES absl::base absl_throw_delegate test_instance_tracker_lib)
|
||||
|
|
|
|||
|
|
@ -108,33 +108,46 @@ class FixedArray {
|
|||
? kInlineBytesDefault / sizeof(value_type)
|
||||
: inlined;
|
||||
|
||||
FixedArray(const FixedArray& other) : rep_(other.begin(), other.end()) {}
|
||||
FixedArray(const FixedArray& other)
|
||||
: FixedArray(other.begin(), other.end()) {}
|
||||
|
||||
FixedArray(FixedArray&& other) noexcept(
|
||||
// clang-format off
|
||||
absl::allocator_is_nothrow<std::allocator<value_type>>::value &&
|
||||
// clang-format on
|
||||
std::is_nothrow_move_constructible<value_type>::value)
|
||||
: rep_(std::make_move_iterator(other.begin()),
|
||||
std::make_move_iterator(other.end())) {}
|
||||
: FixedArray(std::make_move_iterator(other.begin()),
|
||||
std::make_move_iterator(other.end())) {}
|
||||
|
||||
// Creates an array object that can store `n` elements.
|
||||
// Note that trivially constructible elements will be uninitialized.
|
||||
explicit FixedArray(size_type n) : rep_(n) {}
|
||||
explicit FixedArray(size_type n) : rep_(n) {
|
||||
absl::memory_internal::uninitialized_default_construct_n(rep_.begin(),
|
||||
size());
|
||||
}
|
||||
|
||||
// Creates an array initialized with `n` copies of `val`.
|
||||
FixedArray(size_type n, const value_type& val) : rep_(n, val) {}
|
||||
FixedArray(size_type n, const value_type& val) : rep_(n) {
|
||||
std::uninitialized_fill_n(data(), size(), val);
|
||||
}
|
||||
|
||||
// Creates an array initialized with the elements from the input
|
||||
// range. The array's size will always be `std::distance(first, last)`.
|
||||
// REQUIRES: Iter must be a forward_iterator or better.
|
||||
template <typename Iter, EnableIfForwardIterator<Iter> = 0>
|
||||
FixedArray(Iter first, Iter last) : rep_(first, last) {}
|
||||
FixedArray(Iter first, Iter last) : rep_(std::distance(first, last)) {
|
||||
std::uninitialized_copy(first, last, data());
|
||||
}
|
||||
|
||||
// Creates the array from an initializer_list.
|
||||
FixedArray(std::initializer_list<T> init_list)
|
||||
: FixedArray(init_list.begin(), init_list.end()) {}
|
||||
|
||||
~FixedArray() {}
|
||||
~FixedArray() noexcept {
|
||||
for (Holder* cur = rep_.begin(); cur != rep_.end(); ++cur) {
|
||||
cur->~Holder();
|
||||
}
|
||||
}
|
||||
|
||||
// Assignments are deleted because they break the invariant that the size of a
|
||||
// `FixedArray` never changes.
|
||||
|
|
@ -431,32 +444,13 @@ class FixedArray {
|
|||
|
||||
// Rep
|
||||
//
|
||||
// A const Rep object holds FixedArray's size and data pointer.
|
||||
// An instance of Rep manages the inline and out-of-line memory for FixedArray
|
||||
//
|
||||
class Rep : public InlineSpace<inline_elements> {
|
||||
public:
|
||||
Rep(size_type n, const value_type& val) : n_(n), p_(MakeHolder(n)) {
|
||||
std::uninitialized_fill_n(p_, n, val);
|
||||
}
|
||||
explicit Rep(size_type n) : n_(n), p_(MakeHolder(n)) {}
|
||||
|
||||
explicit Rep(size_type n) : n_(n), p_(MakeHolder(n)) {
|
||||
// Loop optimizes to nothing for trivially constructible T.
|
||||
for (Holder* p = p_; p != p_ + n; ++p)
|
||||
// Note: no parens: default init only.
|
||||
// Also note '::' to avoid Holder class placement new operator.
|
||||
::new (static_cast<void*>(p)) Holder;
|
||||
}
|
||||
|
||||
template <typename Iter>
|
||||
Rep(Iter first, Iter last)
|
||||
: n_(std::distance(first, last)), p_(MakeHolder(n_)) {
|
||||
std::uninitialized_copy(first, last, AsValue(p_));
|
||||
}
|
||||
|
||||
~Rep() {
|
||||
// Destruction must be in reverse order.
|
||||
// Loop optimizes to nothing for trivially destructible T.
|
||||
for (Holder* p = end(); p != begin();) (--p)->~Holder();
|
||||
~Rep() noexcept {
|
||||
if (IsAllocated(size())) {
|
||||
std::allocator<Holder>().deallocate(p_, n_);
|
||||
} else {
|
||||
|
|
|
|||
117
absl/container/fixed_array_exception_safety_test.cc
Normal file
117
absl/container/fixed_array_exception_safety_test.cc
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
// Copyright 2017 The Abseil Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <initializer_list>
|
||||
|
||||
#include "absl/container/fixed_array.h"
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "absl/base/internal/exception_safety_testing.h"
|
||||
|
||||
namespace absl {
|
||||
|
||||
namespace {
|
||||
|
||||
constexpr size_t kInlined = 25;
|
||||
constexpr size_t kSmallSize = kInlined / 2;
|
||||
constexpr size_t kLargeSize = kInlined * 2;
|
||||
|
||||
constexpr int kInitialValue = 5;
|
||||
constexpr int kUpdatedValue = 10;
|
||||
|
||||
using ::testing::TestThrowingCtor;
|
||||
|
||||
using Thrower = testing::ThrowingValue<testing::TypeSpec::kEverythingThrows>;
|
||||
using FixedArr = absl::FixedArray<Thrower, kInlined>;
|
||||
|
||||
using MoveThrower = testing::ThrowingValue<testing::TypeSpec::kNoThrowMove>;
|
||||
using MoveFixedArr = absl::FixedArray<MoveThrower, kInlined>;
|
||||
|
||||
TEST(FixedArrayExceptionSafety, CopyConstructor) {
|
||||
auto small = FixedArr(kSmallSize);
|
||||
TestThrowingCtor<FixedArr>(small);
|
||||
|
||||
auto large = FixedArr(kLargeSize);
|
||||
TestThrowingCtor<FixedArr>(large);
|
||||
}
|
||||
|
||||
TEST(FixedArrayExceptionSafety, MoveConstructor) {
|
||||
TestThrowingCtor<FixedArr>(FixedArr(kSmallSize));
|
||||
TestThrowingCtor<FixedArr>(FixedArr(kLargeSize));
|
||||
|
||||
// TypeSpec::kNoThrowMove
|
||||
TestThrowingCtor<MoveFixedArr>(MoveFixedArr(kSmallSize));
|
||||
TestThrowingCtor<MoveFixedArr>(MoveFixedArr(kLargeSize));
|
||||
}
|
||||
|
||||
TEST(FixedArrayExceptionSafety, SizeConstructor) {
|
||||
TestThrowingCtor<FixedArr>(kSmallSize);
|
||||
TestThrowingCtor<FixedArr>(kLargeSize);
|
||||
}
|
||||
|
||||
TEST(FixedArrayExceptionSafety, SizeValueConstructor) {
|
||||
TestThrowingCtor<FixedArr>(kSmallSize, Thrower());
|
||||
TestThrowingCtor<FixedArr>(kLargeSize, Thrower());
|
||||
}
|
||||
|
||||
TEST(FixedArrayExceptionSafety, IteratorConstructor) {
|
||||
auto small = FixedArr(kSmallSize);
|
||||
TestThrowingCtor<FixedArr>(small.begin(), small.end());
|
||||
|
||||
auto large = FixedArr(kLargeSize);
|
||||
TestThrowingCtor<FixedArr>(large.begin(), large.end());
|
||||
}
|
||||
|
||||
TEST(FixedArrayExceptionSafety, InitListConstructor) {
|
||||
constexpr int small_inlined = 3;
|
||||
using SmallFixedArr = absl::FixedArray<Thrower, small_inlined>;
|
||||
|
||||
TestThrowingCtor<SmallFixedArr>(std::initializer_list<Thrower>{});
|
||||
// Test inlined allocation
|
||||
TestThrowingCtor<SmallFixedArr>(
|
||||
std::initializer_list<Thrower>{Thrower{}, Thrower{}});
|
||||
// Test out of line allocation
|
||||
TestThrowingCtor<SmallFixedArr>(std::initializer_list<Thrower>{
|
||||
Thrower{}, Thrower{}, Thrower{}, Thrower{}, Thrower{}});
|
||||
}
|
||||
|
||||
testing::AssertionResult ReadMemory(FixedArr* fixed_arr) {
|
||||
// Marked volatile to prevent optimization. Used for running asan tests.
|
||||
volatile int sum = 0;
|
||||
for (const auto& thrower : *fixed_arr) {
|
||||
sum += thrower.Get();
|
||||
}
|
||||
return testing::AssertionSuccess() << "Values sum to [" << sum << "]";
|
||||
}
|
||||
|
||||
TEST(FixedArrayExceptionSafety, Fill) {
|
||||
auto test_fill = testing::MakeExceptionSafetyTester()
|
||||
.WithInvariants(ReadMemory)
|
||||
.WithOperation([&](FixedArr* fixed_arr_ptr) {
|
||||
auto thrower =
|
||||
Thrower(kUpdatedValue, testing::nothrow_ctor);
|
||||
fixed_arr_ptr->fill(thrower);
|
||||
});
|
||||
|
||||
EXPECT_TRUE(
|
||||
test_fill.WithInitialValue(FixedArr(kSmallSize, Thrower(kInitialValue)))
|
||||
.Test());
|
||||
EXPECT_TRUE(
|
||||
test_fill.WithInitialValue(FixedArr(kLargeSize, Thrower(kInitialValue)))
|
||||
.Test());
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
} // namespace absl
|
||||
Loading…
Add table
Add a link
Reference in a new issue