diff options
author | Aaron Jacobs <jacobsa@google.com> | 2023-04-11 17:58:22 -0700 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2023-04-11 17:59:17 -0700 |
commit | 2e47068db220fc9897ce8140e4dae5c11bb09f2c (patch) | |
tree | c29bfa38a66368058320c05d20b18ea9543b293e /absl | |
parent | dd89c56c2ad8fe06db8fd199c7ff77c817f0111f (diff) |
inlined_vector: fix incorrect restrictions on the move-assignment fast path.
This has nothing to do with copy construction or copy assignment.
PiperOrigin-RevId: 523557887
Change-Id: I332d6ceaf738305157605f1271cb577a83d198c5
Diffstat (limited to 'absl')
-rw-r--r-- | absl/container/internal/inlined_vector.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h index e38cd8b1..945129b9 100644 --- a/absl/container/internal/inlined_vector.h +++ b/absl/container/internal/inlined_vector.h @@ -306,20 +306,9 @@ class Storage { // it's safe for us to simply adopt the contents of the storage for // `other` and remove its own reference to them. It's as if we had // individually move-assigned each value and then destroyed the original. - // - // TODO(b/274984172): we check for copy-assignability here only for - // historical reasons. This is too strict: we are simulating move - // assignment here. - // - // TODO(b/274984172): the condition on copy-constructibility is here only - // for historical reasons. It doesn't make semantic sense: we don't need - // to be able to copy construct here, we are doing an "as-if" move - // assignment. - absl::conjunction< - absl::is_trivially_copy_assignable<ValueType<A>>, - absl::is_trivially_destructible<ValueType<A>>, - std::is_same<A, std::allocator<ValueType<A>>>, - absl::is_trivially_copy_constructible<ValueType<A>>>::value, + absl::conjunction<absl::is_trivially_move_assignable<ValueType<A>>, + absl::is_trivially_destructible<ValueType<A>>, + std::is_same<A, std::allocator<ValueType<A>>>>::value, MemcpyPolicy, // Otherwise we use move assignment if possible. If not, we simulate // move assignment using move construction. |