Updated Abseil to LTS 20210324.0 (#25835)

* Updated abseil-cpp to 20210324.0 * UBSAN with -fsanitize-link-c++-runtime
4 years ago · 37eecd3ce3
parent 5c49bf4209
commit 37eecd3ce3
16 changed files with 129 additions and 38 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -139,6 +139,7 @@ set(gRPC_ABSL_USED_TARGETS
  absl_log_severity
  absl_malloc_internal
  absl_memory
+  absl_numeric_representation
  absl_optional
  absl_raw_hash_map
  absl_raw_hash_set
@ -160,6 +161,7 @@ set(gRPC_ABSL_USED_TARGETS
  absl_type_traits
  absl_utility
  absl_variant
+  absl_wyhash
  absl_meta
 )

@ -15517,7 +15519,7 @@ generate_pkgconfig(
  "gRPC platform support library"
  "${gRPC_CORE_VERSION}"
  ""
-  "-lgpr -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_status -labsl_cord -labsl_str_format_internal -labsl_bad_optional_access -labsl_symbolize -labsl_strings -labsl_strings_internal -labsl_int128 -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_throw_delegate -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
+  "-lgpr -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_status -labsl_cord -labsl_str_format_internal -labsl_bad_optional_access -labsl_cord -labsl_symbolize -labsl_strings -labsl_strings_internal -labsl_int128 -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_throw_delegate -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "gpr.pc")

@ -15527,7 +15529,7 @@ generate_pkgconfig(
  "high performance general RPC framework"
  "${gRPC_CORE_VERSION}"
  "gpr openssl"
-  "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity"
+  "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_cord -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_wyhash -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "grpc.pc")

@ -15537,7 +15539,7 @@ generate_pkgconfig(
  "high performance general RPC framework without SSL"
  "${gRPC_CORE_VERSION}"
  "gpr"
-  "-lgrpc_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity"
+  "-lgrpc_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_cord -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_wyhash -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "grpc_unsecure.pc")

@ -15547,7 +15549,7 @@ generate_pkgconfig(
  "C++ wrapper for gRPC"
  "${gRPC_CPP_VERSION}"
  "grpc"
-  "-lgrpc++ -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity"
+  "-lgrpc++ -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_cord -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_wyhash -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "grpc++.pc")

@ -15557,6 +15559,6 @@ generate_pkgconfig(
  "C++ wrapper for gRPC without SSL"
  "${gRPC_CPP_VERSION}"
  "grpc_unsecure"
-  "-lgrpc++_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity"
+  "-lgrpc++_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_cord -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_wyhash -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "grpc++_unsecure.pc")
--- a/3
+++ b/3
@ -2579,6 +2579,7 @@ LIBGRPC_ABSEIL_SRC = \
    third_party/abseil-cpp/absl/debugging/symbolize.cc \
    third_party/abseil-cpp/absl/hash/internal/city.cc \
    third_party/abseil-cpp/absl/hash/internal/hash.cc \
+    third_party/abseil-cpp/absl/hash/internal/wyhash.cc \
    third_party/abseil-cpp/absl/numeric/int128.cc \
    third_party/abseil-cpp/absl/status/status.cc \
    third_party/abseil-cpp/absl/status/status_payload_printer.cc \
@ -2589,6 +2590,8 @@ LIBGRPC_ABSEIL_SRC = \
    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 \
+    third_party/abseil-cpp/absl/strings/internal/cord_internal.cc \
+    third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \
    third_party/abseil-cpp/absl/strings/internal/escaping.cc \
    third_party/abseil-cpp/absl/strings/internal/memutil.cc \
    third_party/abseil-cpp/absl/strings/internal/ostringstream.cc \
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -245,11 +245,11 @@ def grpc_deps():
    if "com_google_absl" not in native.existing_rules():
        http_archive(
            name = "com_google_absl",
-            sha256 = "62c27e7a633e965a2f40ff16b487c3b778eae440bab64cad83b34ef1cbe3aa93",
-            strip_prefix = "abseil-cpp-6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c",
+            sha256 = "35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee",
+            strip_prefix = "abseil-cpp-997aaf3a28308eba1b9156aa35ab7bca9688e9f6",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz",
-                "https://github.com/abseil/abseil-cpp/archive/6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
+                "https://github.com/abseil/abseil-cpp/archive/997aaf3a28308eba1b9156aa35ab7bca9688e9f6.tar.gz",
            ],
        )

--- a/config.m4
+++ b/config.m4
@ -672,6 +672,7 @@ if test "$PHP_GRPC" != "no"; then
    third_party/abseil-cpp/absl/debugging/symbolize.cc \
    third_party/abseil-cpp/absl/hash/internal/city.cc \
    third_party/abseil-cpp/absl/hash/internal/hash.cc \
+    third_party/abseil-cpp/absl/hash/internal/wyhash.cc \
    third_party/abseil-cpp/absl/numeric/int128.cc \
    third_party/abseil-cpp/absl/status/status.cc \
    third_party/abseil-cpp/absl/status/status_payload_printer.cc \
@ -682,6 +683,8 @@ if test "$PHP_GRPC" != "no"; then
    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 \
+    third_party/abseil-cpp/absl/strings/internal/cord_internal.cc \
+    third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc \
    third_party/abseil-cpp/absl/strings/internal/escaping.cc \
    third_party/abseil-cpp/absl/strings/internal/memutil.cc \
    third_party/abseil-cpp/absl/strings/internal/ostringstream.cc \
--- a/config.w32
+++ b/config.w32
@ -638,6 +638,7 @@ if (PHP_GRPC != "no") {
    "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " +
    "third_party\\abseil-cpp\\absl\\hash\\internal\\city.cc " +
    "third_party\\abseil-cpp\\absl\\hash\\internal\\hash.cc " +
+    "third_party\\abseil-cpp\\absl\\hash\\internal\\wyhash.cc " +
    "third_party\\abseil-cpp\\absl\\numeric\\int128.cc " +
    "third_party\\abseil-cpp\\absl\\status\\status.cc " +
    "third_party\\abseil-cpp\\absl\\status\\status_payload_printer.cc " +
@ -648,6 +649,8 @@ if (PHP_GRPC != "no") {
    "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 " +
+    "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_internal.cc " +
+    "third_party\\abseil-cpp\\absl\\strings\\internal\\cord_rep_ring.cc " +
    "third_party\\abseil-cpp\\absl\\strings\\internal\\escaping.cc " +
    "third_party\\abseil-cpp\\absl\\strings\\internal\\memutil.cc " +
    "third_party\\abseil-cpp\\absl\\strings\\internal\\ostringstream.cc " +
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -186,7 +186,7 @@ Pod::Spec.new do |s|
    ss.header_mappings_dir = '.'
    ss.dependency "#{s.name}/Interface", version
    ss.dependency 'gRPC-Core', version
-    abseil_version = '1.20200923.3'
+    abseil_version = '1.20210324.0'
    ss.dependency 'abseil/base/base', abseil_version
    ss.dependency 'abseil/container/flat_hash_map', abseil_version
    ss.dependency 'abseil/container/inlined_vector', abseil_version
--- 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.20200923.3'
+  abseil_version = '1.20210324.0'

  # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
  # This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -1247,7 +1247,6 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/abseil-cpp/absl/base/const_init.h )
  s.files += %w( third_party/abseil-cpp/absl/base/dynamic_annotations.h )
  s.files += %w( third_party/abseil-cpp/absl/base/internal/atomic_hook.h )
-  s.files += %w( third_party/abseil-cpp/absl/base/internal/bits.h )
  s.files += %w( third_party/abseil-cpp/absl/base/internal/cycleclock.cc )
  s.files += %w( third_party/abseil-cpp/absl/base/internal/cycleclock.h )
  s.files += %w( third_party/abseil-cpp/absl/base/internal/direct_mmap.h )
@ -1346,12 +1345,17 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/abseil-cpp/absl/hash/internal/city.h )
  s.files += %w( third_party/abseil-cpp/absl/hash/internal/hash.cc )
  s.files += %w( third_party/abseil-cpp/absl/hash/internal/hash.h )
+  s.files += %w( third_party/abseil-cpp/absl/hash/internal/wyhash.cc )
+  s.files += %w( third_party/abseil-cpp/absl/hash/internal/wyhash.h )
  s.files += %w( third_party/abseil-cpp/absl/memory/memory.h )
  s.files += %w( third_party/abseil-cpp/absl/meta/type_traits.h )
+  s.files += %w( third_party/abseil-cpp/absl/numeric/bits.h )
  s.files += %w( third_party/abseil-cpp/absl/numeric/int128.cc )
  s.files += %w( third_party/abseil-cpp/absl/numeric/int128.h )
  s.files += %w( third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc )
  s.files += %w( third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc )
+  s.files += %w( third_party/abseil-cpp/absl/numeric/internal/bits.h )
+  s.files += %w( third_party/abseil-cpp/absl/numeric/internal/representation.h )
  s.files += %w( third_party/abseil-cpp/absl/status/internal/status_internal.h )
  s.files += %w( third_party/abseil-cpp/absl/status/internal/statusor_internal.h )
  s.files += %w( third_party/abseil-cpp/absl/status/status.cc )
@ -1373,7 +1377,12 @@ 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_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_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 )
+  s.files += %w( third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h )
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.cc )
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.h )
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.cc )
@ -1397,6 +1406,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/str_format/parser.h )
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/str_join_internal.h )
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/str_split_internal.h )
+  s.files += %w( third_party/abseil-cpp/absl/strings/internal/string_constant.h )
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/utf8.cc )
  s.files += %w( third_party/abseil-cpp/absl/strings/internal/utf8.h )
  s.files += %w( third_party/abseil-cpp/absl/strings/match.cc )
