Skip to content

A
abseil-cpp
Commit f6ae8168 by Abseil Team Committed by Jon Cohen
Options

Export of internal Abseil changes. 

--
da04b8cd21f6225d71397471474d34a77df0efd6 by Jon Cohen <cohenjon@google.com>:

Don't use std::any, std::optional, std::variant, and friends on MacOS versions older than 10.14.

Although Xcode 10 includes those headers and makes the types available to use, according to https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes, on MacOS 10.13 and earlier use of any functions (std::get, for example) results in an error message to upgrade to MacOS 10.14.

This fixes https://github.com/abseil/abseil-cpp/issues/207.  See that issue for more information on the error generated.

PiperOrigin-RevId: 221844618

--
1d99f77b4c60c5b0d7984f46e8ed63a3f969c635 by Jon Cohen <cohenjon@google.com>:

raw_hash_set_test is still flaky under gcc 4.8.  Since we now have the probe_test, we don't need the PerfectRatio tests.  Just remove them.

PiperOrigin-RevId: 221843042

--
135cbb2a5d90963256518b3b59fe6710815e5dfa by Abseil Team <absl-team@google.com>:

Update absl/algorithm/CMakeLists.txt to use new functions
i.e. absl_cc_(library|test)

PiperOrigin-RevId: 221828348

--
1a5abde4f17f998ae89d87155d59f982a70202d8 by Jon Cohen <cohenjon@google.com>:

Internal change

PiperOrigin-RevId: 221708245

--
e03e031d4de39275989f695c768b0940cce1ff16 by Matt Armstrong <marmstrong@google.com>:

Log to FATAL in throw_delegate.h

ABSL_RAW_LOG(FATAL, ...) is guaranteed to abort.
Previously, the code was logging to ERROR and
calling abort() explicitly, which defeated any
integration with absl::raw_logging_internal::AbortHook().

These changes are limited to Abseil internal APIs.

PiperOrigin-RevId: 221696513

--
d13691523a3f9a5367fd1194cf9604bf4a969029 by Shahriar Rouf <nafi@google.com>:

Import of CCTZ from GitHub.

PiperOrigin-RevId: 221694877

--
f4044c56d44ba0ac2a9f218ed55f1b1f9e985eae by Abseil Team <absl-team@google.com>:

Update absl/base/CMakeLists.txt to use new functions
i.e. absl_cc_(library|test)

