From 30de20488bb88dc22d23521c5c222ec6d924e289 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 17 May 2018 09:05:57 -0700 Subject: [PATCH] - 2db207ef16d548380e4f5cd1d583546d0b5f7d61 Run clang-format on all outbound Copybara-transformed code. by Daniel Katz - f9f24ecdf159c232b68a72b3be4d66854489f13e Run clang-format on all outbound Copybara-transformed code. by Daniel Katz - 54b1d34753a2b6999bb65e0c05255bde7de8cfb5 Properly indent the PROPERTY FOLDER calls in AbseilHelper... by Jon Cohen - 540ce6bab1a7c81a15d7244b9effcb1c1378911b Fix -Wgnu-zero-variadic-macro-arguments warning under cla... by Derek Mauro - cc82ee3f18e882bfcba911ebc1b8ea39983f319b Suppress MSVC unreachable code warning in optional.h by Abseil Team - c1176bed2a7a2d20e72db2601f1044c097d8078c Change signature of __mmap2() in direct_mmap.h to match _... by Greg Falcon - 5c02fe2031997fe064bd189fecc593395f34fae8 Change released benchmarks back to cc_test targets. by Alex Strelnikov - 7a342ecf7a8c56276d28d94158291fe2d64b2543 Fix sanitizer example command. by Derek Mauro - 0c2c55fe01cd84ab885d9f4865d7672c423680d2 Remove redundant cast; string_view::find already returns ... by Jorg Brown GitOrigin-RevId: 2db207ef16d548380e4f5cd1d583546d0b5f7d61 Change-Id: I5b61d91c8c7b4754c839868fc73d612b31bf5c33 --- CMake/AbseilHelpers.cmake | 14 ++++++++------ absl/algorithm/BUILD.bazel | 4 ++-- absl/algorithm/equal_benchmark.cc | 2 +- absl/base/BUILD.bazel | 4 ++-- absl/base/attributes.h | 3 ++- absl/base/internal/direct_mmap.h | 2 +- absl/base/internal/thread_identity_benchmark.cc | 2 +- absl/container/BUILD.bazel | 8 ++++---- absl/container/inlined_vector_benchmark.cc | 2 +- absl/debugging/failure_signal_handler_test.cc | 11 ++++++++++- absl/strings/match.h | 3 +-- absl/types/optional.h | 9 +++++++++ 12 files changed, 42 insertions(+), 22 deletions(-) diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake index 650f171e..e4eafe49 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -54,8 +54,8 @@ function(absl_library) PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_LIB_PUBLIC_INCLUDE_DIRS} PRIVATE ${ABSL_LIB_PRIVATE_INCLUDE_DIRS} ) -# Add all Abseil targets to a a folder in the IDE for organization. -set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) + # Add all Abseil targets to a a folder in the IDE for organization. + set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) if(ABSL_LIB_EXPORT_NAME) add_library(absl::${ABSL_LIB_EXPORT_NAME} ALIAS ${_NAME}) @@ -99,8 +99,9 @@ function(absl_header_library) PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_HO_LIB_PUBLIC_INCLUDE_DIRS} PRIVATE ${ABSL_HO_LIB_PRIVATE_INCLUDE_DIRS} ) -# Add all Abseil targets to a a folder in the IDE for organization. -set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) + + # Add all Abseil targets to a a folder in the IDE for organization. + set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) if(ABSL_HO_LIB_EXPORT_NAME) add_library(absl::${ABSL_HO_LIB_EXPORT_NAME} ALIAS ${_NAME}) @@ -147,8 +148,9 @@ function(absl_test) PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_TEST_PUBLIC_INCLUDE_DIRS} PRIVATE ${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS} ) -# Add all Abseil targets to a a folder in the IDE for organization. -set_property(TARGET ${_NAME}_bin PROPERTY FOLDER ${ABSL_IDE_FOLDER}) + + # Add all Abseil targets to a a folder in the IDE for organization. + set_property(TARGET ${_NAME}_bin PROPERTY FOLDER ${ABSL_IDE_FOLDER}) add_test(${_NAME} ${_NAME}_bin) endif(BUILD_TESTING) diff --git a/absl/algorithm/BUILD.bazel b/absl/algorithm/BUILD.bazel index 5cd54960..3b24ce12 100644 --- a/absl/algorithm/BUILD.bazel +++ b/absl/algorithm/BUILD.bazel @@ -41,11 +41,11 @@ cc_test( ], ) -cc_binary( +cc_test( name = "algorithm_benchmark", - testonly = 1, srcs = ["equal_benchmark.cc"], copts = ABSL_TEST_COPTS, + tags = ["benchmark"], deps = [ ":algorithm", "//absl/base:core_headers", diff --git a/absl/algorithm/equal_benchmark.cc b/absl/algorithm/equal_benchmark.cc index fea6d137..9af36ce7 100644 --- a/absl/algorithm/equal_benchmark.cc +++ b/absl/algorithm/equal_benchmark.cc @@ -15,8 +15,8 @@ #include #include -#include "absl/algorithm/algorithm.h" #include "benchmark/benchmark.h" +#include "absl/algorithm/algorithm.h" namespace { diff --git a/absl/base/BUILD.bazel b/absl/base/BUILD.bazel index bb7a5981..5c05c678 100644 --- a/absl/base/BUILD.bazel +++ b/absl/base/BUILD.bazel @@ -406,11 +406,11 @@ cc_test( ], ) -cc_binary( +cc_test( name = "thread_identity_benchmark", - testonly = 1, srcs = ["internal/thread_identity_benchmark.cc"], copts = ABSL_TEST_COPTS, + tags = ["benchmark"], visibility = ["//visibility:private"], deps = [ ":base", diff --git a/absl/base/attributes.h b/absl/base/attributes.h index a4ec7e7c..b1883b6d 100644 --- a/absl/base/attributes.h +++ b/absl/base/attributes.h @@ -52,7 +52,8 @@ // Example: // // // Enable branches in the Abseil code that are tagged for ASan: -// $ bazel -D ADDRESS_SANITIZER -fsanitize=address *target* +// $ bazel build --copt=-DADDRESS_SANITIZER --copt=-fsanitize=address +// --linkopt=-fsanitize=address *target* // // Since these macro names are only supported by GCC and Clang, we only check // for `__GNUC__` (GCC or Clang) and the above macros. diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h index 4bd273ed..2fe345fc 100644 --- a/absl/base/internal/direct_mmap.h +++ b/absl/base/internal/direct_mmap.h @@ -52,7 +52,7 @@ // SYS_mmap and SYS_munmap are not defined in Android. #ifdef __BIONIC__ -extern "C" void* __mmap2(void*, size_t, int, int, int, long); +extern "C" void* __mmap2(void*, size_t, int, int, int, size_t); #if defined(__NR_mmap) && !defined(SYS_mmap) #define SYS_mmap __NR_mmap #endif diff --git a/absl/base/internal/thread_identity_benchmark.cc b/absl/base/internal/thread_identity_benchmark.cc index 3ae57317..fe22e4cf 100644 --- a/absl/base/internal/thread_identity_benchmark.cc +++ b/absl/base/internal/thread_identity_benchmark.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "benchmark/benchmark.h" #include "absl/base/internal/thread_identity.h" #include "absl/synchronization/internal/create_thread_identity.h" #include "absl/synchronization/internal/per_thread_sem.h" -#include "benchmark/benchmark.h" namespace { diff --git a/absl/container/BUILD.bazel b/absl/container/BUILD.bazel index 69cd5195..30341083 100644 --- a/absl/container/BUILD.bazel +++ b/absl/container/BUILD.bazel @@ -62,11 +62,11 @@ cc_test( ], ) -cc_binary( +cc_test( name = "fixed_array_benchmark", - testonly = 1, srcs = ["fixed_array_benchmark.cc"], copts = ABSL_TEST_COPTS + ["$(STACK_FRAME_UNLIMITED)"], + tags = ["benchmark"], deps = [ ":fixed_array", "@com_github_google_benchmark//:benchmark", @@ -117,11 +117,11 @@ cc_test( ], ) -cc_binary( +cc_test( name = "inlined_vector_benchmark", - testonly = 1, srcs = ["inlined_vector_benchmark.cc"], copts = ABSL_TEST_COPTS, + tags = ["benchmark"], deps = [ ":inlined_vector", "//absl/base", diff --git a/absl/container/inlined_vector_benchmark.cc b/absl/container/inlined_vector_benchmark.cc index a2035e35..c6bc5cd9 100644 --- a/absl/container/inlined_vector_benchmark.cc +++ b/absl/container/inlined_vector_benchmark.cc @@ -17,9 +17,9 @@ #include #include +#include "benchmark/benchmark.h" #include "absl/base/internal/raw_logging.h" #include "absl/strings/str_cat.h" -#include "benchmark/benchmark.h" namespace { diff --git a/absl/debugging/failure_signal_handler_test.cc b/absl/debugging/failure_signal_handler_test.cc index 33170dab..ba520910 100644 --- a/absl/debugging/failure_signal_handler_test.cc +++ b/absl/debugging/failure_signal_handler_test.cc @@ -132,8 +132,17 @@ constexpr int kFailureSignals[] = { #endif }; +std::string SignalParamToString(const ::testing::TestParamInfo& info) { + std::string result = absl::debugging_internal::FailureSignalToString(info.param); + if (result.empty()) { + result = absl::StrCat(info.param); + } + return result; +} + INSTANTIATE_TEST_CASE_P(AbslDeathTest, FailureSignalHandlerDeathTest, - ::testing::ValuesIn(kFailureSignals)); + ::testing::ValuesIn(kFailureSignals), + SignalParamToString); #endif // GTEST_HAS_DEATH_TEST diff --git a/absl/strings/match.h b/absl/strings/match.h index 6005533c..108b6048 100644 --- a/absl/strings/match.h +++ b/absl/strings/match.h @@ -43,8 +43,7 @@ namespace absl { // // Returns whether a given std::string `haystack` contains the substring `needle`. inline bool StrContains(absl::string_view haystack, absl::string_view needle) { - return static_cast(haystack.find(needle, 0)) != - haystack.npos; + return haystack.find(needle, 0) != haystack.npos; } // StartsWith() diff --git a/absl/types/optional.h b/absl/types/optional.h index 42068cca..80a2d149 100644 --- a/absl/types/optional.h +++ b/absl/types/optional.h @@ -820,6 +820,12 @@ class optional : private optional_internal::optional_data, // only if `*this` is empty. constexpr bool has_value() const noexcept { return this->engaged_; } +// Suppress bogus warning on MSVC: MSVC complains call to reference() after +// throw_bad_optional_access() is unreachable. +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 4702) +#endif // _MSC_VER // optional::value() // // Returns a reference to an `optional`s underlying value. The constness @@ -848,6 +854,9 @@ class optional : private optional_internal::optional_data, ? reference() : (optional_internal::throw_bad_optional_access(), reference())); } +#ifdef _MSC_VER +#pragma warning(pop) +#endif // _MSC_VER // optional::value_or() //