@ -1422,10 +1432,10 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/abseil-cpp/absl/synchronization/blocking_counter.h )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h )
+  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/futex.h )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/graphcycles.h )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h )
-  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/mutex_nonprod.inc )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h )
  s.files += %w( third_party/abseil-cpp/absl/synchronization/internal/waiter.cc )
--- a/package.xml
+++ b/package.xml
@ -1249,7 +1249,6 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/const_init.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/dynamic_annotations.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/atomic_hook.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/bits.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/cycleclock.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/cycleclock.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/direct_mmap.h" role="src" />
@ -1348,12 +1347,17 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/city.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/hash.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/hash.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/wyhash.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/hash/internal/wyhash.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/memory/memory.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/meta/type_traits.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/numeric/bits.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/numeric/int128.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/numeric/int128.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/numeric/int128_no_intrinsic.inc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/numeric/internal/bits.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/numeric/internal/representation.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/internal/status_internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/internal/statusor_internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/status.cc" role="src" />
@ -1375,7 +1379,12 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/charconv_parse.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_internal.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_flat.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/cord_rep_ring_reader.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/escaping.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/escaping.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/memutil.cc" role="src" />
@ -1399,6 +1408,7 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/str_format/parser.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/str_join_internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/str_split_internal.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/string_constant.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/utf8.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/utf8.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/match.cc" role="src" />
@ -1424,10 +1434,10 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/blocking_counter.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/futex.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/graphcycles.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/kernel_timeout.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/mutex_nonprod.inc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/synchronization/internal/waiter.cc" role="src" />
--- a/src/abseil-cpp/preprocessed_builds.yaml
+++ b/src/abseil-cpp/preprocessed_builds.yaml
@ -63,14 +63,6 @@
  - third_party/abseil-cpp/absl/base/internal/scheduling_mode.h
  name: absl/base:base_internal
  src: []
- cmake_target: absl::bits
-  deps:
-  - absl/base:config
-  - absl/base:core_headers
-  headers:
-  - third_party/abseil-cpp/absl/base/internal/bits.h
-  name: absl/base:bits
-  src: []
 - cmake_target: absl::config
  deps: []
  headers:
@ -103,6 +95,7 @@
  src: []
 - cmake_target: absl::endian
  deps:
+  - absl/base:base
  - absl/base:config
  - absl/base:core_headers
  headers:
@ -215,6 +208,24 @@
  name: absl/base:throw_delegate
  src:
  - third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
+- cmake_target: absl::cleanup
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/cleanup:cleanup_internal
+  headers:
+  - third_party/abseil-cpp/absl/cleanup/cleanup.h
+  name: absl/cleanup:cleanup
+  src: []
+- cmake_target: absl::cleanup_internal
+  deps:
+  - absl/base:base_internal
+  - absl/base:core_headers
+  - absl/utility:utility
+  headers:
+  - third_party/abseil-cpp/absl/cleanup/internal/cleanup.h
+  name: absl/cleanup:cleanup_internal
+  src: []
 - cmake_target: absl::btree
  deps:
  - absl/base:core_headers
@ -425,7 +436,6 @@
  src: []
 - cmake_target: absl::raw_hash_set
  deps:
