Merge pull request #24270 from veblush/abseil-lts-20200923

Upgrading Abseil to LTS 20200923.2
4 years ago · e95f3fb98c
parent a7c18d041b 2089785b62
commit e95f3fb98c
17 changed files with 152 additions and 83 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -16054,7 +16054,7 @@ generate_pkgconfig(
  "gRPC platform support library"
  "${gRPC_CORE_VERSION}"
  ""
-  "-lgpr -labsl_str_format_internal -labsl_synchronization -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_stacktrace -labsl_debugging_internal -labsl_malloc_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity -labsl_dynamic_annotations"
+  "-lgpr -labsl_str_format_internal -labsl_bad_optional_access -labsl_synchronization -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_stacktrace -labsl_debugging_internal -labsl_malloc_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "gpr.pc")

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

@ -16074,7 +16074,7 @@ generate_pkgconfig(
  "high performance general RPC framework without SSL"
  "${gRPC_CORE_VERSION}"
  "gpr"
-  "-lgrpc_unsecure -labsl_status -labsl_cord -labsl_bad_optional_access -labsl_str_format_internal -labsl_synchronization -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_stacktrace -labsl_debugging_internal -labsl_malloc_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity -labsl_dynamic_annotations"
+  "-lgrpc_unsecure -labsl_status -labsl_cord -labsl_str_format_internal -labsl_bad_optional_access -labsl_synchronization -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_stacktrace -labsl_debugging_internal -labsl_malloc_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "grpc_unsecure.pc")

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

@ -16094,6 +16094,6 @@ generate_pkgconfig(
  "C++ wrapper for gRPC without SSL"
  "${gRPC_CPP_VERSION}"
  "grpc_unsecure"
-  "-lgrpc++_unsecure -labsl_status -labsl_cord -labsl_bad_optional_access -labsl_str_format_internal -labsl_synchronization -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_stacktrace -labsl_debugging_internal -labsl_malloc_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity -labsl_dynamic_annotations"
+  "-lgrpc++_unsecure -labsl_status -labsl_cord -labsl_str_format_internal -labsl_bad_optional_access -labsl_synchronization -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_stacktrace -labsl_debugging_internal -labsl_malloc_internal -labsl_time -labsl_time_zone -labsl_civil_time -labsl_strings -labsl_strings_internal -labsl_throw_delegate -labsl_int128 -labsl_base -labsl_spinlock_wait -labsl_raw_logging_internal -labsl_log_severity"
  ""
  "grpc++_unsecure.pc")
--- a/1
+++ b/1
@ -4274,7 +4274,6 @@ endif

 # start of build recipe for library "grpc_abseil" (generated by makelib(lib) template function)
 LIBGRPC_ABSEIL_SRC = \
-    third_party/abseil-cpp/absl/base/dynamic_annotations.cc \
    third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
    third_party/abseil-cpp/absl/base/internal/exponential_biased.cc \
    third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@ -249,11 +249,11 @@ def grpc_deps():
    if "com_google_absl" not in native.existing_rules():
        http_archive(
            name = "com_google_absl",
-            sha256 = "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a",
-            strip_prefix = "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d",
+            sha256 = "3d74cdc98b42fd4257d91f652575206de195e2c824fcd8d6e6d227f85cb143ef",
+            strip_prefix = "abseil-cpp-0f3bb466b868b523cf1dc9b2aaaed65c77b28862",
            urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz",
-                "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/0f3bb466b868b523cf1dc9b2aaaed65c77b28862.tar.gz",
+                "https://github.com/abseil/abseil-cpp/archive/0f3bb466b868b523cf1dc9b2aaaed65c77b28862.tar.gz",
            ],
        )

--- a/config.m4
+++ b/config.m4
@ -611,7 +611,6 @@ if test "$PHP_GRPC" != "no"; then
    src/php/ext/grpc/server.c \
    src/php/ext/grpc/server_credentials.c \
    src/php/ext/grpc/timeval.c \
-    third_party/abseil-cpp/absl/base/dynamic_annotations.cc \
    third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
    third_party/abseil-cpp/absl/base/internal/exponential_biased.cc \
    third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc \
--- a/config.w32
+++ b/config.w32
@ -578,7 +578,6 @@ if (PHP_GRPC != "no") {
    "src\\php\\ext\\grpc\\server.c " +
    "src\\php\\ext\\grpc\\server_credentials.c " +
    "src\\php\\ext\\grpc\\timeval.c " +
-    "third_party\\abseil-cpp\\absl\\base\\dynamic_annotations.cc " +
    "third_party\\abseil-cpp\\absl\\base\\internal\\cycleclock.cc " +
    "third_party\\abseil-cpp\\absl\\base\\internal\\exponential_biased.cc " +
    "third_party\\abseil-cpp\\absl\\base\\internal\\low_level_alloc.cc " +
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -183,7 +183,7 @@ Pod::Spec.new do |s|
    ss.header_mappings_dir = '.'
    ss.dependency "#{s.name}/Interface", version
    ss.dependency 'gRPC-Core', version
-    abseil_version = '1.20200225.0'
+    abseil_version = '1.20200923.2'
    ss.dependency 'abseil/base/base', abseil_version
    ss.dependency 'abseil/container/flat_hash_set', 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.20200225.0'
+  abseil_version = '1.20200923.2'

  # 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
@ -1174,13 +1174,13 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/abseil-cpp/absl/base/casts.h )
  s.files += %w( third_party/abseil-cpp/absl/base/config.h )
  s.files += %w( third_party/abseil-cpp/absl/base/const_init.h )
-  s.files += %w( third_party/abseil-cpp/absl/base/dynamic_annotations.cc )
  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 )
