From a4c3ffff11eec0ee45742f915c255e9f870b7e0f Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 29 Oct 2018 15:53:34 -0700 Subject: Export of internal Abseil changes. -- ba4dd47492748bd630462eb68b7959037fc6a11a by Abseil Team : Work around nvcc 9.0 compiler bug for open-source Tensorflow build. With the current implementation, when I (unintentionally and transitively) include absl/types/optional.h in a CUDA compilation unit, I get the following nvcc error message: INFO: From Compiling tensorflow/core/kernels/crop_and_resize_op_gpu.cu.cc: external/com_google_absl/absl/types/optional.h: In member function 'void absl::optional_internal::optional_data_dtor_base >::destruct()': external/com_google_absl/absl/types/optional.h:185:50: error: '__T0' was not declared in this scope data_.~T(); I've also seen similar compilation failures online, for flat_hash_map: https://devtalk.nvidia.com/default/topic/1042599/nvcc-preprocessor-bug-causes-compilation-failure/ The bug is always around unnamed template parameters. Therefore, the workaround is to make them named. PiperOrigin-RevId: 219208288 -- dad2f40cb2e8d5017660985ef6fb57f3c3cdcc80 by CJ Johnson : Adds internal macros for catching and throwing unknown exception types PiperOrigin-RevId: 219207362 -- 0a9840328d2d86e8420b853435fdbf1f7a19d931 by Abseil Team : Fix typo in mutex.h comments. PiperOrigin-RevId: 219199397 -- 0d576dc7597564210bfdf91518075064756f0bf4 by Matt Calabrese : Internal change. PiperOrigin-RevId: 219185475 -- 66be156095571959fb19a76da8ad0b53ec37658e by Abseil Team : Fix alignment conformance for VS 2017 >= 15.8 (fix #193) PiperOrigin-RevId: 219129894 -- a6e1825a12587945f8194677ccfdcaba6f7aad1d by Abseil Team : Reapply PR #173 PiperOrigin-RevId: 219129361 -- cf72ade4881b25acc6ccaea468f69793a0fdce32 by Abseil Team : Update .gitignore PiperOrigin-RevId: 219127495 -- 0537490c6348a2cb489abe15638928ac5aa6982a by Jon Cohen : Small refactor and reformat of error messages from the exception safety test framework. PiperOrigin-RevId: 218927773 -- 4c556ca45fa25698ad12002a00c713aeceefab73 by CJ Johnson : Updates the inlined vector swap tests to check for number of moves that took place if available PiperOrigin-RevId: 218900777 -- dcbfda0021a1e6dfa9586986b1269c06ec394053 by Mark Barolak : Add parens around calls to std::numeric_limits<>::min and std::numeric_limits<>::max to prevent compilation errors on Windows platforms where min and max are defined as macros. PiperOrigin-RevId: 218888700 GitOrigin-RevId: ba4dd47492748bd630462eb68b7959037fc6a11a Change-Id: I0e393958eb8cb501b85f6114979f6d4d86ed996c --- absl/container/CMakeLists.txt | 17 +++++++++++++++-- absl/container/fixed_array.h | 2 +- absl/container/inlined_vector.h | 2 +- absl/container/inlined_vector_test.cc | 12 +++++++----- absl/container/internal/hash_policy_testing.h | 2 +- absl/container/internal/raw_hash_set.h | 4 ++-- 6 files changed, 27 insertions(+), 12 deletions(-) (limited to 'absl/container') diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt index 4d2e155..72113e1 100644 --- a/absl/container/CMakeLists.txt +++ b/absl/container/CMakeLists.txt @@ -48,14 +48,15 @@ list(APPEND CONTAINER_INTERNAL_HEADERS ) -absl_header_library( +absl_library( TARGET absl_container + SOURCES + "internal/raw_hash_set.cc" EXPORT_NAME container ) - # ## TESTS # @@ -162,3 +163,15 @@ absl_test( PUBLIC_LIBRARIES ${TEST_INSTANCE_TRACKER_TEST_PUBLIC_LIBRARIES} ) + +absl_test( + TARGET + raw_hash_set_test + SOURCES + "internal/raw_hash_set_test.cc" + PUBLIC_LIBRARIES + absl::base + absl::hash + absl_internal_throw_delegate + test_instance_tracker_lib +) diff --git a/absl/container/fixed_array.h b/absl/container/fixed_array.h index fe67dce..6da8441 100644 --- a/absl/container/fixed_array.h +++ b/absl/container/fixed_array.h @@ -188,7 +188,7 @@ class FixedArray { // `FixedArray`. This is equivalent to the most possible addressable bytes // over the number of bytes taken by T. constexpr size_type max_size() const { - return std::numeric_limits::max() / sizeof(value_type); + return (std::numeric_limits::max)() / sizeof(value_type); } // FixedArray::empty() diff --git a/absl/container/inlined_vector.h b/absl/container/inlined_vector.h index 12756bb..0d773e5 100644 --- a/absl/container/inlined_vector.h +++ b/absl/container/inlined_vector.h @@ -264,7 +264,7 @@ class InlinedVector { // One bit of the size storage is used to indicate whether the inlined // vector is allocated; as a result, the maximum size of the container that // we can express is half of the max for our size type. - return std::numeric_limits::max() / 2; + return (std::numeric_limits::max)() / 2; } // InlinedVector::data() diff --git a/absl/container/inlined_vector_test.cc b/absl/container/inlined_vector_test.cc index 08dcd3e..5485f45 100644 --- a/absl/container/inlined_vector_test.cc +++ b/absl/container/inlined_vector_test.cc @@ -906,6 +906,8 @@ TYPED_TEST_P(InstanceTest, Swap) { InstanceTracker tracker; InstanceVec a, b; const size_t inlined_capacity = a.capacity(); + auto min_len = std::min(l1, l2); + auto max_len = std::max(l1, l2); for (int i = 0; i < l1; i++) a.push_back(Instance(i)); for (int i = 0; i < l2; i++) b.push_back(Instance(100+i)); EXPECT_EQ(tracker.instances(), l1 + l2); @@ -919,15 +921,15 @@ TYPED_TEST_P(InstanceTest, Swap) { EXPECT_EQ(tracker.swaps(), 0); // Allocations are swapped. EXPECT_EQ(tracker.moves(), 0); } else if (a.size() <= inlined_capacity && b.size() <= inlined_capacity) { - EXPECT_EQ(tracker.swaps(), std::min(l1, l2)); - // TODO(bsamwel): This should use moves when the type is movable. - EXPECT_EQ(tracker.copies(), std::max(l1, l2) - std::min(l1, l2)); + EXPECT_EQ(tracker.swaps(), min_len); + EXPECT_EQ((tracker.moves() ? tracker.moves() : tracker.copies()), + max_len - min_len); } else { // One is allocated and the other isn't. The allocation is transferred // without copying elements, and the inlined instances are copied/moved. EXPECT_EQ(tracker.swaps(), 0); - // TODO(bsamwel): This should use moves when the type is movable. - EXPECT_EQ(tracker.copies(), std::min(l1, l2)); + EXPECT_EQ((tracker.moves() ? tracker.moves() : tracker.copies()), + min_len); } EXPECT_EQ(l1, b.size()); diff --git a/absl/container/internal/hash_policy_testing.h b/absl/container/internal/hash_policy_testing.h index ffc76ea..38bbec7 100644 --- a/absl/container/internal/hash_policy_testing.h +++ b/absl/container/internal/hash_policy_testing.h @@ -139,7 +139,7 @@ struct Alloc : std::allocator { friend bool operator!=(const Alloc& a, const Alloc& b) { return !(a == b); } private: - size_t id_ = std::numeric_limits::max(); + size_t id_ = (std::numeric_limits::max)(); }; template diff --git a/absl/container/internal/raw_hash_set.h b/absl/container/internal/raw_hash_set.h index 40bdb71..aa423b2 100644 --- a/absl/container/internal/raw_hash_set.h +++ b/absl/container/internal/raw_hash_set.h @@ -477,7 +477,7 @@ inline size_t NormalizeCapacity(size_t n) { constexpr size_t kMinCapacity = Group::kWidth - 1; return n <= kMinCapacity ? kMinCapacity - : std::numeric_limits::max() >> LeadingZeros(n); + : (std::numeric_limits::max)() >> LeadingZeros(n); } // The node_handle concept from C++17. @@ -1022,7 +1022,7 @@ class raw_hash_set { bool empty() const { return !size(); } size_t size() const { return size_; } size_t capacity() const { return capacity_; } - size_t max_size() const { return std::numeric_limits::max(); } + size_t max_size() const { return (std::numeric_limits::max)(); } void clear() { // Iterating over this container is O(bucket_count()). When bucket_count() -- cgit v1.2.3