Export of internal Abseil changes.

--
fd86c60bac6c41f1629ce1ab7dc1c8edff398a59 by Alex Strelnikov <strel@google.com>:

Import PR: https://github.com/abseil/abseil-cpp/pull/243
Fix Windows ARM64 intrinsic use.

PiperOrigin-RevId: 228535649

--
a0ca663f606a3b31493683e405be2b1cff450894 by CJ Johnson <johnsoncj@google.com>:

Fixes issue of mixed signedness comparison

PiperOrigin-RevId: 228535623

--
d71aaa1705d7303b43fe02088fe07b153e647796 by Shaindel Schwartz <shaindel@google.com>:

Import of CCTZ from GitHub.

PiperOrigin-RevId: 228534365

--
c1b49d361aa880198e071f93997724bddbcd4760 by Samuel Benzaquen <sbenza@google.com>:

Internal cleanup

PiperOrigin-RevId: 228406627

--
0c4b1c2bed107698e209055b3431771d7a1bdba1 by Dave Walker <dawalker@google.com>:

Add comments about the purpose of container_internal::slot_type.

PiperOrigin-RevId: 228264537

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

#include <cmath> in hashtablez_sampler.cc

Expected to fix the android build.

PiperOrigin-RevId: 228222550
GitOrigin-RevId: fd86c60bac6c41f1629ce1ab7dc1c8edff398a59
Change-Id: I26339fd4548c1a81b037cb52c26910d1bd850ea8
This commit is contained in:
Abseil Team 2019-01-09 09:55:36 -08:00 committed by Shaindel Schwartz
parent 9449ae9439
commit 018b4db1d7
11 changed files with 105 additions and 33 deletions

View file