-  - absl/base:bits
  - absl/base:config
  - absl/base:core_headers
  - absl/base:endian
@ -439,6 +449,7 @@
  - absl/container:layout
  - absl/memory:memory
  - absl/meta:type_traits
+  - absl/numeric:bits
  - absl/utility:utility
  headers:
  - third_party/abseil-cpp/absl/container/internal/raw_hash_set.h
@ -619,6 +630,7 @@
  - absl/utility:utility
  headers:
  - third_party/abseil-cpp/absl/flags/internal/flag.h
+  - third_party/abseil-cpp/absl/flags/internal/sequence_lock.h
  name: absl/flags:flag_internal
  src:
  - third_party/abseil-cpp/absl/flags/internal/flag.cc
@ -766,10 +778,12 @@
  - third_party/abseil-cpp/absl/hash/internal/city.cc
 - cmake_target: absl::hash
  deps:
+  - absl/base:config
  - absl/base:core_headers
  - absl/base:endian
  - absl/container:fixed_array
  - absl/hash:city
+  - absl/hash:wyhash
  - absl/meta:type_traits
  - absl/numeric:int128
  - absl/strings:strings
@ -782,6 +796,16 @@
  name: absl/hash:hash
  src:
  - third_party/abseil-cpp/absl/hash/internal/hash.cc
+- cmake_target: absl::wyhash
+  deps:
+  - absl/base:config
+  - absl/base:endian
+  - absl/numeric:int128
+  headers:
+  - third_party/abseil-cpp/absl/hash/internal/wyhash.h
+  name: absl/hash:wyhash
+  src:
+  - third_party/abseil-cpp/absl/hash/internal/wyhash.cc
 - cmake_target: absl::memory
  deps:
  - absl/base:core_headers
@ -797,11 +821,20 @@
  - third_party/abseil-cpp/absl/meta/type_traits.h
  name: absl/meta:type_traits
  src: []
+- cmake_target: absl::bits
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
+  headers:
+  - third_party/abseil-cpp/absl/numeric/bits.h
+  - third_party/abseil-cpp/absl/numeric/internal/bits.h
+  name: absl/numeric:bits
+  src: []
 - cmake_target: absl::int128
  deps:
-  - absl/base:bits
  - absl/base:config
  - absl/base:core_headers
+  - absl/numeric:bits
  headers:
  - third_party/abseil-cpp/absl/numeric/int128.h
  - third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
@ -809,6 +842,13 @@
  name: absl/numeric:int128
  src:
  - third_party/abseil-cpp/absl/numeric/int128.cc
