From 4a23151e7ee089f54f0575f0a6d499e3a3fb6728 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 21 Jun 2021 23:19:49 -0700 Subject: Export of internal Abseil changes -- f6d1ddef9a38e3fb8492181bf1a7a006b7f2145d by Abseil Team : Update the implementation of `operator<<` in Status to use `ToString(StatusToStringMode::kWithEverything)` PiperOrigin-RevId: 380740880 -- 5f13b20c4b85c1c6e94b69c74f80f8f3f3941747 by Derek Mauro : Update Docker images This also disables the Clang/libstdc++/C++20 combo as it seems that the latest libstdc++ is relying on C++20 Concepts to a greater extent than Clang supports. PiperOrigin-RevId: 380714572 -- f8f4dee12cfd02559bf741ad6b06f10ac0c48c73 by Abseil Team : Fix shadow member warnings in randen_hwaes.cc These happen when attempting to use abseil in github.com/google/benchmark. The project sets -Wshadow. The warning is due to the name of the Vector128 ctor parameter. Using v instead, which I see used elsewhere (e.g. line 290) PiperOrigin-RevId: 380704197 -- 2e1a09e9cb1239485715acb4828d9b4799fcfbb5 by Tom Manshreck : Add more precise documentation for AbslParseFlag declarations in the Time API PiperOrigin-RevId: 380649107 -- 153e5f7a960c03e4161c03737a0ff18ba377ff73 by Evan Brown : Make the number of control bytes a constant. We use a constexpr function because we need to support C++11, which doesn't have inline variables. The motivation is to avoid future bugs where the number changes and we forget to update all the places it's used. This CL should be a no-op. PiperOrigin-RevId: 380253975 GitOrigin-RevId: f6d1ddef9a38e3fb8492181bf1a7a006b7f2145d Change-Id: Id584138f898bf3ebef95fabcf48e41098c4db954 --- absl/container/internal/raw_hash_set.cc | 2 +- absl/container/internal/raw_hash_set.h | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'absl/container') diff --git a/absl/container/internal/raw_hash_set.cc b/absl/container/internal/raw_hash_set.cc index c9840f7..f5a9ce6 100644 --- a/absl/container/internal/raw_hash_set.cc +++ b/absl/container/internal/raw_hash_set.cc @@ -51,7 +51,7 @@ void ConvertDeletedToEmptyAndFullToDeleted( Group{pos}.ConvertSpecialToEmptyAndFullToDeleted(pos); } // Copy the cloned ctrl bytes. - std::memcpy(ctrl + capacity + 1, ctrl, Group::kWidth - 1); + std::memcpy(ctrl + capacity + 1, ctrl, NumClonedBytes()); ctrl[capacity] = kSentinel; } diff --git a/absl/container/internal/raw_hash_set.h b/absl/container/internal/raw_hash_set.h index 844890f..508f212 100644 --- a/absl/container/internal/raw_hash_set.h +++ b/absl/container/internal/raw_hash_set.h @@ -448,6 +448,10 @@ using Group = GroupSse2Impl; using Group = GroupPortableImpl; #endif +// The number of cloned control bytes that we copy from the beginning to the +// end of the control bytes array. +constexpr size_t NumClonedBytes() { return Group::kWidth - 1; } + template class raw_hash_set; @@ -629,8 +633,8 @@ class raw_hash_set { static Layout MakeLayout(size_t capacity) { assert(IsValidCapacity(capacity)); // The extra control bytes are for 1 sentinel byte followed by - // `Group::kWidth - 1` bytes that are cloned from the beginning. - return Layout(capacity + Group::kWidth, capacity); + // NumClonedBytes() bytes that are cloned from the beginning. + return Layout(capacity + 1 + NumClonedBytes(), capacity); } using AllocTraits = absl::allocator_traits; @@ -1796,8 +1800,8 @@ class raw_hash_set { } ctrl_[i] = h; - constexpr size_t kClonedBytes = Group::kWidth - 1; - ctrl_[((i - kClonedBytes) & capacity_) + (kClonedBytes & capacity_)] = h; + ctrl_[((i - NumClonedBytes()) & capacity_) + + (NumClonedBytes() & capacity_)] = h; } size_t& growth_left() { return settings_.template get<0>(); } @@ -1816,10 +1820,10 @@ class raw_hash_set { // TODO(alkis): Investigate removing some of these fields: // - ctrl/slots can be derived from each other // - size can be moved into the slot array - ctrl_t* ctrl_ = EmptyGroup(); // [(capacity + Group::kWidth) * ctrl_t] - slot_type* slots_ = nullptr; // [capacity * slot_type] - size_t size_ = 0; // number of full slots - size_t capacity_ = 0; // total number of slots + ctrl_t* ctrl_ = EmptyGroup(); // [(capacity + 1 + NumClonedBytes()) * ctrl_t] + slot_type* slots_ = nullptr; // [capacity * slot_type] + size_t size_ = 0; // number of full slots + size_t capacity_ = 0; // total number of slots absl::container_internal::CompressedTuple -- cgit v1.2.3