+  s.files += %w( third_party/abseil-cpp/absl/base/internal/dynamic_annotations.h )
  s.files += %w( third_party/abseil-cpp/absl/base/internal/endian.h )
  s.files += %w( third_party/abseil-cpp/absl/base/internal/errno_saver.h )
  s.files += %w( third_party/abseil-cpp/absl/base/internal/exponential_biased.cc )
@ -1261,6 +1261,7 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/abseil-cpp/absl/debugging/stacktrace.h )
  s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize.cc )
  s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize.h )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc )
  s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_elf.inc )
  s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc )
  s.files += %w( third_party/abseil-cpp/absl/debugging/symbolize_win32.inc )
@ -1277,6 +1278,7 @@ Gem::Specification.new do |s|
  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/status/internal/status_internal.h )
  s.files += %w( third_party/abseil-cpp/absl/status/status.cc )
  s.files += %w( third_party/abseil-cpp/absl/status/status.h )
  s.files += %w( third_party/abseil-cpp/absl/status/status_payload_printer.cc )
--- a/package.xml
+++ b/package.xml
@ -1176,13 +1176,13 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/casts.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/config.h" role="src" />
    <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.cc" 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" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/dynamic_annotations.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/endian.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/errno_saver.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/base/internal/exponential_biased.cc" role="src" />
@ -1263,6 +1263,7 @@
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/stacktrace.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/symbolize.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/symbolize.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/symbolize_elf.inc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/symbolize_win32.inc" role="src" />
@ -1279,6 +1280,7 @@
    <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/status/internal/status_internal.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/status.cc" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/status.h" role="src" />
    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/status/status_payload_printer.cc" role="src" />
--- a/src/abseil-cpp/preprocessed_builds.yaml
+++ b/src/abseil-cpp/preprocessed_builds.yaml
@ -93,12 +93,14 @@
  name: absl/base:core_headers
  src: []
 - cmake_target: absl::dynamic_annotations
-  deps: []
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
  headers:
  - third_party/abseil-cpp/absl/base/dynamic_annotations.h
+  - third_party/abseil-cpp/absl/base/internal/dynamic_annotations.h
  name: absl/base:dynamic_annotations
-  src:
-  - third_party/abseil-cpp/absl/base/dynamic_annotations.cc
+  src: []
 - cmake_target: absl::endian
  deps:
  - absl/base:config