+- cmake_target: absl::numeric_representation
+  deps:
+  - absl/base:config
+  headers:
+  - third_party/abseil-cpp/absl/numeric/internal/representation.h
+  name: absl/numeric:representation
+  src: []
 - cmake_target: absl::random_internal_distribution_caller
  deps:
  - absl/base:config
@ -828,15 +868,15 @@
  src: []
 - cmake_target: absl::random_internal_fastmath
  deps:
-  - absl/base:bits
+  - absl/numeric:bits
  headers:
  - third_party/abseil-cpp/absl/random/internal/fastmath.h
  name: absl/random/internal:fastmath
  src: []
 - cmake_target: absl::random_internal_generate_real
  deps:
-  - absl/base:bits
  - absl/meta:type_traits
+  - absl/numeric:bits
  - absl/random/internal:fastmath
  - absl/random/internal:traits
  headers:
@ -888,6 +928,7 @@
  deps:
  - absl/base:config
  - absl/meta:type_traits
+  - absl/numeric:bits
  - absl/numeric:int128
  - absl/random/internal:fastmath
  - absl/random/internal:iostream_state_saver
@ -934,6 +975,7 @@
  - third_party/abseil-cpp/absl/random/internal/randen.cc
 - cmake_target: absl::random_internal_randen_engine
  deps:
+  - absl/base:endian
  - absl/meta:type_traits
  - absl/random/internal:iostream_state_saver
  - absl/random/internal:randen
@ -1014,8 +1056,8 @@
  src: []
 - cmake_target: absl::random_internal_wide_multiply
  deps:
-  - absl/base:bits
  - absl/base:config
+  - absl/numeric:bits
  - absl/numeric:int128
  - absl/random/internal:traits
  headers:
@ -1040,6 +1082,7 @@
  - absl/base:config
  - absl/base:core_headers
  - absl/meta:type_traits
+  - absl/numeric:bits
  - absl/random/internal:distribution_caller
  - absl/random/internal:fast_uniform_bits
  - absl/random/internal:fastmath
@ -1158,13 +1201,25 @@
 - cmake_target: absl::cord
  deps:
  - absl/base:base_internal
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/base:endian
+  - absl/base:raw_logging_internal
+  - absl/base:throw_delegate
  - absl/container:compressed_tuple
+  - absl/container:inlined_vector
+  - absl/container:layout
  - absl/meta:type_traits
  - absl/strings:strings
  headers:
  - third_party/abseil-cpp/absl/strings/internal/cord_internal.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
  name: absl/strings:cord_internal
-  src: []
+  src:
+  - third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
+  - third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc
 - cmake_target: absl::strings_internal
  deps:
  - absl/base:config
@ -1192,12 +1247,13 @@
  src: []
 - cmake_target: absl::str_format_internal
  deps:
-  - absl/base:bits
  - absl/base:config
  - absl/base:core_headers
  - absl/functional:function_ref
  - absl/meta:type_traits
+  - absl/numeric:bits
  - absl/numeric:int128
+  - absl/numeric:representation
  - absl/strings:strings
  - absl/types:optional
  - absl/types:span
@ -1220,7 +1276,6 @@
 - cmake_target: absl::strings
  deps:
  - absl/base:base
-  - absl/base:bits
  - absl/base:config
  - absl/base:core_headers
  - absl/base:endian
@ -1228,6 +1283,7 @@
  - absl/base:throw_delegate
  - absl/memory:memory
  - absl/meta:type_traits
+  - absl/numeric:bits
  - absl/numeric:int128
  - absl/strings:internal
  headers:
@ -1240,6 +1296,7 @@
  - third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h
  - third_party/abseil-cpp/absl/strings/internal/str_join_internal.h
  - third_party/abseil-cpp/absl/strings/internal/str_split_internal.h
+  - third_party/abseil-cpp/absl/strings/internal/string_constant.h
  - third_party/abseil-cpp/absl/strings/match.h
  - third_party/abseil-cpp/absl/strings/numbers.h
  - third_party/abseil-cpp/absl/strings/str_cat.h