@ -510,12 +510,22 @@ cc_library(
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
) )
cc_library(
name = "common",
hdrs = ["internal/common.h"],
copts = ABSL_DEFAULT_COPTS,
deps = [
"//absl/meta:type_traits",
],
)
cc_library( cc_library(
name = "raw_hash_set", name = "raw_hash_set",
srcs = ["internal/raw_hash_set.cc"], srcs = ["internal/raw_hash_set.cc"],
hdrs = ["internal/raw_hash_set.h"], hdrs = ["internal/raw_hash_set.h"],
copts = ABSL_DEFAULT_COPTS, copts = ABSL_DEFAULT_COPTS,
deps = [ deps = [
":common",
":compressed_tuple", ":compressed_tuple",
":container_memory", ":container_memory",
":hash_policy_traits", ":hash_policy_traits",

View file

@ -527,6 +527,17 @@ absl_cc_library(
PUBLIC PUBLIC
) )
absl_cc_library(
NAME
container_common
HDRS
"internal/commom.h"
COPTS
${ABSL_DEFAULT_COPTS}
DEPS
absl::type_traits
)
absl_cc_library( absl_cc_library(
NAME NAME
raw_hash_set raw_hash_set
@ -540,6 +551,7 @@ absl_cc_library(
absl::bits absl::bits
absl::compressed_tuple absl::compressed_tuple
absl::config absl::config
absl::container_common
absl::container_memory absl::container_memory
absl::core_headers absl::core_headers
absl::endian absl::endian

View file

@ -0,0 +1,48 @@
// Copyright 2018 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
//
// http://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.
#ifndef ABSL_CONTAINER_INTERNAL_CONTAINER_H_
#define ABSL_CONTAINER_INTERNAL_CONTAINER_H_
#include <type_traits>
#include "absl/meta/type_traits.h"
namespace absl {
namespace container_internal {
template <class, class = void>
struct IsTransparent : std::false_type {};
template <class T>
struct IsTransparent<T, absl::void_t<typename T::is_transparent>>
: std::true_type {};
template <bool is_transparent>
struct KeyArg {
// Transparent. Forward `K`.
template <typename K, typename key_type>
using type = K;
};
template <>
struct KeyArg<false> {
// Not transparent. Always use `key_type`.
template <typename K, typename key_type>
using type = key_type;
};
} // namespace container_internal
} // namespace absl
#endif // ABSL_CONTAINER_INTERNAL_CONTAINER_H_

View file

@ -286,11 +286,30 @@ struct IsLayoutCompatible {
} // namespace memory_internal } // namespace memory_internal
// If kMutableKeys is false, only the value member is accessed. // The internal storage type for key-value containers like flat_hash_map.
// //
// If kMutableKeys is true, key is accessed through all slots while value and // It is convenient for the value_type of a flat_hash_map<K, V> to be
// mutable_value are accessed only via INITIALIZED slots. Slots are created and // pair<const K, V>; the "const K" prevents accidental modification of the key
// destroyed via mutable_value so that the key can be moved later. // when dealing with the reference returned from find() and similar methods.
// However, this creates other problems; we want to be able to emplace(K, V)
// efficiently with move operations, and similarly be able to move a
// pair<K, V> in insert().
//
// The solution is this union, which aliases the const and non-const versions
// of the pair. This also allows flat_hash_map<const K, V> to work, even though
// that has the same efficiency issues with move in emplace() and insert() -
// but people do it anyway.
//
// If kMutableKeys is false, only the value member can be accessed.
//
// If kMutableKeys is true, key can be accessed through all slots while value
// and mutable_value must be accessed only via INITIALIZED slots. Slots are
// created and destroyed via mutable_value so that the key can be moved later.
//
// Accessing one of the union fields while the other is active is safe as
// long as they are layout-compatible, which is guaranteed by the definition of
// kMutableKeys. For C++11, the relevant section of the standard is
// https://timsong-cpp.github.io/cppwp/n3337/class.mem#19 (9.2.19)
template <class K, class V> template <class K, class V>
union slot_type { union slot_type {
private: private:

View file

@ -16,6 +16,7 @@
#include <atomic> #include <atomic>
#include <cassert> #include <cassert>
#include <cmath>
#include <functional> #include <functional>
#include <limits> #include <limits>

View file

@ -39,8 +39,8 @@ class raw_hash_map : public raw_hash_set<Policy, Hash, Eq, Alloc> {
using MappedConstReference = decltype(P::value( using MappedConstReference = decltype(P::value(
std::addressof(std::declval<typename raw_hash_map::const_reference>()))); std::addressof(std::declval<typename raw_hash_map::const_reference>())));
using KeyArgImpl = container_internal::KeyArg<IsTransparent<Eq>::value && using KeyArgImpl =
IsTransparent<Hash>::value>; KeyArg<IsTransparent<Eq>::value && IsTransparent<Hash>::value>;
public: public:
using key_type = typename Policy::key_type; using key_type = typename Policy::key_type;

View file

@ -105,6 +105,7 @@
#include "absl/base/internal/bits.h" #include "absl/base/internal/bits.h"
#include "absl/base/internal/endian.h" #include "absl/base/internal/endian.h"
#include "absl/base/port.h" #include "absl/base/port.h"
#include "absl/container/internal/common.h"
#include "absl/container/internal/compressed_tuple.h" #include "absl/container/internal/compressed_tuple.h"
#include "absl/container/internal/container_memory.h" #include "absl/container/internal/container_memory.h"
#include "absl/container/internal/hash_policy_traits.h" #include "absl/container/internal/hash_policy_traits.h"
@ -165,12 +166,6 @@ struct IsDecomposable<
std::declval<Ts>()...))>, std::declval<Ts>()...))>,
Policy, Hash, Eq, Ts...> : std::true_type {}; Policy, Hash, Eq, Ts...> : std::true_type {};
template <class, class = void>
struct IsTransparent : std::false_type {};
template <class T>
struct IsTransparent<T, absl::void_t<typename T::is_transparent>>
: std::true_type {};
// TODO(alkis): Switch to std::is_nothrow_swappable when gcc/clang supports it. // TODO(alkis): Switch to std::is_nothrow_swappable when gcc/clang supports it.
template <class T> template <class T>
constexpr bool IsNoThrowSwappable() { constexpr bool IsNoThrowSwappable() {
@ -605,24 +600,6 @@ struct insert_return_type {
NodeType node; NodeType node;
}; };
// Helper trait to allow or disallow arbitrary keys when the hash and
// eq functions are transparent.
// It is very important that the inner template is an alias and that the type it
// produces is not a dependent type. Otherwise, type deduction would fail.
template <bool is_transparent>
struct KeyArg {
// Transparent. Forward `K`.
template <typename K, typename key_type>
using type = K;
};
template <>
struct KeyArg<false> {
// Not transparent. Always use `key_type`.
template <typename K, typename key_type>
using type = key_type;
};
// Policy: a policy defines how to perform different operations on // Policy: a policy defines how to perform different operations on
// the slots of the hashtable (see hash_policy_traits.h for the full interface // the slots of the hashtable (see hash_policy_traits.h for the full interface
// of policy). // of policy).
@ -643,8 +620,8 @@ struct KeyArg<false> {
template <class Policy, class Hash, class Eq, class Alloc> template <class Policy, class Hash, class Eq, class Alloc>
class raw_hash_set { class raw_hash_set {
using PolicyTraits = hash_policy_traits<Policy>; using PolicyTraits = hash_policy_traits<Policy>;
using KeyArgImpl = container_internal::KeyArg<IsTransparent<Eq>::value && using KeyArgImpl =
IsTransparent<Hash>::value>; KeyArg<IsTransparent<Eq>::value && IsTransparent<Hash>::value>;
public: public:
using init_type = typename PolicyTraits::init_type; using init_type = typename PolicyTraits::init_type;

View file

@ -16,6 +16,7 @@
#define ABSL_SYNCHRONIZATION_INTERNAL_THREAD_POOL_H_ #define ABSL_SYNCHRONIZATION_INTERNAL_THREAD_POOL_H_
#include <cassert> #include <cassert>
#include <cstddef>
#include <functional> #include <functional>
#include <queue> #include <queue>
#include <thread> // NOLINT(build/c++11) #include <thread> // NOLINT(build/c++11)
@ -42,7 +43,7 @@ class ThreadPool {
~ThreadPool() { ~ThreadPool() {
{ {
absl::MutexLock l(&mu_); absl::MutexLock l(&mu_);
for (int i = 0; i < threads_.size(); ++i) { for (size_t i = 0; i < threads_.size(); i++) {
queue_.push(nullptr); // Shutdown signal. queue_.push(nullptr); // Shutdown signal.
} }
} }

View file

@ -87,6 +87,7 @@ cc_test(
"no_test_android_arm", "no_test_android_arm",
"no_test_android_arm64", "no_test_android_arm64",
"no_test_android_x86", "no_test_android_x86",
"no_test_wasm",
], ],
deps = [ deps = [
":civil_time", ":civil_time",
@ -105,6 +106,7 @@ cc_test(
"no_test_android_arm", "no_test_android_arm",
"no_test_android_arm64", "no_test_android_arm64",
"no_test_android_x86", "no_test_android_x86",
"no_test_wasm",
], ],
deps = [ deps = [
":civil_time", ":civil_time",

View file

@ -357,6 +357,7 @@ const char* const kTimeZoneNames[] = {
"Asia/Pontianak", "Asia/Pontianak",
"Asia/Pyongyang", "Asia/Pyongyang",
"Asia/Qatar", "Asia/Qatar",
"Asia/Qostanay",
"Asia/Qyzylorda", "Asia/Qyzylorda",
"Asia/Rangoon", "Asia/Rangoon",
"Asia/Riyadh", "Asia/Riyadh",

View file

@ -337,6 +337,7 @@ const char* const kTimeZoneNames[] = {
"Asia/Pontianak", "Asia/Pontianak",
"Asia/Pyongyang", "Asia/Pyongyang",
"Asia/Qatar", "Asia/Qatar",
"Asia/Qostanay",
"Asia/Qyzylorda", "Asia/Qyzylorda",
"Asia/Rangoon", "Asia/Rangoon",
"Asia/Riyadh", "Asia/Riyadh",