@ -124,6 +126,13 @@
  name: absl/base:exponential_biased
  src:
  - third_party/abseil-cpp/absl/base/internal/exponential_biased.cc
+- cmake_target: absl::fast_type_id
+  deps:
+  - absl/base:config
+  headers:
+  - third_party/abseil-cpp/absl/base/internal/fast_type_id.h
+  name: absl/base:fast_type_id
+  src: []
 - cmake_target: absl::log_severity
  deps:
  - absl/base:config
@ -187,6 +196,16 @@
  name: absl/base:spinlock_wait
  src:
  - third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc
+- cmake_target: absl::strerror
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/base:errno_saver
+  headers:
+  - third_party/abseil-cpp/absl/base/internal/strerror.h
+  name: absl/base:strerror
+  src:
+  - third_party/abseil-cpp/absl/base/internal/strerror.cc
 - cmake_target: absl::throw_delegate
  deps:
  - absl/base:config
@ -206,6 +225,7 @@
  - absl/container:layout
  - absl/memory:memory
  - absl/meta:type_traits
+  - absl/strings:cord
  - absl/strings:strings
  - absl/types:compare
  - absl/utility:utility
@ -233,7 +253,9 @@
  src: []
 - cmake_target: absl::container_memory
  deps:
+  - absl/base:config
  - absl/memory:memory
+  - absl/meta:type_traits
  - absl/utility:utility
  headers:
  - third_party/abseil-cpp/absl/container/internal/container_memory.h
@ -242,6 +264,7 @@
 - cmake_target: absl::fixed_array
  deps:
  - absl/algorithm:algorithm
+  - absl/base:config
  - absl/base:core_headers
  - absl/base:dynamic_annotations
  - absl/base:throw_delegate
@ -278,6 +301,7 @@
  deps:
  - absl/base:config
  - absl/hash:hash
+  - absl/strings:cord
  - absl/strings:strings
  headers:
  - third_party/abseil-cpp/absl/container/internal/hash_function_defaults.h
@ -350,6 +374,7 @@
  src: []
 - cmake_target: absl::layout
  deps:
+  - absl/base:config
  - absl/base:core_headers
  - absl/meta:type_traits
  - absl/strings:strings
@ -516,15 +541,38 @@
  - absl/base:raw_logging_internal
  - absl/debugging:debugging_internal
  - absl/debugging:demangle_internal
+  - absl/strings:strings
  headers:
  - third_party/abseil-cpp/absl/debugging/internal/symbolize.h
  - third_party/abseil-cpp/absl/debugging/symbolize.h
+  - third_party/abseil-cpp/absl/debugging/symbolize_darwin.inc
  - third_party/abseil-cpp/absl/debugging/symbolize_elf.inc
  - third_party/abseil-cpp/absl/debugging/symbolize_unimplemented.inc
  - third_party/abseil-cpp/absl/debugging/symbolize_win32.inc
  name: absl/debugging:symbolize
  src:
  - third_party/abseil-cpp/absl/debugging/symbolize.cc
+- cmake_target: absl::flags_commandlineflag
+  deps:
+  - absl/base:config
+  - absl/base:fast_type_id
+  - absl/flags:commandlineflag_internal
+  - absl/strings:strings
+  - absl/types:optional
+  headers:
+  - third_party/abseil-cpp/absl/flags/commandlineflag.h
+  name: absl/flags:commandlineflag
+  src:
+  - third_party/abseil-cpp/absl/flags/commandlineflag.cc
+- cmake_target: absl::flags_commandlineflag_internal
+  deps:
+  - absl/base:config
+  - absl/base:fast_type_id
+  headers:
+  - third_party/abseil-cpp/absl/flags/internal/commandlineflag.h
+  name: absl/flags:commandlineflag_internal
+  src:
+  - third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc
 - cmake_target: absl::flags_config
  deps:
  - absl/base:config
@ -546,9 +594,7 @@
  - absl/base:core_headers
  - absl/flags:config
  - absl/flags:flag_internal
