diff options
author | robot-contrib <robot-contrib@yandex-team.com> | 2025-01-25 13:57:16 +0300 |
---|---|---|
committer | robot-contrib <robot-contrib@yandex-team.com> | 2025-01-25 14:15:37 +0300 |
commit | c3efb51c05c80a676da435440106d33f9e611de4 (patch) | |
tree | a840e7b7f577e6c2ffb4b467b8103b94d85b8320 | |
parent | 955fb5a8d4c0d6fb0d5258bac1c503219bc8c167 (diff) | |
download | ydb-c3efb51c05c80a676da435440106d33f9e611de4.tar.gz |
Update contrib/restricted/abseil-cpp to 20240722.1
commit_hash:b14aada3a24ea1e229051c13272f38b6418bb0ad
23 files changed, 46 insertions, 30 deletions
diff --git a/contrib/restricted/abseil-cpp/.yandex_meta/override.nix b/contrib/restricted/abseil-cpp/.yandex_meta/override.nix index 48e4443dd6..8935fabf1e 100644 --- a/contrib/restricted/abseil-cpp/.yandex_meta/override.nix +++ b/contrib/restricted/abseil-cpp/.yandex_meta/override.nix @@ -1,11 +1,11 @@ self: super: with self; rec { - version = "20240722.0"; + version = "20240722.1"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = version; - hash = "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4="; + hash = "sha256-ir4hG2VIPv3se7JfWqCM/siLqFEFkmhMW/IGCocy6Pc="; }; patches = []; diff --git a/contrib/restricted/abseil-cpp/absl/algorithm/ya.make b/contrib/restricted/abseil-cpp/absl/algorithm/ya.make index 467248d279..4e3328995c 100644 --- a/contrib/restricted/abseil-cpp/absl/algorithm/ya.make +++ b/contrib/restricted/abseil-cpp/absl/algorithm/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) -ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.1.tar.gz) NO_RUNTIME() diff --git a/contrib/restricted/abseil-cpp/absl/base/config.h b/contrib/restricted/abseil-cpp/absl/base/config.h index 51687ebb52..10747bc5f7 100644 --- a/contrib/restricted/abseil-cpp/absl/base/config.h +++ b/contrib/restricted/abseil-cpp/absl/base/config.h @@ -118,7 +118,7 @@ // LTS releases can be obtained from // https://github.com/abseil/abseil-cpp/releases. #define ABSL_LTS_RELEASE_VERSION 20240722 -#define ABSL_LTS_RELEASE_PATCH_LEVEL 0 +#define ABSL_LTS_RELEASE_PATCH_LEVEL 1 // Helper macro to convert a CPP variable to a string literal. #define ABSL_INTERNAL_DO_TOKEN_STR(x) #x diff --git a/contrib/restricted/abseil-cpp/absl/base/ya.make b/contrib/restricted/abseil-cpp/absl/base/ya.make index 6b61783f77..c887180740 100644 --- a/contrib/restricted/abseil-cpp/absl/base/ya.make +++ b/contrib/restricted/abseil-cpp/absl/base/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( library/cpp/sanitizer/include diff --git a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h index d4fe8f5c21..7934b88c3e 100644 --- a/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h +++ b/contrib/restricted/abseil-cpp/absl/container/internal/raw_hash_set.h @@ -1208,6 +1208,9 @@ class RawHashSetLayout { // Given the capacity of a table, computes the total size of the backing // array. size_t alloc_size(size_t slot_size) const { + ABSL_HARDENING_ASSERT( + slot_size <= + ((std::numeric_limits<size_t>::max)() - slot_offset_) / capacity_); return slot_offset_ + capacity_ * slot_size; } @@ -1500,6 +1503,12 @@ inline size_t NormalizeCapacity(size_t n) { return n ? ~size_t{} >> countl_zero(n) : 1; } +template <size_t kSlotSize> +size_t MaxValidCapacity() { + return NormalizeCapacity((std::numeric_limits<size_t>::max)() / 4 / + kSlotSize); +} + // General notes on capacity/growth methods below: // - We use 7/8th as maximum load factor. For 16-wide groups, that gives an // average of two empty slots per group. @@ -2614,6 +2623,8 @@ class raw_hash_set { : settings_(CommonFields::CreateDefault<SooEnabled()>(), hash, eq, alloc) { if (bucket_count > (SooEnabled() ? SooCapacity() : 0)) { + ABSL_RAW_CHECK(bucket_count <= MaxValidCapacity<sizeof(slot_type)>(), + "Hash table size overflow"); resize(NormalizeCapacity(bucket_count)); } } @@ -2871,7 +2882,9 @@ class raw_hash_set { ABSL_ASSUME(!kEnabled || cap >= kCapacity); return cap; } - size_t max_size() const { return (std::numeric_limits<size_t>::max)(); } + size_t max_size() const { + return CapacityToGrowth(MaxValidCapacity<sizeof(slot_type)>()); + } ABSL_ATTRIBUTE_REINITIALIZES void clear() { // Iterating over this container is O(bucket_count()). When bucket_count() @@ -3260,6 +3273,8 @@ class raw_hash_set { auto m = NormalizeCapacity(n | GrowthToLowerboundCapacity(size())); // n == 0 unconditionally rehashes as per the standard. if (n == 0 || m > cap) { + ABSL_RAW_CHECK(m <= MaxValidCapacity<sizeof(slot_type)>(), + "Hash table size overflow"); resize(m); // This is after resize, to ensure that we have completed the allocation @@ -3272,6 +3287,7 @@ class raw_hash_set { const size_t max_size_before_growth = is_soo() ? SooCapacity() : size() + growth_left(); if (n > max_size_before_growth) { + ABSL_RAW_CHECK(n <= max_size(), "Hash table size overflow"); size_t m = GrowthToLowerboundCapacity(n); resize(NormalizeCapacity(m)); diff --git a/contrib/restricted/abseil-cpp/absl/container/ya.make b/contrib/restricted/abseil-cpp/absl/container/ya.make index 5aa4185626..3d7b557c1b 100644 --- a/contrib/restricted/abseil-cpp/absl/container/ya.make +++ b/contrib/restricted/abseil-cpp/absl/container/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/debugging/ya.make b/contrib/restricted/abseil-cpp/absl/debugging/ya.make index 5a4d9b23d2..3c3aa2d8bc 100644 --- a/contrib/restricted/abseil-cpp/absl/debugging/ya.make +++ b/contrib/restricted/abseil-cpp/absl/debugging/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/flags/ya.make b/contrib/restricted/abseil-cpp/absl/flags/ya.make index 83d79b1499..6cdd7fa292 100644 --- a/contrib/restricted/abseil-cpp/absl/flags/ya.make +++ b/contrib/restricted/abseil-cpp/absl/flags/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/functional/ya.make b/contrib/restricted/abseil-cpp/absl/functional/ya.make index 467248d279..4e3328995c 100644 --- a/contrib/restricted/abseil-cpp/absl/functional/ya.make +++ b/contrib/restricted/abseil-cpp/absl/functional/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) -ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.1.tar.gz) NO_RUNTIME() diff --git a/contrib/restricted/abseil-cpp/absl/hash/ya.make b/contrib/restricted/abseil-cpp/absl/hash/ya.make index 7eda75b2d8..aeef6cea71 100644 --- a/contrib/restricted/abseil-cpp/absl/hash/ya.make +++ b/contrib/restricted/abseil-cpp/absl/hash/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/log/ya.make b/contrib/restricted/abseil-cpp/absl/log/ya.make index a598274295..743000eb5e 100644 --- a/contrib/restricted/abseil-cpp/absl/log/ya.make +++ b/contrib/restricted/abseil-cpp/absl/log/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/memory/ya.make b/contrib/restricted/abseil-cpp/absl/memory/ya.make index 04e459b47e..7125e13df7 100644 --- a/contrib/restricted/abseil-cpp/absl/memory/ya.make +++ b/contrib/restricted/abseil-cpp/absl/memory/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) -ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.1.tar.gz) PEERDIR( contrib/restricted/abseil-cpp/absl/meta diff --git a/contrib/restricted/abseil-cpp/absl/meta/ya.make b/contrib/restricted/abseil-cpp/absl/meta/ya.make index 038057a27b..8b2d3b836b 100644 --- a/contrib/restricted/abseil-cpp/absl/meta/ya.make +++ b/contrib/restricted/abseil-cpp/absl/meta/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) -ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.1.tar.gz) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/numeric/ya.make b/contrib/restricted/abseil-cpp/absl/numeric/ya.make index fa64b6de80..ff64443a48 100644 --- a/contrib/restricted/abseil-cpp/absl/numeric/ya.make +++ b/contrib/restricted/abseil-cpp/absl/numeric/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) ADDINCL( GLOBAL contrib/restricted/abseil-cpp diff --git a/contrib/restricted/abseil-cpp/absl/profiling/ya.make b/contrib/restricted/abseil-cpp/absl/profiling/ya.make index cfa50e8396..e5a60c5c9d 100644 --- a/contrib/restricted/abseil-cpp/absl/profiling/ya.make +++ b/contrib/restricted/abseil-cpp/absl/profiling/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) ADDINCL( GLOBAL contrib/restricted/abseil-cpp diff --git a/contrib/restricted/abseil-cpp/absl/random/ya.make b/contrib/restricted/abseil-cpp/absl/random/ya.make index 10ab894e32..1026a5d497 100644 --- a/contrib/restricted/abseil-cpp/absl/random/ya.make +++ b/contrib/restricted/abseil-cpp/absl/random/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/status/ya.make b/contrib/restricted/abseil-cpp/absl/status/ya.make index 98cdb3ed00..d7e0102e2d 100644 --- a/contrib/restricted/abseil-cpp/absl/status/ya.make +++ b/contrib/restricted/abseil-cpp/absl/status/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/strings/ya.make b/contrib/restricted/abseil-cpp/absl/strings/ya.make index 45e537293b..ff42ac04ca 100644 --- a/contrib/restricted/abseil-cpp/absl/strings/ya.make +++ b/contrib/restricted/abseil-cpp/absl/strings/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/ya.make b/contrib/restricted/abseil-cpp/absl/synchronization/ya.make index 141cf4565f..3a2fb1b4de 100644 --- a/contrib/restricted/abseil-cpp/absl/synchronization/ya.make +++ b/contrib/restricted/abseil-cpp/absl/synchronization/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/time/ya.make b/contrib/restricted/abseil-cpp/absl/time/ya.make index 5375353745..65dd554e05 100644 --- a/contrib/restricted/abseil-cpp/absl/time/ya.make +++ b/contrib/restricted/abseil-cpp/absl/time/ya.make @@ -9,7 +9,7 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/types/ya.make b/contrib/restricted/abseil-cpp/absl/types/ya.make index 1a5f164ac9..9b6bb742e8 100644 --- a/contrib/restricted/abseil-cpp/absl/types/ya.make +++ b/contrib/restricted/abseil-cpp/absl/types/ya.make @@ -6,7 +6,7 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) PEERDIR( contrib/restricted/abseil-cpp/absl/base diff --git a/contrib/restricted/abseil-cpp/absl/utility/ya.make b/contrib/restricted/abseil-cpp/absl/utility/ya.make index 467248d279..4e3328995c 100644 --- a/contrib/restricted/abseil-cpp/absl/utility/ya.make +++ b/contrib/restricted/abseil-cpp/absl/utility/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) -ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.1.tar.gz) NO_RUNTIME() diff --git a/contrib/restricted/abseil-cpp/ya.make b/contrib/restricted/abseil-cpp/ya.make index a9c4b4ba72..4e45866048 100644 --- a/contrib/restricted/abseil-cpp/ya.make +++ b/contrib/restricted/abseil-cpp/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(20240722.0) +VERSION(20240722.1) -ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/abseil/abseil-cpp/archive/20240722.1.tar.gz) PEERDIR( contrib/restricted/abseil-cpp/absl/algorithm |