diff --git a/absl/base/config.h b/absl/base/config.h
index db4c4539022202ed1272a6c38267bb480655830d..eb0d79dfe39ffe582125c4f5d4ce1c7381d59934 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -118,7 +118,7 @@
// Checks whether `std::is_trivially_copy_assignable<T>` is supported.
// Notes: Clang with libc++ supports these features, as does gcc >= 5.1 with
-// either libc++ or libstdc++, and Visual Studio.
+// either libc++ or libstdc++, and Visual Studio (but not NVCC).
#if defined(ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE)
#error ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE cannot be directly set
#elif defined(ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE)
@@ -127,7 +127,7 @@
(!defined(__clang__) && defined(__GNUC__) && \
(__GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1)) && \
(defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) || \
- defined(_MSC_VER)
+ (defined(_MSC_VER) && !defined(__NVCC__))
#define ABSL_HAVE_STD_IS_TRIVIALLY_CONSTRUCTIBLE 1
#define ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE 1
#endif
diff --git a/absl/container/BUILD.bazel b/absl/container/BUILD.bazel
index f3b3a2c0b42f899945e487ec3b0280a595a4653d..91013e04b0d06c11f48254c97a680a2f5cb138a5 100644
--- a/absl/container/BUILD.bazel
+++ b/absl/container/BUILD.bazel
@@ -446,15 +446,6 @@ cc_library(
copts = ABSL_DEFAULT_COPTS,
)
-cc_library(
- name = "hashtablez_force_sampling",
- srcs = ["internal/hashtablez_force_sampling.cc"],
- copts = ABSL_DEFAULT_COPTS,
- deps = [
- ":hashtablez_sampler",
- ],
-)
-
cc_library(
name = "hashtablez_sampler",
srcs = [
@@ -488,20 +479,6 @@ cc_test(
],
)
-cc_test(
- name = "hashtablez_force_sampling_test",
- srcs = ["internal/hashtablez_force_sampling_test.cc"],
- tags = [
- "no_test_darwin_x86_64",
- "no_test_msvc_x64",
- ],
- deps = [
- ":hashtablez_force_sampling",
- ":hashtablez_sampler",
- "@com_google_googletest//:gtest_main",
- ],
-)
-
cc_library(
name = "node_hash_policy",
hdrs = ["internal/node_hash_policy.h"],
diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt
index 822388bd5518ead64b5d51fc28142f544a3f39b0..c6053d745799cb5bfb201f69a3be1f549051f0f2 100644
--- a/absl/container/CMakeLists.txt
+++ b/absl/container/CMakeLists.txt
@@ -464,30 +464,6 @@ absl_cc_test(
gmock_main
)
-absl_cc_library(
- NAME
- hashtablez_force_sampling
- SRCS
- "internal/hashtablez_force_sampling.cc"
- COPTS
- ${ABSL_DEFAULT_COPTS}
- DEPS
- absl::base
- absl::have_sse
- absl::synchronization
-)
-
-absl_cc_test(
- NAME
- hashtablez_force_sampling_test
- SRCS
- "internal/hashtablez_force_sampling_test.cc"
- DEPS
- absl::hashtablez_force_sampling
- absl::hashtablez_sampler
- gmock_main
-)
-
absl_cc_library(
NAME
hashtable_debug
diff --git a/absl/container/internal/hashtablez_force_sampling.cc b/absl/container/internal/hashtablez_force_sampling.cc
deleted file mode 100644
index 868976ec52400c0ade084db132d60cb226948a4a..0000000000000000000000000000000000000000
--- a/absl/container/internal/hashtablez_force_sampling.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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.
-
-#include "absl/container/internal/hashtablez_sampler.h"
-
-namespace absl {
-namespace container_internal {
-
-// See hashtablez_sampler.h for details.
-extern "C" const bool kAbslContainerInternalSampleEverything = true;
-
-} // namespace container_internal
-} // namespace absl
diff --git a/absl/container/internal/hashtablez_force_sampling_test.cc b/absl/container/internal/hashtablez_force_sampling_test.cc
deleted file mode 100644
index 9ff1046a9ad303eebab35068658361088027c1a8..0000000000000000000000000000000000000000
--- a/absl/container/internal/hashtablez_force_sampling_test.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.
-
-#include <cstddef>
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include "absl/container/internal/hashtablez_sampler.h"
-
-namespace absl {
-namespace container_internal {
-
-class HashtablezInfoHandlePeer {
- public:
- static bool IsSampled(const HashtablezInfoHandle& h) {
- return h.info_ != nullptr;
- }
-};
-
-namespace {
-
-bool samples[3]{true, true, true};
-
-// We do this test in a global object to test that this works even before main.
-struct Global {
- Global() {
- // By default it is sampled.
- samples[0] = HashtablezInfoHandlePeer::IsSampled(Sample());
-
- // Even with a large parameter, it is sampled.
- SetHashtablezSampleParameter(100);
- samples[1] = HashtablezInfoHandlePeer::IsSampled(Sample());
-
- // Even if we turn it off, it is still sampled.
- SetHashtablezEnabled(false);
- samples[2] = HashtablezInfoHandlePeer::IsSampled(Sample());
- }
-} global;
-
-TEST(kAbslContainerInternalSampleEverything, Works) {
- EXPECT_THAT(samples, testing::Each(true));
- EXPECT_TRUE(kAbslContainerInternalSampleEverything);
- // One more after main()
- EXPECT_TRUE(HashtablezInfoHandlePeer::IsSampled(Sample()));
-}
-
-} // namespace
-} // namespace container_internal
-} // namespace absl
diff --git a/absl/strings/charconv.cc b/absl/strings/charconv.cc
index c7b8c98b1b4459c56ea851e9281e35a92613c60f..d0aa19134aa2941b27c8053809682e3e0879b4d9 100644
--- a/absl/strings/charconv.cc
+++ b/absl/strings/charconv.cc
@@ -551,9 +551,10 @@ CalculatedFloat CalculateFromParsedDecimal(
int binary_exponent = Power10Exponent(parsed_decimal.exponent);
// Discard bits that are inaccurate due to truncation error. The magic
- // `mantissa_width` constants below are justified in charconv_algorithm.md.
- // They represent the number of bits in `wide_binary_mantissa` that are
- // guaranteed to be unaffected by error propagation.
+ // `mantissa_width` constants below are justified in
+ // https://abseil.io/about/design/charconv. They represent the number of bits
+ // in `wide_binary_mantissa` that are guaranteed to be unaffected by error
+ // propagation.
bool mantissa_exact;
int mantissa_width;
if (parsed_decimal.subrange_begin) {