From 7aacab8ae05d7115049923da9cfbf584dc1f8338 Mon Sep 17 00:00:00 2001
From: Abseil Team <absl-team@google.com>
Date: Thu, 31 May 2018 12:26:35 -0700
Subject:   - e2f6b8ac647271815b4fed2991f405524dd762c3 Release cctz
 microbenchmarks. by Alex Strelnikov <strel@google.com>   -
 924ba2a3f9fca695d73c6bf491d20669e2b96b8e Changed RawPtr to use
 std::addressof() instead of operato... by Abseil Team <absl-team@google.com> 
  - e8cf67f9fa74d4c5632da35547025ad2301c6819 Import of CCTZ from GitHub. by
 Alex Strelnikov <strel@google.com>   -
 2ece8a96611afcddd7b91e0197dadb896248250c Abandon ".inc" files in favor of
 ".h" headers. by Jorg Brown <jorg@google.com>   -
 37f5ed5da4058f90fb3e6a2733fce5b1fd0aaedf Add exception safety tests for
 absl::optional<T> by Abseil Team <absl-team@google.com>   -
 337f995a866b8f905f64ca6b271b5fec8f248a60 Update WORKSPACE to grab specific
 commits of dependencies... by Alex Strelnikov <strel@google.com>   -
 93e5b134607a554993387ad913e6c1621606004b Release Charmap microbenchmark. by
 Alex Strelnikov <strel@google.com>   -
 95c2e29b6d93ec1334484ee37d91f63101c45307 Release OStringStream
 microbenchmarks. by Alex Strelnikov <strel@google.com>   -
 250f51839ed26dd1e6b658d35aa291413e5f4825 Internal change by Greg Falcon
 <gfalcon@google.com>   - ce34900fa3d1a95a8446bc943cdd801fac95be25 Improve
 compatibility of cctz cc_test targets for portabl... by Shaindel Schwartz
 <shaindel@google.com>   - ce7e31dbf2c1ee93c79aae5b7dc7c603cb4babcf Improve
 portability of cc_tests. (Mark more tests that ca... by Abseil Team
 <absl-team@google.com>   - dfcd4e455923703c1a1dcd523c5f915f7990fa2a Accept
 strings with custom allocators as arguments to abs... by Greg Falcon
 <gfalcon@google.com>   - 2946b41ed3d5b8b5a8dc11182e443cf1ab6e3bde Link
 against benchmark_main instead of using BENCHMARK_MA... by Alex Strelnikov
 <strel@google.com>   - f09de9e03bf8edd363069c4b352d8009423f531c Adds link to
 doc about the formats allowed by SimpleAtof(... by Greg Miller
 <jgm@google.com>   - 59b0977e7a308e0800277886cf60226b2cc426a1 Simplify the
 HideMask() calculation so that it doesn't us... by Jorg Brown
 <jorg@google.com>

GitOrigin-RevId: e2f6b8ac647271815b4fed2991f405524dd762c3
Change-Id: Ib9c8547ed7fe217fad6cb3ab1362e96181aa5cfa
---
 absl/base/internal/hide_ptr.h                   | 4 +---
 absl/base/internal/thread_identity_benchmark.cc | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'absl/base/internal')

diff --git a/absl/base/internal/hide_ptr.h b/absl/base/internal/hide_ptr.h
index 2c2e11f679a0..45cf438912c2 100644
--- a/absl/base/internal/hide_ptr.h
+++ b/absl/base/internal/hide_ptr.h
@@ -23,9 +23,7 @@ namespace base_internal {
 // Arbitrary value with high bits set. Xor'ing with it is unlikely
 // to map one valid pointer to another valid pointer.
 constexpr uintptr_t HideMask() {
-  static_assert(sizeof(uintptr_t) == 4 || sizeof(uintptr_t) == 8,
-                "uintptr_t must be 32 or 64 bits");
-  return sizeof(uintptr_t) == 8 ? 0xF03A5F7BF03A5F7BULL : 0xF03A5F7BUL;
+  return (uintptr_t{0xF03A5F7BU} << (sizeof(uintptr_t) - 4) * 8) | 0xF03A5F7BU;
 }
 
 // Hide a pointer from the leak checker. For internal use only.
diff --git a/absl/base/internal/thread_identity_benchmark.cc b/absl/base/internal/thread_identity_benchmark.cc
index fe22e4cff172..242522b4418a 100644
--- a/absl/base/internal/thread_identity_benchmark.cc
+++ b/absl/base/internal/thread_identity_benchmark.cc
@@ -36,5 +36,3 @@ void BM_UnsafeCurrentThreadIdentity(benchmark::State& state) {
 BENCHMARK(BM_UnsafeCurrentThreadIdentity);
 
 }  // namespace
-
-BENCHMARK_MAIN();
-- 
cgit 1.4.1