-  - absl/flags:handle
-  - absl/flags:marshalling
-  - absl/flags:registry
+  - absl/flags:reflection
  - absl/strings:strings
  headers:
  - third_party/abseil-cpp/absl/flags/declare.h
@ -561,29 +607,21 @@
  - absl/base:base
  - absl/base:config
  - absl/base:core_headers
+  - absl/flags:commandlineflag
+  - absl/flags:commandlineflag_internal
  - absl/flags:config
-  - absl/flags:handle
-  - absl/flags:registry
+  - absl/flags:marshalling
+  - absl/flags:reflection
  - absl/memory:memory
+  - absl/meta:type_traits
  - absl/strings:strings
  - absl/synchronization:synchronization
+  - absl/utility:utility
  headers:
  - third_party/abseil-cpp/absl/flags/internal/flag.h
  name: absl/flags:flag_internal
  src:
  - third_party/abseil-cpp/absl/flags/internal/flag.cc
- cmake_target: absl::flags_handle
-  deps:
-  - absl/base:config
-  - absl/base:core_headers
-  - absl/flags:config
-  - absl/flags:marshalling
-  - absl/strings:strings
-  - absl/types:optional
-  headers:
-  - third_party/abseil-cpp/absl/flags/internal/commandlineflag.h
-  name: absl/flags:handle
-  src: []
 - cmake_target: absl::flags_marshalling
  deps:
  - absl/base:config
@ -600,12 +638,14 @@
  deps:
  - absl/base:config
  - absl/base:core_headers
+  - absl/flags:commandlineflag
+  - absl/flags:commandlineflag_internal
  - absl/flags:config
  - absl/flags:flag
  - absl/flags:flag_internal
-  - absl/flags:handle
+  - absl/flags:private_handle_accessor
  - absl/flags:program_name
-  - absl/flags:registry
+  - absl/flags:reflection
  - absl/flags:usage
  - absl/flags:usage_internal
  - absl/strings:strings
@ -624,6 +664,17 @@
  - third_party/abseil-cpp/absl/flags/internal/path_util.h
  name: absl/flags:path_util
  src: []
+- cmake_target: absl::flags_private_handle_accessor
+  deps:
+  - absl/base:config
+  - absl/flags:commandlineflag
+  - absl/flags:commandlineflag_internal
+  - absl/strings:strings
+  headers:
+  - third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.h
+  name: absl/flags:private_handle_accessor
+  src:
+  - third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc
 - cmake_target: absl::flags_program_name
  deps:
  - absl/base:config
@ -636,22 +687,23 @@
  name: absl/flags:program_name
  src:
  - third_party/abseil-cpp/absl/flags/internal/program_name.cc
- cmake_target: absl::flags_registry
+- cmake_target: absl::flags_reflection
  deps:
  - absl/base:config
  - absl/base:core_headers
-  - absl/base:raw_logging_internal
+  - absl/container:flat_hash_map
+  - absl/flags:commandlineflag
+  - absl/flags:commandlineflag_internal
  - absl/flags:config
-  - absl/flags:handle
+  - absl/flags:private_handle_accessor
  - absl/strings:strings
  - absl/synchronization:synchronization
  headers:
  - third_party/abseil-cpp/absl/flags/internal/registry.h
-  - third_party/abseil-cpp/absl/flags/internal/type_erased.h
-  name: absl/flags:registry
+  - third_party/abseil-cpp/absl/flags/reflection.h
+  name: absl/flags:reflection
  src:
-  - third_party/abseil-cpp/absl/flags/internal/registry.cc
-  - third_party/abseil-cpp/absl/flags/internal/type_erased.cc
+  - third_party/abseil-cpp/absl/flags/reflection.cc
 - cmake_target: absl::flags_usage
  deps:
  - absl/base:config
@ -668,13 +720,14 @@
  deps:
  - absl/base:config
  - absl/base:core_headers
+  - absl/flags:commandlineflag
  - absl/flags:config
  - absl/flags:flag
  - absl/flags:flag_internal
-  - absl/flags:handle
  - absl/flags:path_util
