Revert "Roll abseil_revision 4ef574064e..ccdd1d57b6."

This reverts commit b78156e. Reason for revert: Compile failures regarding template parameter shadowing: https://ci.chromium.org/p/chromium/builders/ci/win32-archive-rel/5546 Original change's description: > Roll abseil_revision 4ef574064e..ccdd1d57b6. > > Change Log: > https://chromium.googlesource.com/external/github.com/abseil/abseil-cpp/+log/4ef574064e..ccdd1d57b6 > Full diff: > https://chromium.googlesource.com/external/github.com/abseil/abseil-cpp/+/4ef574064e..ccdd1d57b6 > > Bug: None > Change-Id: I8df493afa9903590cf61a51cda3b4988d122dfd7 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1819237 > Reviewed-by: Nico Weber <thakis@chromium.org> > Commit-Queue: Mirko Bonadei <mbonadei@chromium.org> > Cr-Commit-Position: refs/heads/master@{#701231} TBR=thakis@chromium.org,mbonadei@chromium.org Change-Id: I07a7c5ce83040a71d58fe7abc678b6c12a4b93b1 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: None Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1831414 Reviewed-by: Ken Rockot <rockot@google.com> Commit-Queue: Ken Rockot <rockot@google.com> Cr-Commit-Position: refs/heads/master@{#701259}
Denger-Network · Sep 30, 2019 · ec2d33f · ec2d33f
1 parent 59724c8
commit ec2d33f
Show file tree

Hide file tree