@ -1305,7 +1362,7 @@
  - third_party/abseil-cpp/absl/synchronization/barrier.h
  - third_party/abseil-cpp/absl/synchronization/blocking_counter.h
  - third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.h
-  - third_party/abseil-cpp/absl/synchronization/internal/mutex_nonprod.inc
+  - third_party/abseil-cpp/absl/synchronization/internal/futex.h
  - third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.h
  - third_party/abseil-cpp/absl/synchronization/internal/waiter.h
  - third_party/abseil-cpp/absl/synchronization/mutex.h
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -637,6 +637,7 @@ CORE_SOURCE_FILES = [
    'third_party/abseil-cpp/absl/debugging/symbolize.cc',
    'third_party/abseil-cpp/absl/hash/internal/city.cc',
    'third_party/abseil-cpp/absl/hash/internal/hash.cc',
+    'third_party/abseil-cpp/absl/hash/internal/wyhash.cc',
    'third_party/abseil-cpp/absl/numeric/int128.cc',
    'third_party/abseil-cpp/absl/status/status.cc',
    'third_party/abseil-cpp/absl/status/status_payload_printer.cc',
@ -647,6 +648,8 @@ CORE_SOURCE_FILES = [
    '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',
+    'third_party/abseil-cpp/absl/strings/internal/cord_internal.cc',
+    'third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc',
    'third_party/abseil-cpp/absl/strings/internal/escaping.cc',
    'third_party/abseil-cpp/absl/strings/internal/memutil.cc',
    'third_party/abseil-cpp/absl/strings/internal/ostringstream.cc',
--- a/templates/gRPC-C++.podspec.template
+++ b/templates/gRPC-C++.podspec.template
@ -165,7 +165,7 @@
      ss.header_mappings_dir = '.'
      ss.dependency "#{s.name}/Interface", version
      ss.dependency 'gRPC-Core', version
-      abseil_version = '1.20200923.3'
+      abseil_version = '1.20210324.0'
      % for abseil_spec in grpcpp_abseil_specs:
      ss.dependency '${abseil_spec}', abseil_version
      % endfor
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@ -123,7 +123,7 @@
    s.requires_arc = false

    name = 'grpc'
-    abseil_version = '1.20200923.3'
+    abseil_version = '1.20210324.0'

    # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
    # This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include
--- a/third_party/abseil-cpp
+++ b/third_party/abseil-cpp
@ -1 +1 @@
-Subproject commit 6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
+Subproject commit 997aaf3a28308eba1b9156aa35ab7bca9688e9f6
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@ -66,12 +66,12 @@ build:tsan --test_env=TSAN_OPTIONS=report_atomic_races=0
 build:tsan --action_env=TSAN_OPTIONS=suppressions=test/core/util/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1

 build:ubsan --strip=never
-build:ubsan --copt=-fsanitize=undefined
+build:ubsan --copt=-fsanitize-link-c++-runtime
 build:ubsan --copt=-fno-omit-frame-pointer
 build:ubsan --copt=-DGRPC_UBSAN
 build:ubsan --copt=-DNDEBUG
 build:ubsan --copt=-fno-sanitize=function,vptr
-build:ubsan --linkopt=-fsanitize=undefined
+build:ubsan --linkopt=-fsanitize-link-c++-runtime
 build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
 # For some reasons, these two stopped being propagated, so, redeclaring them here.
 # That's a hack that needs to be removed once we understand what's going on.
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@ -26,7 +26,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)

 git submodule | awk '{ print $1 }' | sort > "$submodules"
 cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
- 6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c third_party/abseil-cpp (heads/master)
+ 997aaf3a28308eba1b9156aa35ab7bca9688e9f6 third_party/abseil-cpp (heads/master)
 73d4d5e8d6d449fc8663765a42aa8aeeee844489 third_party/benchmark (v1.5.2)
 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
 1a7359455220f7010def8c63f7c7e041ce6707c6 third_party/boringssl-with-bazel (remotes/origin/master-with-bazel)