+  - absl/flags:private_handle_accessor
  - absl/flags:program_name
-  - absl/flags:registry
+  - absl/flags:reflection
  - absl/strings:strings
  headers:
  - third_party/abseil-cpp/absl/flags/internal/usage.h
@ -746,6 +799,7 @@
  src: []
 - cmake_target: absl::int128
  deps:
+  - absl/base:bits
  - absl/base:config
  - absl/base:core_headers
  headers:
@ -758,25 +812,16 @@
 - cmake_target: absl::random_internal_distribution_caller
  deps:
  - absl/base:config
+  - absl/base:fast_type_id
+  - absl/utility:utility
  headers:
  - third_party/abseil-cpp/absl/random/internal/distribution_caller.h
  name: absl/random/internal:distribution_caller
  src: []
- cmake_target: absl::random_internal_distributions
-  deps:
-  - absl/base:base
-  - absl/meta:type_traits
-  - absl/random/internal:distribution_caller
-  - absl/random/internal:traits
-  - absl/random/internal:uniform_helper
-  - absl/strings:strings
-  headers:
-  - third_party/abseil-cpp/absl/random/internal/distributions.h
-  name: absl/random/internal:distributions
-  src: []
 - cmake_target: absl::random_internal_fast_uniform_bits
  deps:
  - absl/base:config
+  - absl/meta:type_traits
  headers:
  - third_party/abseil-cpp/absl/random/internal/fast_uniform_bits.h
  name: absl/random/internal:fast_uniform_bits
@ -806,16 +851,17 @@
  - third_party/abseil-cpp/absl/random/internal/iostream_state_saver.h
  name: absl/random/internal:iostream_state_saver
  src: []
- cmake_target: absl::random_internal_mocking_bit_gen_base
+- cmake_target: absl::random_internal_mock_helpers
  deps:
-  - absl/random:random
-  - absl/strings:strings
+  - absl/base:fast_type_id
+  - absl/types:optional
  headers:
-  - third_party/abseil-cpp/absl/random/internal/mocking_bit_gen_base.h
-  name: absl/random/internal:mocking_bit_gen_base
+  - third_party/abseil-cpp/absl/random/internal/mock_helpers.h
+  name: absl/random/internal:mock_helpers
  src: []
 - cmake_target: ''
  deps:
+  - absl/base:config
  - absl/base:core_headers
  - absl/base:raw_logging_internal
  - absl/random/internal:platform
@ -832,7 +878,6 @@
  - absl/random/internal:pool_urbg
  - absl/random/internal:salted_seed_seq
  - absl/random/internal:seed_material
-  - absl/strings:strings
  - absl/types:optional
  - absl/types:span
  headers:
@ -855,10 +900,10 @@
  - absl/base:config
  headers:
  - third_party/abseil-cpp/absl/random/internal/platform.h
-  - third_party/abseil-cpp/absl/random/internal/randen-keys.inc
  - third_party/abseil-cpp/absl/random/internal/randen_traits.h
  name: absl/random/internal:platform
-  src: []
+  src:
+  - third_party/abseil-cpp/absl/random/internal/randen_round_keys.cc
 - cmake_target: absl::random_internal_pool_urbg
  deps:
  - absl/base:base
@ -960,7 +1005,9 @@
  src: []
 - cmake_target: absl::random_internal_uniform_helper
  deps:
+  - absl/base:config
  - absl/meta:type_traits
+  - absl/random/internal:traits
  headers:
  - third_party/abseil-cpp/absl/random/internal/uniform_helper.h
  name: absl/random/internal:uniform_helper
@ -978,10 +1025,11 @@
 - cmake_target: absl::random_bit_gen_ref
  deps:
  - absl/base:core_headers
+  - absl/base:fast_type_id
  - absl/meta:type_traits
  - absl/random/internal:distribution_caller
  - absl/random/internal:fast_uniform_bits
-  - absl/random/internal:mocking_bit_gen_base
+  - absl/random:random
  headers:
  - third_party/abseil-cpp/absl/random/bit_gen_ref.h
  name: absl/random:bit_gen_ref