Showing 152 changed files with 1,368 additions and 2,310 deletions.
diff --git a/third_party/abseil-cpp/CMake/AbseilHelpers.cmake b/third_party/abseil-cpp/CMake/AbseilHelpers.cmake
@@ -108,7 +108,7 @@ function(absl_cc_library)
       target_sources(${_NAME} PRIVATE ${ABSL_CC_LIB_SRCS} ${ABSL_CC_LIB_HDRS})
       target_include_directories(${_NAME}
         PUBLIC
-          "$<BUILD_INTERFACE:${ABSL_COMMON_INCLUDE_DIRS}>"
+          $<BUILD_INTERFACE:${ABSL_COMMON_INCLUDE_DIRS}>
           $<INSTALL_INTERFACE:${ABSL_INSTALL_INCLUDEDIR}>
       )
       target_compile_options(${_NAME}
@@ -145,7 +145,7 @@ function(absl_cc_library)
       add_library(${_NAME} INTERFACE)
       target_include_directories(${_NAME}
         INTERFACE
-          "$<BUILD_INTERFACE:${ABSL_COMMON_INCLUDE_DIRS}>"
+          $<BUILD_INTERFACE:${ABSL_COMMON_INCLUDE_DIRS}>
           $<INSTALL_INTERFACE:${ABSL_INSTALL_INCLUDEDIR}>
         )
       target_link_libraries(${_NAME}

diff --git a/third_party/abseil-cpp/CMake/README.md b/third_party/abseil-cpp/CMake/README.md
@@ -85,15 +85,13 @@ https://github.com/abseil/abseil-cpp/issues/109 for more information.
 Here's a non-exhaustive list of Abseil CMake public targets:
 
 ```cmake
-absl::algorithm
 absl::base
+absl::algorithm
 absl::debugging
 absl::flat_hash_map
-absl::flags
 absl::memory
 absl::meta
 absl::numeric
-absl::random
 absl::strings
 absl::synchronization
 absl::time

diff --git a/third_party/abseil-cpp/LTS.md b/third_party/abseil-cpp/LTS.md
@@ -12,4 +12,3 @@ The following lists LTS branches and the dates on which they have been released:
 
 * [LTS Branch December 18, 2018](https://github.com/abseil/abseil-cpp/tree/lts_2018_12_18/)
 * [LTS Branch June 20, 2018](https://github.com/abseil/abseil-cpp/tree/lts_2018_06_20/)
-* [LTS Branch August 8, 2019](https://github.com/abseil/abseil-cpp/tree/lts_2019_08_08/)
diff --git a/third_party/abseil-cpp/README.chromium b/third_party/abseil-cpp/README.chromium
@@ -4,7 +4,7 @@ URL: https://github.com/abseil/abseil-cpp
 License: Apache 2.0
 License File: LICENSE
 Version: 0
-Revision: ccdd1d57b6386ebc26fb0c7d99b604672437c124
+Revision: 4ef574064e75b86f115549e9eb4c7e806781b3ab
 Security Critical: yes
 
 Description:

diff --git a/third_party/abseil-cpp/WORKSPACE b/third_party/abseil-cpp/WORKSPACE
@@ -1,22 +1,17 @@
-#
-# Copyright 2019 The Abseil Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 workspace(name = "com_google_absl")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+# Bazel toolchains
+http_archive(
+  name = "bazel_toolchains",
+  urls = [
+    "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/bc09b995c137df042bb80a395b73d7ce6f26afbe.tar.gz",
+    "https://github.com/bazelbuild/bazel-toolchains/archive/bc09b995c137df042bb80a395b73d7ce6f26afbe.tar.gz",
+  ],
+  strip_prefix = "bazel-toolchains-bc09b995c137df042bb80a395b73d7ce6f26afbe",
+  sha256 = "4329663fe6c523425ad4d3c989a8ac026b04e1acedeceb56aa4b190fa7f3973c",
+)
+
 # GoogleTest/GoogleMock framework. Used by most unit-tests.
 http_archive(
      name = "com_google_googletest",
@@ -32,14 +27,3 @@ http_archive(
     strip_prefix = "benchmark-16703ff83c1ae6d53e5155df3bb3ab0bc96083be",
     sha256 = "59f918c8ccd4d74b6ac43484467b500f1d64b40cc1010daa055375b322a43ba3",
 )
-
-# C++ rules for Bazel.
-http_archive(
-    name = "rules_cc",
-    sha256 = "67412176974bfce3f4cf8bdaff39784a72ed709fc58def599d1f68710b58d68b",
-    strip_prefix = "rules_cc-b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e.zip",
-        "https://github.com/bazelbuild/rules_cc/archive/b7fe9697c0c76ab2fd431a891dbb9a6a32ed7c3e.zip",
-    ],
-)
diff --git a/third_party/abseil-cpp/absl/algorithm/BUILD.bazel b/third_party/abseil-cpp/absl/algorithm/BUILD.bazel
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 load(
     "//absl:copts/configure_copts.bzl",
     "ABSL_DEFAULT_COPTS",

diff --git a/third_party/abseil-cpp/absl/base/BUILD.bazel b/third_party/abseil-cpp/absl/base/BUILD.bazel
@@ -14,11 +14,12 @@
 # limitations under the License.
 #
 
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load(
     "//absl:copts/configure_copts.bzl",
     "ABSL_DEFAULT_COPTS",
     "ABSL_DEFAULT_LINKOPTS",
+    "ABSL_EXCEPTIONS_FLAG",
+    "ABSL_EXCEPTIONS_FLAG_LINKOPTS",
     "ABSL_TEST_COPTS",
 )
 
@@ -47,19 +48,11 @@ cc_library(
 
 cc_library(
     name = "raw_logging_internal",
-    srcs = ["internal/raw_logging.cc"],
-    hdrs = ["internal/raw_logging.h"],
     copts = ABSL_DEFAULT_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     visibility = [
         "//absl:__subpackages__",
     ],
-    deps = [
-        ":atomic_hook",
-        ":config",
-        ":core_headers",
-        ":log_severity",
-    ],
 )
 
 cc_library(
@@ -144,7 +137,6 @@ cc_library(
         ":config",
         ":core_headers",
         ":dynamic_annotations",
-        ":raw_logging_internal",
         ":spinlock_wait",
     ],
 )
@@ -172,6 +164,7 @@ cc_library(
     name = "base",
     srcs = [
         "internal/cycleclock.cc",
+        "internal/raw_logging.cc",
         "internal/spinlock.cc",
         "internal/sysinfo.cc",
         "internal/thread_identity.cc",
@@ -183,6 +176,7 @@ cc_library(
         "internal/cycleclock.h",
         "internal/low_level_scheduling.h",
         "internal/per_thread_tls.h",
+        "internal/raw_logging.h",
         "internal/spinlock.h",
         "internal/sysinfo.h",
         "internal/thread_identity.h",
@@ -201,7 +195,6 @@ cc_library(
         ":core_headers",
         ":dynamic_annotations",
         ":log_severity",
-        ":raw_logging_internal",
         ":spinlock_wait",
         "//absl/meta:type_traits",
     ],
@@ -239,24 +232,23 @@ cc_library(
     name = "throw_delegate",
     srcs = ["internal/throw_delegate.cc"],
     hdrs = ["internal/throw_delegate.h"],
-    copts = ABSL_DEFAULT_COPTS,
-    linkopts = ABSL_DEFAULT_LINKOPTS,
+    copts = ABSL_DEFAULT_COPTS + ABSL_EXCEPTIONS_FLAG,
+    linkopts = ABSL_EXCEPTIONS_FLAG_LINKOPTS + ABSL_DEFAULT_LINKOPTS,
     visibility = [
         "//absl:__subpackages__",
     ],
     deps = [
+        ":base",
         ":config",
-        ":raw_logging_internal",
     ],
 )
 
 cc_test(
     name = "throw_delegate_test",
     srcs = ["throw_delegate_test.cc"],
-    copts = ABSL_TEST_COPTS,
-    linkopts = ABSL_DEFAULT_LINKOPTS,
+    copts = ABSL_TEST_COPTS + ABSL_EXCEPTIONS_FLAG,
+    linkopts = ABSL_EXCEPTIONS_FLAG_LINKOPTS + ABSL_DEFAULT_LINKOPTS,
     deps = [
-        ":config",
         ":throw_delegate",
         "@com_google_googletest//:gtest_main",
     ],
@@ -289,8 +281,8 @@ cc_library(
     testonly = 1,
     srcs = ["internal/exception_safety_testing.cc"],
     hdrs = ["internal/exception_safety_testing.h"],
-    copts = ABSL_TEST_COPTS,
-    linkopts = ABSL_DEFAULT_LINKOPTS,
+    copts = ABSL_TEST_COPTS + ABSL_EXCEPTIONS_FLAG,
+    linkopts = ABSL_EXCEPTIONS_FLAG_LINKOPTS + ABSL_DEFAULT_LINKOPTS,
     deps = [
         ":config",
         ":pretty_function",
@@ -305,8 +297,8 @@ cc_library(
 cc_test(
     name = "exception_safety_testing_test",
     srcs = ["exception_safety_testing_test.cc"],
-    copts = ABSL_TEST_COPTS,
-    linkopts = ABSL_DEFAULT_LINKOPTS,
+    copts = ABSL_TEST_COPTS + ABSL_EXCEPTIONS_FLAG,
+    linkopts = ABSL_EXCEPTIONS_FLAG_LINKOPTS + ABSL_DEFAULT_LINKOPTS,
     deps = [
         ":exception_safety_testing",
         "//absl/memory",
@@ -390,7 +382,6 @@ cc_library(
     deps = [
         ":base",
         ":base_internal",
-        ":raw_logging_internal",
         "//absl/synchronization",
         "@com_github_google_benchmark//:benchmark_main",
     ],
@@ -464,7 +455,7 @@ cc_test(
     copts = ABSL_TEST_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
-        ":raw_logging_internal",
+        ":base",
         "//absl/strings",
         "@com_google_googletest//:gtest_main",
     ],
@@ -552,7 +543,7 @@ cc_library(
     visibility = [
         "//absl:__subpackages__",
     ],
-    deps = [":raw_logging_internal"],
+    deps = [":base"],
 )
 
 cc_test(
@@ -574,9 +565,8 @@ cc_test(
     copts = ABSL_TEST_COPTS,
     linkopts = ABSL_DEFAULT_LINKOPTS,
     deps = [
+        ":base",
         ":log_severity",
-        "//absl/flags:marshalling",
-        "//absl/strings",
         "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/third_party/abseil-cpp/absl/base/BUILD.gn b/third_party/abseil-cpp/absl/base/BUILD.gn
@@ -59,20 +59,8 @@ source_set("raw_logging_internal") {
     "//third_party/abseil-cpp:absl_default_cflags_cc",
   ]
   public_configs = [ "//third_party/abseil-cpp:absl_include_config" ]
-  sources = [
-    "internal/raw_logging.cc",
-  ]
-  public = [
-    "internal/raw_logging.h",
-  ]
   visibility = []
   visibility += [ "../*" ]
-  deps = [
-    ":atomic_hook",
-    ":config",
-    ":core_headers",
-    ":log_severity",
-  ]
 }
 
 source_set("spinlock_wait") {
@@ -179,7 +167,6 @@ source_set("malloc_internal") {
     ":config",
     ":core_headers",
     ":dynamic_annotations",
-    ":raw_logging_internal",
     ":spinlock_wait",
   ]
   visibility = []
@@ -216,6 +203,7 @@ source_set("base") {
   public_configs = [ "//third_party/abseil-cpp:absl_include_config" ]
   sources = [
     "internal/cycleclock.cc",
+    "internal/raw_logging.cc",
     "internal/spinlock.cc",
     "internal/sysinfo.cc",
     "internal/thread_identity.cc",
@@ -227,6 +215,7 @@ source_set("base") {
     "internal/cycleclock.h",
     "internal/low_level_scheduling.h",
     "internal/per_thread_tls.h",
+    "internal/raw_logging.h",
     "internal/spinlock.h",
     "internal/sysinfo.h",
     "internal/thread_identity.h",
@@ -240,7 +229,6 @@ source_set("base") {
     ":core_headers",
     ":dynamic_annotations",
     ":log_severity",
-    ":raw_logging_internal",
     ":spinlock_wait",
     "../meta:type_traits",
   ]
@@ -260,8 +248,8 @@ source_set("throw_delegate") {
     "internal/throw_delegate.h",
   ]
   deps = [
+    ":base",
     ":config",
-    ":raw_logging_internal",
   ]
   visibility = []
   visibility += [ "../*" ]
@@ -393,7 +381,7 @@ source_set("scoped_set_env") {
     "internal/scoped_set_env.cc",
   ]
   deps = [
-    ":raw_logging_internal",
+    ":base",
   ]
   visibility = []
   visibility += [ "../*" ]