summaryrefslogtreecommitdiff
path: root/absl/memory
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2018-08-01 04:34:12 -0700
committerGravatar Derek Mauro <dmauro@google.com>2018-08-01 13:27:57 -0400
commit2125e6444a9de9e41f21ecdc674dd7d8759c149d (patch)
treedd0498a26dcbf4453df9c913fc805650b64916ef /absl/memory
parent9acad869d21731f5bc50430a33fe61cc0ffcbb0b (diff)
Export of internal Abseil changes.
-- ac7508120c60dfe689c40929e416b6a486f83ee3 by Gennadiy Rozental <rogeeff@google.com>: Internal change PiperOrigin-RevId: 206912089 -- bd709faba88565367b6d337466e6456481b5f3e8 by Matt Calabrese <calabrese@google.com>: Implement `std::experimental::is_detected` in type_traits internals and move `is_detected_convertible` from variant's internals to type_traits internals. This is in preparation of creating workarounds for broken standard traits. PiperOrigin-RevId: 206825598 -- 0dbddea569370eb9b6348cee172d1874f9046eb4 by Jorg Brown <jorg@google.com>: Support users who turn on floating-point conversion warnings PiperOrigin-RevId: 206813209 -- 30991f757c8f0100584619d8a9c41897d029f112 by Jorg Brown <jorg@google.com>: Speed up the absl::Seconds() function for floating-point values, roughly by 4.5x, since we can take advantage of the fact that we're just taking a floating-point number and splitting it into its integral and fractional parts. PiperOrigin-RevId: 206806270 -- 6883837176838aa5a517e7a8cb4c99afd24c0d12 by Jon Cohen <cohenjon@google.com>: Remove the DISABLE_INSTALL from absl_container. It doesn't do anything. PiperOrigin-RevId: 206802544 -- 92ab14fed06e6dd1f01a0284bd7f95d3e2c0c3d8 by Jon Cohen <cohenjon@google.com>: Internal change PiperOrigin-RevId: 206776244 -- 17b76c7f364ac562d9e0faeca0320f63aa3fdb85 by Jorg Brown <jorg@google.com>: Fix absl/strings:numbers_test flakiness due to exceeding the 1-minute timeout PiperOrigin-RevId: 206763175 -- 6637843f2e198b8efd90e5577fbc86bdea43b2cc by Abseil Team <absl-team@google.com>: Adds templated allocator to absl::FixedArray with corresponding tests PiperOrigin-RevId: 206354178 -- bced22f81add828c9b4c60eb45554d36c22e2f96 by Abseil Team <absl-team@google.com>: Adds templated allocator to absl::FixedArray with corresponding tests PiperOrigin-RevId: 206347377 -- 75be14a71d2d5e335812d5b7670120271fb5bd79 by Abseil Team <absl-team@google.com>: Internal change. PiperOrigin-RevId: 206326935 -- 6929e43f4c7898b1f51e441911a19092a06fbf97 by Abseil Team <absl-team@google.com>: Adds templated allocator to absl::FixedArray with corresponding tests PiperOrigin-RevId: 206326368 -- 55ae34b75ff029eb267f9519e577bab8a575b487 by Abseil Team <absl-team@google.com>: Internal change. PiperOrigin-RevId: 206233448 -- 6950a8ccddf35d451eec2d02cd28a797c8b7cf6a by Matt Kulukundis <kfm@google.com>: Internal change PiperOrigin-RevId: 206035613 GitOrigin-RevId: ac7508120c60dfe689c40929e416b6a486f83ee3 Change-Id: I675605abbedab6b3ac9aa82195cbd059ff7c82b1
Diffstat (limited to 'absl/memory')
-rw-r--r--absl/memory/memory.h56
-rw-r--r--absl/memory/memory_exception_safety_test.cc11
-rw-r--r--absl/memory/memory_test.cc43
3 files changed, 37 insertions, 73 deletions
diff --git a/absl/memory/memory.h b/absl/memory/memory.h
index f207169a..c7caf8b9 100644
--- a/absl/memory/memory.h
+++ b/absl/memory/memory.h
@@ -641,38 +641,56 @@ struct default_allocator_is_nothrow : std::false_type {};
#endif
namespace memory_internal {
-// TODO(b110200014): Implement proper backports
-template <typename ForwardIt>
-void DefaultConstruct(ForwardIt it) {
- using value_type = typename std::iterator_traits<ForwardIt>::value_type;
- ::new (static_cast<void*>(std::addressof(*it))) value_type;
-} // namespace memory_internal
-
#ifdef ABSL_HAVE_EXCEPTIONS
-template <typename ForwardIt, typename Size>
-void uninitialized_default_construct_n(ForwardIt first, Size size) {
- for (ForwardIt cur = first; size > 0; static_cast<void>(++cur), --size) {
+template <typename Allocator, typename StorageElement, typename... Args>
+void ConstructStorage(Allocator* alloc, StorageElement* first,
+ StorageElement* last, const Args&... args) {
+ for (StorageElement* cur = first; cur != last; ++cur) {
+ try {
+ std::allocator_traits<Allocator>::construct(*alloc, cur, args...);
+ } catch (...) {
+ while (cur != first) {
+ --cur;
+ std::allocator_traits<Allocator>::destroy(*alloc, cur);
+ }
+ throw;
+ }
+ }
+}
+template <typename Allocator, typename StorageElement, typename Iterator>
+void CopyToStorageFromRange(Allocator* alloc, StorageElement* destination,
+ Iterator first, Iterator last) {
+ for (StorageElement* cur = destination; first != last;
+ static_cast<void>(++cur), static_cast<void>(++first)) {
try {
- absl::memory_internal::DefaultConstruct(cur);
+ std::allocator_traits<Allocator>::construct(*alloc, cur, *first);
} catch (...) {
- using value_type = typename std::iterator_traits<ForwardIt>::value_type;
- for (; first != cur; ++first) {
- first->~value_type();
+ while (cur != destination) {
+ --cur;
+ std::allocator_traits<Allocator>::destroy(*alloc, cur);
}
throw;
}
}
}
#else // ABSL_HAVE_EXCEPTIONS
-template <typename ForwardIt, typename Size>
-void uninitialized_default_construct_n(ForwardIt first, Size size) {
- for (; size > 0; static_cast<void>(++first), --size) {
- absl::memory_internal::DefaultConstruct(first);
+template <typename Allocator, typename StorageElement, typename... Args>
+void ConstructStorage(Allocator* alloc, StorageElement* first,
+ StorageElement* last, const Args&... args) {
+ for (; first != last; ++first) {
+ std::allocator_traits<Allocator>::construct(*alloc, first, args...);
+ }
+}
+template <typename Allocator, typename StorageElement, typename Iterator>
+void CopyToStorageFromRange(Allocator* alloc, StorageElement* destination,
+ Iterator first, Iterator last) {
+ for (; first != last;
+ static_cast<void>(++destination), static_cast<void>(++first)) {
+ std::allocator_traits<Allocator>::construct(*alloc, destination, *first);
}
}
#endif // ABSL_HAVE_EXCEPTIONS
} // namespace memory_internal
-
} // namespace absl
#endif // ABSL_MEMORY_MEMORY_H_
diff --git a/absl/memory/memory_exception_safety_test.cc b/absl/memory/memory_exception_safety_test.cc
index fb8b561d..d1f6e84f 100644
--- a/absl/memory/memory_exception_safety_test.cc
+++ b/absl/memory/memory_exception_safety_test.cc
@@ -48,16 +48,5 @@ TEST(MakeUnique, CheckForLeaks) {
}));
}
-TEST(MemoryInternal, UninitDefaultConstructNNonTrivial) {
- EXPECT_TRUE(testing::MakeExceptionSafetyTester()
- .WithInitialValue(ThrowerList{})
- .WithOperation([&](ThrowerList* list_ptr) {
- absl::memory_internal::uninitialized_default_construct_n(
- list_ptr->data(), kLength);
- })
- .WithInvariants([&](...) { return true; })
- .Test());
-}
-
} // namespace
} // namespace absl
diff --git a/absl/memory/memory_test.cc b/absl/memory/memory_test.cc
index 8ff1945d..dee9b486 100644
--- a/absl/memory/memory_test.cc
+++ b/absl/memory/memory_test.cc
@@ -611,47 +611,4 @@ TEST(AllocatorNoThrowTest, CustomAllocator) {
EXPECT_FALSE(absl::allocator_is_nothrow<UnspecifiedAllocator>::value);
}
-TEST(MemoryInternal, UninitDefaultConstructNTrivial) {
- constexpr int kInitialValue = 123;
- constexpr int kExpectedValue = kInitialValue; // Expect no-op behavior
- constexpr int len = 5;
-
- struct TestObj {
- int val;
- };
- static_assert(absl::is_trivially_default_constructible<TestObj>::value, "");
- static_assert(absl::is_trivially_destructible<TestObj>::value, "");
-
- TestObj objs[len];
- for (auto& obj : objs) {
- obj.val = kInitialValue;
- }
-
- absl::memory_internal::uninitialized_default_construct_n(objs, len);
- for (auto& obj : objs) {
- EXPECT_EQ(obj.val, kExpectedValue);
- }
-}
-
-TEST(MemoryInternal, UninitDefaultConstructNNonTrivial) {
- constexpr int kInitialValue = 123;
- constexpr int kExpectedValue = 0; // Expect value-construction behavior
- constexpr int len = 5;
-
- struct TestObj {
- int val{kExpectedValue};
- };
- static_assert(absl::is_trivially_destructible<TestObj>::value, "");
-
- TestObj objs[len];
- for (auto& obj : objs) {
- obj.val = kInitialValue;
- }
-
- absl::memory_internal::uninitialized_default_construct_n(objs, len);
- for (auto& obj : objs) {
- EXPECT_EQ(obj.val, kExpectedValue);
- }
-}
-
} // namespace