From dcf96121860a5efebebbbed91a19ff3ae60c8f0d Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 30 Jun 2022 16:02:08 -0700 Subject: [PATCH] Upgrade Abseil to LTS 20220623.0 (#30155) * Upgrade abseil to 20220623.0 * Fix subchannel include --- CMakeLists.txt | 3 +- Makefile | 4 + bazel/grpc_deps.bzl | 8 +- config.m4 | 4 + config.w32 | 4 + gRPC-C++.podspec | 2 +- gRPC-Core.podspec | 2 +- grpc.gemspec | 11 ++- package.xml | 11 ++- src/abseil-cpp/preprocessed_builds.yaml | 84 ++++++++++++------- .../ext/filters/client_channel/subchannel.cc | 1 + src/python/grpcio/grpc_core_dependencies.py | 4 + templates/gRPC-C++.podspec.template | 2 +- templates/gRPC-Core.podspec.template | 2 +- third_party/abseil-cpp | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 16 files changed, 104 insertions(+), 42 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b8cf830c97..c88e07fc510 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,6 @@ set(gRPC_ABSL_USED_TARGETS absl_hash_policy_traits absl_hashtable_debug_hooks absl_hashtablez_sampler - absl_have_sse absl_inlined_vector absl_inlined_vector_internal absl_int128 @@ -154,6 +153,7 @@ set(gRPC_ABSL_USED_TARGETS absl_memory absl_numeric_representation absl_optional + absl_prefetch absl_random_distributions absl_random_internal_distribution_caller absl_random_internal_fast_uniform_bits @@ -188,6 +188,7 @@ set(gRPC_ABSL_USED_TARGETS absl_statusor absl_str_format absl_str_format_internal + absl_strerror absl_strings absl_strings_internal absl_symbolize diff --git a/Makefile b/Makefile index c61bda1287e..7ae2d5c3087 100644 --- a/Makefile +++ b/Makefile @@ -2713,6 +2713,7 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/base/internal/raw_logging.cc \ third_party/abseil-cpp/absl/base/internal/spinlock.cc \ third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc \ + third_party/abseil-cpp/absl/base/internal/strerror.cc \ third_party/abseil-cpp/absl/base/internal/sysinfo.cc \ third_party/abseil-cpp/absl/base/internal/thread_identity.cc \ third_party/abseil-cpp/absl/base/internal/throw_delegate.cc \ @@ -2749,6 +2750,8 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/strings/ascii.cc \ third_party/abseil-cpp/absl/strings/charconv.cc \ third_party/abseil-cpp/absl/strings/cord.cc \ + third_party/abseil-cpp/absl/strings/cord_analysis.cc \ + third_party/abseil-cpp/absl/strings/cord_buffer.cc \ third_party/abseil-cpp/absl/strings/escaping.cc \ third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc \ third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc \ @@ -2757,6 +2760,7 @@ LIBGRPC_ABSEIL_SRC = \ third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \ diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index efc22fd9791..c1fbb8bee5f 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -294,11 +294,11 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4", - strip_prefix = "abseil-cpp-20211102.0", + sha256 = "4208129b49006089ba1d6710845a45e31c59b0ab6bff9e5788a87f55c5abd602", + strip_prefix = "abseil-cpp-20220623.0", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20220623.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20220623.0.tar.gz", ], ) diff --git a/config.m4 b/config.m4 index 539e0365816..47dceafd75e 100644 --- a/config.m4 +++ b/config.m4 @@ -766,6 +766,7 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/base/internal/raw_logging.cc \ third_party/abseil-cpp/absl/base/internal/spinlock.cc \ third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc \ + third_party/abseil-cpp/absl/base/internal/strerror.cc \ third_party/abseil-cpp/absl/base/internal/sysinfo.cc \ third_party/abseil-cpp/absl/base/internal/thread_identity.cc \ third_party/abseil-cpp/absl/base/internal/throw_delegate.cc \ @@ -802,6 +803,8 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/strings/ascii.cc \ third_party/abseil-cpp/absl/strings/charconv.cc \ third_party/abseil-cpp/absl/strings/cord.cc \ + third_party/abseil-cpp/absl/strings/cord_analysis.cc \ + third_party/abseil-cpp/absl/strings/cord_buffer.cc \ third_party/abseil-cpp/absl/strings/escaping.cc \ third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc \ third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc \ @@ -810,6 +813,7 @@ if test "$PHP_GRPC" != "no"; then third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc \ + third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc \ third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc \ third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc \ diff --git a/config.w32 b/config.w32 index 60c8a706388..5f89baec5cd 100644 --- a/config.w32 +++ b/config.w32 @@ -732,6 +732,7 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\base\\internal\\raw_logging.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\spinlock.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\spinlock_wait.cc " + + "third_party\\abseil-cpp\\absl\\base\\internal\\strerror.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\sysinfo.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\thread_identity.cc " + "third_party\\abseil-cpp\\absl\\base\\internal\\throw_delegate.cc " + @@ -768,6 +769,8 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\strings\\ascii.cc " + "third_party\\abseil-cpp\\absl\\strings\\charconv.cc " + "third_party\\abseil-cpp\\absl\\strings\\cord.cc " + + "third_party\\abseil-cpp\\absl\\strings\\cord_analysis.cc " + + "third_party\\abseil-cpp\\absl\\strings\\cord_buffer.cc " + "third_party\\abseil-cpp\\absl\\strings\\escaping.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\charconv_bigint.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\charconv_parse.cc " + @@ -776,6 +779,7 @@ if (PHP_GRPC != "no") { "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_btree_navigator.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_btree_reader.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_consume.cc " + + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_crc.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_ring.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_functions.cc " + "third_party\\abseil-cpp\\absl\\strings\\internal\\cordz_handle.cc " + diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index a0079465af0..a056640f200 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -195,7 +195,7 @@ Pod::Spec.new do |s| ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20211102.0' + abseil_version = '1.20220623.0' ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/core_headers', abseil_version ss.dependency 'abseil/cleanup/cleanup', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index b557ccbdd9a..4c6e4bf60bd 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -46,7 +46,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '1.20211102.0' + abseil_version = '1.20220623.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/grpc.gemspec b/grpc.gemspec index b9335cdcdbd..756d91d77b3 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1542,6 +1542,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_alloc.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/low_level_scheduling.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/per_thread_tls.h ) + s.files += %w( third_party/abseil-cpp/absl/base/internal/prefetch.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/raw_logging.cc ) s.files += %w( third_party/abseil-cpp/absl/base/internal/raw_logging.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/scheduling_mode.h ) @@ -1553,6 +1554,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc ) s.files += %w( third_party/abseil-cpp/absl/base/internal/spinlock_wait.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/spinlock_win32.inc ) + s.files += %w( third_party/abseil-cpp/absl/base/internal/strerror.cc ) + s.files += %w( third_party/abseil-cpp/absl/base/internal/strerror.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/sysinfo.cc ) s.files += %w( third_party/abseil-cpp/absl/base/internal/sysinfo.h ) s.files += %w( third_party/abseil-cpp/absl/base/internal/thread_annotations.h ) @@ -1585,7 +1588,6 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc ) s.files += %w( third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.h ) s.files += %w( third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc ) - s.files += %w( third_party/abseil-cpp/absl/container/internal/have_sse.h ) s.files += %w( third_party/abseil-cpp/absl/container/internal/inlined_vector.h ) s.files += %w( third_party/abseil-cpp/absl/container/internal/layout.h ) s.files += %w( third_party/abseil-cpp/absl/container/internal/raw_hash_map.h ) @@ -1701,6 +1703,10 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/charconv.h ) s.files += %w( third_party/abseil-cpp/absl/strings/cord.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/cord.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/cord_analysis.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/cord_analysis.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/cord_buffer.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/cord_buffer.h ) s.files += %w( third_party/abseil-cpp/absl/strings/escaping.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/escaping.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/char_map.h ) @@ -1708,6 +1714,7 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/charconv_parse.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_data_edge.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_internal.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_internal.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.cc ) @@ -1718,6 +1725,8 @@ Gem::Specification.new do |s| s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc ) + s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc ) s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h ) diff --git a/package.xml b/package.xml index 459b46fc1ee..a59a5616312 100644 --- a/package.xml +++ b/package.xml @@ -1546,6 +1546,7 @@ + @@ -1557,6 +1558,8 @@ + + @@ -1589,7 +1592,6 @@ - @@ -1705,6 +1707,10 @@ + + + + @@ -1712,6 +1718,7 @@ + @@ -1722,6 +1729,8 @@ + + diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml index 6e340d00387..6d184355dbb 100644 --- a/src/abseil-cpp/preprocessed_builds.yaml +++ b/src/abseil-cpp/preprocessed_builds.yaml @@ -140,6 +140,13 @@ name: absl/base:malloc_internal src: - third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc +- cmake_target: absl::prefetch + deps: + - absl/base:config + headers: + - third_party/abseil-cpp/absl/base/internal/prefetch.h + name: absl/base:prefetch + src: [] - cmake_target: absl::pretty_function deps: [] headers: @@ -151,6 +158,7 @@ - absl/base:atomic_hook - absl/base:config - absl/base:core_headers + - absl/base:errno_saver - absl/base:log_severity headers: - third_party/abseil-cpp/absl/base/internal/raw_logging.h @@ -211,6 +219,7 @@ - cmake_target: absl::btree deps: - absl/base:core_headers + - absl/base:raw_logging_internal - absl/base:throw_delegate - absl/container:common - absl/container:compressed_tuple @@ -270,6 +279,7 @@ - cmake_target: absl::flat_hash_map deps: - absl/algorithm:container + - absl/base:core_headers - absl/container:container_memory - absl/container:hash_function_defaults - absl/container:raw_hash_map @@ -324,8 +334,8 @@ - cmake_target: absl::hashtablez_sampler deps: - absl/base:base + - absl/base:config - absl/base:core_headers - - absl/container:have_sse - absl/debugging:stacktrace - absl/memory:memory - absl/profiling:exponential_biased @@ -338,12 +348,6 @@ src: - third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc - third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc -- cmake_target: absl::have_sse - deps: [] - headers: - - third_party/abseil-cpp/absl/container/internal/have_sse.h - name: absl/container:have_sse - src: [] - cmake_target: absl::inlined_vector deps: - absl/algorithm:algorithm @@ -381,33 +385,35 @@ - cmake_target: absl::node_hash_map deps: - absl/algorithm:container + - absl/base:core_headers - absl/container:container_memory - absl/container:hash_function_defaults - - absl/container:node_hash_policy + - absl/container:node_slot_policy - absl/container:raw_hash_map - absl/memory:memory headers: - third_party/abseil-cpp/absl/container/node_hash_map.h name: absl/container:node_hash_map src: [] -- cmake_target: absl::node_hash_policy - deps: - - absl/base:config - headers: - - third_party/abseil-cpp/absl/container/internal/node_hash_policy.h - name: absl/container:node_hash_policy - src: [] - cmake_target: absl::node_hash_set deps: - absl/algorithm:container + - absl/base:core_headers - absl/container:hash_function_defaults - - absl/container:node_hash_policy + - absl/container:node_slot_policy - absl/container:raw_hash_set - absl/memory:memory headers: - third_party/abseil-cpp/absl/container/node_hash_set.h name: absl/container:node_hash_set src: [] +- cmake_target: absl::node_slot_policy + deps: + - absl/base:config + headers: + - third_party/abseil-cpp/absl/container/internal/node_slot_policy.h + name: absl/container:node_slot_policy + src: [] - cmake_target: absl::raw_hash_map deps: - absl/base:throw_delegate @@ -422,13 +428,13 @@ - absl/base:config - absl/base:core_headers - absl/base:endian + - absl/base:prefetch - absl/container:common - absl/container:compressed_tuple - absl/container:container_memory - absl/container:hash_policy_traits - absl/container:hashtable_debug_hooks - absl/container:hashtablez_sampler - - absl/container:have_sse - absl/memory:memory - absl/meta:type_traits - absl/numeric:bits @@ -481,7 +487,6 @@ - absl/base:base - absl/base:config - absl/base:core_headers - - absl/base:errno_saver - absl/base:raw_logging_internal - absl/debugging:examine_stack - absl/debugging:stacktrace @@ -499,13 +504,6 @@ name: absl/debugging:leak_check src: - third_party/abseil-cpp/absl/debugging/leak_check.cc -- cmake_target: absl::leak_check_disable - deps: - - absl/base:config - headers: [] - name: absl/debugging:leak_check_disable - src: - - third_party/abseil-cpp/absl/debugging/leak_check_disable.cc - cmake_target: absl::stacktrace deps: - absl/base:config @@ -604,6 +602,7 @@ - absl/base:base - absl/base:config - absl/base:core_headers + - absl/base:dynamic_annotations - absl/flags:commandlineflag - absl/flags:commandlineflag_internal - absl/flags:config @@ -627,6 +626,7 @@ - absl/base:log_severity - absl/strings:str_format - absl/strings:strings + - absl/types:optional headers: - third_party/abseil-cpp/absl/flags/marshalling.h name: absl/flags:marshalling @@ -733,6 +733,18 @@ name: absl/flags:usage_internal src: - third_party/abseil-cpp/absl/flags/internal/usage.cc +- cmake_target: absl::any_invocable + deps: + - absl/base:base_internal + - absl/base:config + - absl/base:core_headers + - absl/meta:type_traits + - absl/utility:utility + headers: + - third_party/abseil-cpp/absl/functional/any_invocable.h + - third_party/abseil-cpp/absl/functional/internal/any_invocable.h + name: absl/functional:any_invocable + src: [] - cmake_target: absl::bind_front deps: - absl/base:base_internal @@ -770,6 +782,7 @@ - absl/base:core_headers - absl/base:endian - absl/container:fixed_array + - absl/functional:function_ref - absl/hash:city - absl/hash:low_level_hash - absl/meta:type_traits @@ -879,6 +892,7 @@ deps: - absl/base:config - absl/meta:type_traits + - absl/random/internal:traits headers: - third_party/abseil-cpp/absl/random/internal/fast_uniform_bits.h name: absl/random/internal:fast_uniform_bits @@ -931,11 +945,11 @@ - cmake_target: absl::random_internal_nonsecure_base deps: - absl/base:core_headers + - absl/container:inlined_vector - absl/meta:type_traits - absl/random/internal:pool_urbg - absl/random/internal:salted_seed_seq - absl/random/internal:seed_material - - absl/types:optional - absl/types:span headers: - third_party/abseil-cpp/absl/random/internal/nonsecure_base.h @@ -1062,6 +1076,8 @@ - cmake_target: absl::random_internal_traits deps: - absl/base:config + - absl/numeric:bits + - absl/numeric:int128 headers: - third_party/abseil-cpp/absl/random/internal/traits.h name: absl/random/internal:traits @@ -1070,6 +1086,7 @@ deps: - absl/base:config - absl/meta:type_traits + - absl/numeric:int128 - absl/random/internal:traits headers: - third_party/abseil-cpp/absl/random/internal/uniform_helper.h @@ -1151,8 +1168,7 @@ - third_party/abseil-cpp/absl/random/seed_gen_exception.cc - cmake_target: absl::random_seed_sequences deps: - - absl/container:inlined_vector - - absl/random/internal:nonsecure_base + - absl/base:config - absl/random/internal:pool_urbg - absl/random/internal:salted_seed_seq - absl/random/internal:seed_material @@ -1166,9 +1182,9 @@ - cmake_target: absl::status deps: - absl/base:atomic_hook - - absl/base:config - absl/base:core_headers - absl/base:raw_logging_internal + - absl/base:strerror - absl/container:inlined_vector - absl/debugging:stacktrace - absl/debugging:symbolize @@ -1212,6 +1228,7 @@ - absl/container:inlined_vector - absl/functional:function_ref - absl/meta:type_traits + - absl/numeric:bits - absl/strings:cord_internal - absl/strings:cordz_functions - absl/strings:cordz_info @@ -1222,11 +1239,16 @@ - absl/strings:str_format - absl/strings:strings - absl/types:optional + - absl/types:span headers: - third_party/abseil-cpp/absl/strings/cord.h + - third_party/abseil-cpp/absl/strings/cord_analysis.h + - third_party/abseil-cpp/absl/strings/cord_buffer.h name: absl/strings:cord src: - third_party/abseil-cpp/absl/strings/cord.cc + - third_party/abseil-cpp/absl/strings/cord_analysis.cc + - third_party/abseil-cpp/absl/strings/cord_buffer.cc - cmake_target: absl::cord_internal deps: - absl/base:base_internal @@ -1243,11 +1265,13 @@ - absl/strings:strings - absl/types:span headers: + - third_party/abseil-cpp/absl/strings/internal/cord_data_edge.h - third_party/abseil-cpp/absl/strings/internal/cord_internal.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.h + - third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h @@ -1258,6 +1282,7 @@ - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc - third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc - third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc + - third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc - cmake_target: absl::cordz_functions deps: @@ -1374,6 +1399,7 @@ - absl/strings:strings - absl/types:optional - absl/types:span + - absl/utility:utility headers: - third_party/abseil-cpp/absl/strings/internal/str_format/arg.h - third_party/abseil-cpp/absl/strings/internal/str_format/bind.h diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index f357f9f121d..c679aee8950 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "absl/status/statusor.h" diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 53ec6d7ce1d..9a8c6bbc6a2 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -731,6 +731,7 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/base/internal/raw_logging.cc', 'third_party/abseil-cpp/absl/base/internal/spinlock.cc', 'third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc', + 'third_party/abseil-cpp/absl/base/internal/strerror.cc', 'third_party/abseil-cpp/absl/base/internal/sysinfo.cc', 'third_party/abseil-cpp/absl/base/internal/thread_identity.cc', 'third_party/abseil-cpp/absl/base/internal/throw_delegate.cc', @@ -767,6 +768,8 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/strings/ascii.cc', 'third_party/abseil-cpp/absl/strings/charconv.cc', 'third_party/abseil-cpp/absl/strings/cord.cc', + 'third_party/abseil-cpp/absl/strings/cord_analysis.cc', + 'third_party/abseil-cpp/absl/strings/cord_buffer.cc', 'third_party/abseil-cpp/absl/strings/escaping.cc', 'third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc', 'third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc', @@ -775,6 +778,7 @@ CORE_SOURCE_FILES = [ 'third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_navigator.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_btree_reader.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_consume.cc', + 'third_party/abseil-cpp/absl/strings/internal/cord_rep_crc.cc', 'third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc', 'third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc', diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index 7d74017ce29..0d5d3d71ee1 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -168,7 +168,7 @@ ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20211102.0' + abseil_version = '1.20220623.0' % for abseil_spec in grpcpp_abseil_specs: ss.dependency '${abseil_spec}', abseil_version % endfor diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index f6df01da8dd..4eefb4e71ea 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -132,7 +132,7 @@ s.requires_arc = false name = 'grpc' - abseil_version = '1.20211102.0' + abseil_version = '1.20220623.0' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index 215105818df..273292d1cfc 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit 215105818dfde3174fe799600bb0f3cae233d0bf +Subproject commit 273292d1cfc0a94a65082ee350509af1d113344d diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index ea0b433cc6e..a91df6f1b46 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules" cat <"$want_submodules" -third_party/abseil-cpp 215105818dfde3174fe799600bb0f3cae233d0bf +third_party/abseil-cpp 273292d1cfc0a94a65082ee350509af1d113344d third_party/benchmark 0baacde3618ca617da95375e0af13ce1baadea47 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/boringssl-with-bazel b9232f9e27e5668bc0414879dcdedb2a59ea75f2