@ -992,7 +1040,7 @@
  - absl/base:config
  - absl/base:core_headers
  - absl/meta:type_traits
-  - absl/random/internal:distributions
+  - absl/random/internal:distribution_caller
  - absl/random/internal:fast_uniform_bits
  - absl/random/internal:fastmath
  - absl/random/internal:generate_real
@ -1001,12 +1049,10 @@
  - absl/random/internal:uniform_helper
  - absl/random/internal:wide_multiply
  - absl/strings:strings
-  - absl/types:span
  headers:
  - third_party/abseil-cpp/absl/random/bernoulli_distribution.h
  - third_party/abseil-cpp/absl/random/beta_distribution.h
  - third_party/abseil-cpp/absl/random/discrete_distribution.h
-  - third_party/abseil-cpp/absl/random/distribution_format_traits.h
  - third_party/abseil-cpp/absl/random/distributions.h
  - third_party/abseil-cpp/absl/random/exponential_distribution.h
  - third_party/abseil-cpp/absl/random/gaussian_distribution.h
@ -1055,6 +1101,7 @@
  - third_party/abseil-cpp/absl/random/seed_sequences.cc
 - cmake_target: absl::status
  deps:
+  - absl/base:atomic_hook
  - absl/base:config
  - absl/base:core_headers
  - absl/base:raw_logging_internal
@ -1066,16 +1113,31 @@
  - absl/strings:strings
  - absl/types:optional
  headers:
+  - third_party/abseil-cpp/absl/status/internal/status_internal.h
  - third_party/abseil-cpp/absl/status/status.h
  - third_party/abseil-cpp/absl/status/status_payload_printer.h
  name: absl/status:status
  src:
  - third_party/abseil-cpp/absl/status/status.cc
  - third_party/abseil-cpp/absl/status/status_payload_printer.cc
+- cmake_target: absl::statusor
+  deps:
+  - absl/base:core_headers
+  - absl/base:raw_logging_internal
+  - absl/meta:type_traits
+  - absl/status:status
+  - absl/strings:strings
+  - absl/types:variant
+  - absl/utility:utility
+  headers:
+  - third_party/abseil-cpp/absl/status/internal/statusor_internal.h
+  - third_party/abseil-cpp/absl/status/statusor.h
+  name: absl/status:statusor
+  src:
+  - third_party/abseil-cpp/absl/status/statusor.cc
 - cmake_target: absl::cord
  deps:
  - absl/base:base
-  - absl/base:base_internal
  - absl/base:core_headers
  - absl/base:endian
  - absl/base:raw_logging_internal
@ -1087,6 +1149,7 @@
  - absl/strings:internal
  - absl/strings:str_format
  - absl/strings:strings
+  - absl/types:optional
  headers:
  - third_party/abseil-cpp/absl/strings/cord.h
  name: absl/strings:cord
@ -1094,6 +1157,8 @@
  - third_party/abseil-cpp/absl/strings/cord.cc
 - cmake_target: absl::cord
  deps:
+  - absl/base:base_internal
+  - absl/container:compressed_tuple
  - absl/meta:type_traits
  - absl/strings:strings
  headers:
@ -1127,11 +1192,14 @@
  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:int128
  - absl/strings:strings
+  - absl/types:optional
  - absl/types:span
  headers:
  - third_party/abseil-cpp/absl/strings/internal/str_format/arg.h
@ -1311,6 +1379,7 @@
  deps:
  - absl/base:config
  - absl/base:core_headers
+  - absl/base:fast_type_id
  - absl/meta:type_traits
  - absl/types:bad_any_cast
  - absl/utility:utility
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -577,7 +577,6 @@ CORE_SOURCE_FILES = [
    'src/core/tsi/ssl_transport_security.cc',
    'src/core/tsi/transport_security.cc',
    'src/core/tsi/transport_security_grpc.cc',
-    'third_party/abseil-cpp/absl/base/dynamic_annotations.cc',
    'third_party/abseil-cpp/absl/base/internal/cycleclock.cc',
    'third_party/abseil-cpp/absl/base/internal/exponential_biased.cc',
    'third_party/abseil-cpp/absl/base/internal/low_level_alloc.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.20200225.0'
+      abseil_version = '1.20200923.2'
      % 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.20200225.0'
+    abseil_version = '1.20200923.2'

    # 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/test/cpp/end2end/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds_end2end_test.cc
@ -4261,6 +4261,9 @@ TEST_P(LdsRdsTest, XdsRoutingClusterUpdateClustersWithPickingDelays) {
 }

 TEST_P(LdsRdsTest, XdsRoutingApplyXdsTimeout) {
+  // TODO(https://github.com/grpc/grpc/issues/24549): TSAN won't work here.
+  if (BuiltUnderTsan()) return;
+
  const int64_t kTimeoutNano = 500000000;
  const int64_t kTimeoutGrpcTimeoutHeaderMaxSecond = 1;
  const int64_t kTimeoutMaxStreamDurationSecond = 2;
--- a/third_party/abseil-cpp
+++ b/third_party/abseil-cpp
@ -1 +1 @@
-Subproject commit df3ea785d8c30a9503321a3d35ee7d35808f190d
+Subproject commit 0f3bb466b868b523cf1dc9b2aaaed65c77b28862
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@ -40,11 +40,9 @@ build:asan_macos --copt=-fsanitize=address
 build:asan_macos --copt=-O0
 build:asan_macos --copt=-fno-omit-frame-pointer
 build:asan_macos --copt=-DGPR_NO_DIRECT_SYSCALLS
-build:asan_macos --copt=-DADDRESS_SANITIZER  # used by absl
 build:asan_macos --linkopt=-fsanitize=address
 build:asan_macos --action_env=ASAN_OPTIONS=detect_leaks=0

-
 build:msan --strip=never
 build:msan --copt=-fsanitize=memory
 build:msan --copt=-O0
@ -52,7 +50,6 @@ build:msan --copt=-fsanitize-memory-track-origins
 build:msan --copt=-fsanitize-memory-use-after-dtor
 build:msan --copt=-fno-omit-frame-pointer
 build:msan --copt=-DGPR_NO_DIRECT_SYSCALLS
-build:msan --copt=-DMEMORY_SANITIZER  # used by absl
 build:msan --linkopt=-fsanitize=memory
 build:msan --action_env=MSAN_OPTIONS=poison_in_dtor=1

@ -61,9 +58,10 @@ build:tsan --copt=-fsanitize=thread
 build:tsan --copt=-fno-omit-frame-pointer
 build:tsan --copt=-DGPR_NO_DIRECT_SYSCALLS
 build:tsan --copt=-DGRPC_TSAN
-# TODO(jtattermusch): ideally we would set --copt=-DTHREAD_SANITIZER (used by absl)
-# but it seems to do more harm than good and triggers #17175
 build:tsan --linkopt=-fsanitize=thread
+# This is needed to address false positive problem with abseil.
+# https://github.com/google/sanitizers/issues/953
+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
@ -71,7 +69,6 @@ build:ubsan --copt=-fsanitize=undefined
 build:ubsan --copt=-fno-omit-frame-pointer
 build:ubsan --copt=-DGRPC_UBSAN
 build:ubsan --copt=-DNDEBUG
-build:ubsan --copt=-DUNDEFINED_BEHAVIOR_SANITIZER  # used by absl
 build:ubsan --copt=-fno-sanitize=function,vptr
 build:ubsan --linkopt=-fsanitize=undefined
 build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1:suppressions=test/core/util/ubsan_suppressions.txt
--- 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"
- df3ea785d8c30a9503321a3d35ee7d35808f190d third_party/abseil-cpp (heads/master)
+ 0f3bb466b868b523cf1dc9b2aaaed65c77b28862 third_party/abseil-cpp (heads/master)
 090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0)
 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd)
 88aeb757f1a415c71fb4cbf5af936ecae4bc8179 third_party/boringssl-with-bazel (remotes/origin/master-with-bazel)