commit 2daa7a0d004916d0905eb5b71e8d36b2835382e8
author Daniel McIntosh <Daniel.McIntosh@ibm.com> Mon Aug 16 14:07:55 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Wed Jan 12 14:37:00 2022 -0800
tree 92f2961cd138ab8076ffa62ba8be5c504cc032c9
parent c5905df2abb3d157761d695eaad8a20a4d486e56

[libcxxabi] Make InitByteGlobalMutex check GetThreadID instead of PlatformThreadID

By relying on PlatformSupportsThreadID, InitByteGlobalMutex disregards
the GetThreadID template argument, rendering it useless.

This is the 2nd of 5 changes to overhaul cxa_guard.
See D108343 for what the final result will be.

Depends on D109539

Reviewed By: ldionne, #libc_abi

Differential Revision: https://reviews.llvm.org/D110088

GitOrigin-RevId: 3601ee6cfd7faa7468edca45495234e0116c0a4e

src/cxa_guard_impl.h

diff --git a/src/cxa_guard_impl.h b/src/cxa_guard_impl.h
index 32dbb18..d431050 100644
--- a/src/cxa_guard_impl.h
+++ b/src/cxa_guard_impl.h
@@ -156,8 +156,6 @@
 constexpr uint32_t (*PlatformThreadID)() = nullptr;
 #endif
 
-constexpr bool PlatformSupportsThreadID() { return +PlatformThreadID != nullptr; }
-
 //===----------------------------------------------------------------------===//
 //                          GuardBase
 //===----------------------------------------------------------------------===//
@@ -289,7 +287,7 @@
   using BaseT::BaseT;
 
   explicit InitByteGlobalMutex(uint32_t* g) : BaseT(g), has_thread_id_support(false) {}
-  explicit InitByteGlobalMutex(uint64_t* g) : BaseT(g), has_thread_id_support(PlatformSupportsThreadID()) {}
+  explicit InitByteGlobalMutex(uint64_t* g) : BaseT(g), has_thread_id_support(GetThreadID != nullptr) {}
 
 public:
   AcquireResult acquire_init_byte() {
@@ -404,12 +402,14 @@
 
   /// ARM Constructor
   explicit InitByteFutex(uint32_t* g)
-      : BaseT(g), init_byte(this->init_byte_address), has_thread_id_support(this->thread_id_address && GetThreadIDArg),
+      : BaseT(g), init_byte(this->init_byte_address),
+        has_thread_id_support(this->thread_id_address && GetThreadIDArg != nullptr),
         thread_id(this->thread_id_address) {}
 
   /// Itanium Constructor
   explicit InitByteFutex(uint64_t* g)
-      : BaseT(g), init_byte(this->init_byte_address), has_thread_id_support(this->thread_id_address && GetThreadIDArg),
+      : BaseT(g), init_byte(this->init_byte_address),
+        has_thread_id_support(this->thread_id_address && GetThreadIDArg != nullptr),
         thread_id(this->thread_id_address) {}
 
 public:

test/guard_test_basic.pass.cpp

diff --git a/test/guard_test_basic.pass.cpp b/test/guard_test_basic.pass.cpp
index b97aeb2..588069b 100644
--- a/test/guard_test_basic.pass.cpp
+++ b/test/guard_test_basic.pass.cpp
@@ -12,9 +12,10 @@
 #include "../src/cxa_guard_impl.h"
 #include <cassert>
 
-// Disable GCC warning about tautological comparison of a function's address
-#if defined(__GNUC__) && !defined(__clang__)
-# pragma GCC diagnostic ignored "-Waddress"
+#if defined(__clang__)
+#  pragma clang diagnostic ignored "-Wtautological-pointer-compare"
+#elif defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Waddress"
 #endif
 
 using namespace __cxxabiv1;
@@ -135,7 +136,7 @@
 #if (defined(__APPLE__) || defined(__linux__))  && !defined(_LIBCXXABI_HAS_NO_THREADS)
     assert(PlatformThreadID);
 #endif
-    if (PlatformSupportsThreadID()) {
+    if (PlatformThreadID != nullptr) {
       assert(PlatformThreadID() != 0);
       assert(PlatformThreadID() == PlatformThreadID());
     }