PiperOrigin-RevId: 221676669
GitOrigin-RevId: da04b8cd21f6225d71397471474d34a77df0efd6
Change-Id: If6621e10d096a39b6a056a072c2727a0df0b0620
parent a06c4a1d
Showing with 99 additions and 192 deletions
CMake/AbseilHelpers.cmake
...@@ -73,11 +73,12 @@ endfunction() ...@@ -73,11 +73,12 @@ endfunction()
# DEFINES: List of public defines # DEFINES: List of public defines
# LINKOPTS: List of link options # LINKOPTS: List of link options
# PUBLIC: Add this so that this library will be exported under absl:: (see Note). # PUBLIC: Add this so that this library will be exported under absl:: (see Note).
# Also in IDE, target will appear in Abseil folder while non PUBLIC will be in Abseil/internal.
# TESTONLY: When added, this target will only be built if user passes -DABSL_RUN_TESTS=ON to CMake. # TESTONLY: When added, this target will only be built if user passes -DABSL_RUN_TESTS=ON to CMake.
# #
# Note: # Note:
# By default, absl_cc_library will always create a library named absl_internal_${NAME}, # By default, absl_cc_library will always create a library named absl_internal_${NAME},
# which means other targets can only depend this library as absl_internal_${NAME}, not ${NAME}. # and alias target absl::${NAME}.
# This is to reduce namespace pollution. # This is to reduce namespace pollution.
# #
# absl_cc_library( # absl_cc_library(
...@@ -98,7 +99,7 @@ endfunction() ...@@ -98,7 +99,7 @@ endfunction()
# ) # )
# #
# If PUBLIC is set, absl_cc_library will instead create a target named # If PUBLIC is set, absl_cc_library will instead create a target named
# absl_${NAME} and an alias absl::${NAME}. # absl_${NAME} and still an alias absl::${NAME}.
# #
# absl_cc_library( # absl_cc_library(
# NAME # NAME
...@@ -146,7 +147,13 @@ function(absl_cc_library) ...@@ -146,7 +147,13 @@ function(absl_cc_library)
target_compile_definitions(${_NAME} PUBLIC ${ABSL_CC_LIB_DEFINES}) target_compile_definitions(${_NAME} PUBLIC ${ABSL_CC_LIB_DEFINES})
# Add all Abseil targets to a a folder in the IDE for organization. # Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) if(ABSL_CC_LIB_PUBLIC)
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER})
elseif(ABSL_CC_LIB_TESTONLY)
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}/test)
else()
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}/internal)
endif()
else() else()
# Generating header-only library # Generating header-only library
add_library(${_NAME} INTERFACE) add_library(${_NAME} INTERFACE)
...@@ -157,10 +164,7 @@ function(absl_cc_library) ...@@ -157,10 +164,7 @@ function(absl_cc_library)
) )
target_compile_definitions(${_NAME} INTERFACE ${ABSL_CC_LIB_DEFINES}) target_compile_definitions(${_NAME} INTERFACE ${ABSL_CC_LIB_DEFINES})
endif() endif()
add_library(absl::${ABSL_CC_LIB_NAME} ALIAS ${_NAME})
if(ABSL_CC_LIB_PUBLIC)
add_library(absl::${ABSL_CC_LIB_NAME} ALIAS ${_NAME})
endif()
endif() endif()
endfunction() endfunction()
...@@ -231,7 +235,7 @@ function(absl_cc_test) ...@@ -231,7 +235,7 @@ function(absl_cc_test)
PRIVATE ${ABSL_CC_TEST_LINKOPTS} PRIVATE ${ABSL_CC_TEST_LINKOPTS}
) )
# Add all Abseil targets to a a folder in the IDE for organization. # Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}/test)
add_test(NAME ${_NAME} COMMAND ${_NAME}) add_test(NAME ${_NAME} COMMAND ${_NAME})
endfunction() endfunction()
......
CMake/DownloadGTest.cmake
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Download the latest googletest from Github master # Download the latest googletest from Github master
configure_file( configure_file(
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in
googletest-download/CMakeLists.txt ${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt
) )
# Configure and build the downloaded googletest source # Configure and build the downloaded googletest source
......
absl/algorithm/CMakeLists.txt
...@@ -14,50 +14,46 @@ ...@@ -14,50 +14,46 @@
# limitations under the License. # limitations under the License.
# #
list(APPEND ALGORITHM_PUBLIC_HEADERS absl_cc_library(
"algorithm.h" NAME
"container.h"
)
#
## TESTS
#
# test algorithm_test
list(APPEND ALGORITHM_TEST_SRC
"algorithm_test.cc"
${ALGORITHM_PUBLIC_HEADERS}
${ALGORITHM_INTERNAL_HEADERS}
)
absl_header_library(
TARGET
absl_algorithm
EXPORT_NAME
algorithm algorithm
HDRS
"algorithm.h"
PUBLIC
) )
absl_test( absl_cc_test(
TARGET NAME
algorithm_test algorithm_test
SOURCES SRCS
${ALGORITHM_TEST_SRC} "algorithm_test.cc"
PUBLIC_LIBRARIES DEPS
absl::algorithm absl::algorithm
gmock_main
) )
absl_cc_library(
NAME
algorithm_container
HDRS
"container.h"
DEPS
absl::algorithm
absl::core_headers
absl::meta
PUBLIC
)
absl_cc_test(
NAME
# test container_test
set(CONTAINER_TEST_SRC "container_test.cc")
absl_test(
TARGET
container_test container_test
SOURCES SRCS
${CONTAINER_TEST_SRC} "container_test.cc"
PUBLIC_LIBRARIES DEPS
absl::algorithm absl::algorithm_container
absl::base
absl::core_headers
absl::memory
absl::span
gmock_main
) )
absl/base/config.h
...@@ -365,6 +365,18 @@ ...@@ -365,6 +365,18 @@
#error "absl endian detection needs to be set up for your compiler" #error "absl endian detection needs to be set up for your compiler"
#endif #endif
// MacOS 10.13 doesn't let you use <any>, <optional>, or <variant> even though
// the headers exist and are publicly noted to work. See
// https://github.com/abseil/abseil-cpp/issues/207 and
// https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
#if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \
defined(__MAC_OS_X_VERSION_MIN_REQUIRED__) && \
__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101400
#define ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES 1
#else
#define ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES 0
#endif
// ABSL_HAVE_STD_ANY // ABSL_HAVE_STD_ANY
// //
// Checks whether C++17 std::any is available by checking whether <any> exists. // Checks whether C++17 std::any is available by checking whether <any> exists.
...@@ -373,7 +385,8 @@ ...@@ -373,7 +385,8 @@
#endif #endif
#ifdef __has_include #ifdef __has_include
#if __has_include(<any>) && __cplusplus >= 201703L #if __has_include(<any>) && __cplusplus >= 201703L && \
ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES
#define ABSL_HAVE_STD_ANY 1 #define ABSL_HAVE_STD_ANY 1
#endif #endif
#endif #endif
...@@ -386,7 +399,8 @@ ...@@ -386,7 +399,8 @@
#endif #endif
#ifdef __has_include #ifdef __has_include
#if __has_include(<optional>) && __cplusplus >= 201703L #if __has_include(<optional>) && __cplusplus >= 201703L && \
ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES
#define ABSL_HAVE_STD_OPTIONAL 1 #define ABSL_HAVE_STD_OPTIONAL 1
#endif #endif
#endif #endif
...@@ -399,7 +413,8 @@ ...@@ -399,7 +413,8 @@
#endif #endif
#ifdef __has_include #ifdef __has_include
#if __has_include(<variant>) && __cplusplus >= 201703L #if __has_include(<variant>) && __cplusplus >= 201703L && \
ABSL_INTERNAL_MACOS_HAS_CXX_17_TYPES
#define ABSL_HAVE_STD_VARIANT 1 #define ABSL_HAVE_STD_VARIANT 1
#endif #endif
#endif #endif
......
absl/base/internal/throw_delegate.cc
...@@ -30,8 +30,8 @@ template <typename T> ...@@ -30,8 +30,8 @@ template <typename T>
#ifdef ABSL_HAVE_EXCEPTIONS #ifdef ABSL_HAVE_EXCEPTIONS
throw error; throw error;
#else #else
ABSL_RAW_LOG(ERROR, "%s", error.what()); ABSL_RAW_LOG(FATAL, "%s", error.what());
abort(); std::abort();
#endif #endif
} }
} // namespace } // namespace
......
absl/container/internal/raw_hash_set_test.cc
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "absl/container/internal/raw_hash_set.h" #include "absl/container/internal/raw_hash_set.h"
#include <array>
#include <cmath> #include <cmath>
#include <cstdint> #include <cstdint>
#include <deque> #include <deque>
...@@ -1782,143 +1781,6 @@ TEST(Table, IterationOrderChangesForSmallTables) { ...@@ -1782,143 +1781,6 @@ TEST(Table, IterationOrderChangesForSmallTables) {
FAIL() << "Iteration order remained the same across many attempts."; FAIL() << "Iteration order remained the same across many attempts.";
} }
// Fill the table to 3 different load factors (min, median, max) and evaluate
// the percentage of perfect hits using the debug API.
template <class Table, class AddFn>
std::vector<double> CollectPerfectRatios(Table, AddFn add) {
std::vector<double> results(3);
constexpr size_t kNumTrials = 10;
std::vector<Table> tables(kNumTrials);
for (Table& t : tables) {
using Key = typename Table::key_type;
// First, fill enough to have a good distribution.
constexpr size_t kMinSize = 10000;
std::vector<Key> keys;
while (t.size() < kMinSize) keys.push_back(add(t));
// Then, insert until we reach min load factor.
double lf = t.load_factor();
while (lf <= t.load_factor()) keys.push_back(add(t));
// We are now at min load factor. Take a snapshot.
size_t perfect = 0;
auto update_perfect = [&](Key k) {
perfect += GetHashtableDebugNumProbes(t, k) == 0;
};
for (const auto& k : keys) update_perfect(k);
std::vector<double> perfect_ratios;
// Keep going until we hit max load factor.
while (t.load_factor() < .6) {
perfect_ratios.push_back(1.0 * perfect / t.size());
update_perfect(add(t));
}
while (t.load_factor() > .5) {
perfect_ratios.push_back(1.0 * perfect / t.size());
update_perfect(add(t));
}
results[0] += perfect_ratios.front();
results[1] += perfect_ratios[perfect_ratios.size() / 2];
results[2] += perfect_ratios.back();
}
results[0] /= kNumTrials;
results[1] /= kNumTrials;
results[2] /= kNumTrials;
return results;
}
std::vector<std::pair<double, double>> StringTablePefectRatios() {
constexpr bool kRandomizesInserts =
#if NDEBUG
false;
#else // NDEBUG
true;
#endif // NDEBUG
// The effective load factor is larger in non-opt mode because we insert
// elements out of order.
switch (container_internal::Group::kWidth) {
case 8:
if (kRandomizesInserts) {
return {{0.986, 0.02}, {0.95, 0.02}, {0.89, 0.02}};
} else {
return {{0.995, 0.01}, {0.97, 0.01}, {0.89, 0.02}};
}
case 16:
if (kRandomizesInserts) {
return {{0.973, 0.01}, {0.965, 0.01}, {0.92, 0.02}};
} else {
return {{0.995, 0.005}, {0.99, 0.005}, {0.94, 0.01}};
}
}
ABSL_RAW_LOG(FATAL, "%s", "Unknown Group width");
return {};
}
// This is almost a change detector, but it allows us to know how we are
// affecting the probe distribution.
TEST(Table, EffectiveLoadFactorStrings) {
std::vector<double> perfect_ratios =
CollectPerfectRatios(StringTable(), [](StringTable& t) {
return t.emplace(std::to_string(t.size()), "").first->first;
});
auto ratios = StringTablePefectRatios();
if (ratios.empty()) return;
EXPECT_THAT(perfect_ratios,
ElementsAre(DoubleNear(ratios[0].first, ratios[0].second),
DoubleNear(ratios[1].first, ratios[1].second),
DoubleNear(ratios[2].first, ratios[2].second)));
}
std::vector<std::pair<double, double>> IntTablePefectRatios() {
constexpr bool kRandomizesInserts =
#ifdef NDEBUG
false;
#else // NDEBUG
true;
#endif // NDEBUG
// The effective load factor is larger in non-opt mode because we insert
// elements out of order.
switch (container_internal::Group::kWidth) {
case 8:
if (kRandomizesInserts) {
return {{0.99, 0.02}, {0.985, 0.02}, {0.95, 0.05}};
} else {
return {{0.99, 0.01}, {0.99, 0.01}, {0.95, 0.02}};
}
case 16:
if (kRandomizesInserts) {
return {{0.98, 0.02}, {0.978, 0.02}, {0.96, 0.02}};
} else {
return {{0.998, 0.003}, {0.995, 0.01}, {0.975, 0.02}};
}
}
ABSL_RAW_LOG(FATAL, "%s", "Unknown Group width");
return {};
}
// This is almost a change detector, but it allows us to know how we are
// affecting the probe distribution.
TEST(Table, EffectiveLoadFactorInts) {
std::vector<double> perfect_ratios = CollectPerfectRatios(
IntTable(), [](IntTable& t) { return *t.emplace(t.size()).first; });
auto ratios = IntTablePefectRatios();
if (ratios.empty()) return;
EXPECT_THAT(perfect_ratios,
ElementsAre(DoubleNear(ratios[0].first, ratios[0].second),
DoubleNear(ratios[1].first, ratios[1].second),
DoubleNear(ratios[2].first, ratios[2].second)));
}
// Confirm that we assert if we try to erase() end(). // Confirm that we assert if we try to erase() end().
TEST(TableDeathTest, EraseOfEndAsserts) { TEST(TableDeathTest, EraseOfEndAsserts) {
// Use an assert with side-effects to figure out if they are actually enabled. // Use an assert with side-effects to figure out if they are actually enabled.
......
absl/debugging/CMakeLists.txt
...@@ -85,7 +85,7 @@ absl_library( ...@@ -85,7 +85,7 @@ absl_library(
${SYMBOLIZE_SRC} ${SYMBOLIZE_SRC}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
absl::base absl::base
absl_internal_malloc_internal absl::malloc_internal
EXPORT_NAME EXPORT_NAME
symbolize symbolize
) )
......
absl/time/internal/cctz/include/cctz/civil_time_detail.h
...@@ -326,6 +326,37 @@ CONSTEXPR_F fields align(year_tag, fields f) noexcept { ...@@ -326,6 +326,37 @@ CONSTEXPR_F fields align(year_tag, fields f) noexcept {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
namespace impl {
template <typename H>
H AbslHashValueImpl(second_tag, H h, fields f) {
return H::combine(std::move(h), f.y, f.m, f.d, f.hh, f.mm, f.ss);
}
template <typename H>
H AbslHashValueImpl(minute_tag, H h, fields f) {
return H::combine(std::move(h), f.y, f.m, f.d, f.hh, f.mm);
}
template <typename H>
H AbslHashValueImpl(hour_tag, H h, fields f) {
return H::combine(std::move(h), f.y, f.m, f.d, f.hh);
}
template <typename H>
H AbslHashValueImpl(day_tag, H h, fields f) {
return H::combine(std::move(h), f.y, f.m, f.d);
}
template <typename H>
H AbslHashValueImpl(month_tag, H h, fields f) {
return H::combine(std::move(h), f.y, f.m);
}
template <typename H>
H AbslHashValueImpl(year_tag, H h, fields f) {
return H::combine(std::move(h), f.y);
}
} // namespace impl
////////////////////////////////////////////////////////////////////////
template <typename T> template <typename T>
class civil_time { class civil_time {
public: public:
...@@ -418,8 +449,7 @@ class civil_time { ...@@ -418,8 +449,7 @@ class civil_time {
template <typename H> template <typename H>
friend H AbslHashValue(H h, civil_time a) { friend H AbslHashValue(H h, civil_time a) {
return H::combine(std::move(h), a.f_.y, a.f_.m, a.f_.d, return impl::AbslHashValueImpl(T{}, std::move(h), a.f_);
a.f_.hh, a.f_.mm, a.f_.ss);
} }
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment