[libcxx-commits] [libcxxabi] c5f68a7 - [libc++abi] Revert temporary workaround to unblock Chrome

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2024-02-05T12:19:15-05:00
New Revision: c5f68a711c62aa1748c03215d95ad9b8c7dff9dd

URL: https://github.com/llvm/llvm-project/commit/c5f68a711c62aa1748c03215d95ad9b8c7dff9dd
DIFF: https://github.com/llvm/llvm-project/commit/c5f68a711c62aa1748c03215d95ad9b8c7dff9dd.diff

LOG: [libc++abi] Revert temporary workaround to unblock Chrome

This reverts commit 372f7dd48f016, which is not needed by Chrome anymore.

Added: 
    

Modified: 
    libcxxabi/src/cxa_exception_storage.cpp
    libcxxabi/src/cxa_guard_impl.h
    libcxxabi/src/cxa_thread_atexit.cpp
    libcxxabi/src/fallback_malloc.cpp
    libcxxabi/test/test_fallback_malloc.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxxabi/src/cxa_exception_storage.cpp b/libcxxabi/src/cxa_exception_storage.cpp
index b2a31f8d509b5..2479f550e09ef 100644
--- a/libcxxabi/src/cxa_exception_storage.cpp
+++ b/libcxxabi/src/cxa_exception_storage.cpp
@@ -12,12 +12,7 @@
 
 #include "cxa_exception.h"
 
-// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
-#if __has_include(<__thread/support.h>)
-#  include <__thread/support.h>
-#else
-#  include <__threading_support>
-#endif
+#include <__thread/support.h>
 
 #if defined(_LIBCXXABI_HAS_NO_THREADS)
 

diff  --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h
index 197eb788d5b0c..7b140d3c36045 100644
--- a/libcxxabi/src/cxa_guard_impl.h
+++ b/libcxxabi/src/cxa_guard_impl.h
@@ -55,13 +55,7 @@
 #  endif
 #endif
 
-// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
-#if __has_include(<__thread/support.h>)
-#  include <__thread/support.h>
-#else
-#  include <__threading_support>
-#endif
-
+#include <__thread/support.h>
 #include <cstdint>
 #include <cstring>
 #include <limits.h>

diff  --git a/libcxxabi/src/cxa_thread_atexit.cpp b/libcxxabi/src/cxa_thread_atexit.cpp
index 55025130932e9..c6bd0aa323f2e 100644
--- a/libcxxabi/src/cxa_thread_atexit.cpp
+++ b/libcxxabi/src/cxa_thread_atexit.cpp
@@ -8,12 +8,7 @@
 
 #include "abort_message.h"
 #include "cxxabi.h"
-// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
-#if __has_include(<__thread/support.h>)
-#  include <__thread/support.h>
-#else
-#  include <__threading_support>
-#endif
+#include <__thread/support.h>
 #ifndef _LIBCXXABI_HAS_NO_THREADS
 #if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
 #pragma comment(lib, "pthread")

diff  --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp
index 8ff40f615d4d1..76bd2e9bcd9f7 100644
--- a/libcxxabi/src/fallback_malloc.cpp
+++ b/libcxxabi/src/fallback_malloc.cpp
@@ -9,12 +9,7 @@
 #include "fallback_malloc.h"
 #include "abort_message.h"
 
-// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
-#if __has_include(<__thread/support.h>)
-#  include <__thread/support.h>
-#else
-#  include <__threading_support>
-#endif
+#include <__thread/support.h>
 #ifndef _LIBCXXABI_HAS_NO_THREADS
 #if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
 #pragma comment(lib, "pthread")

diff  --git a/libcxxabi/test/test_fallback_malloc.pass.cpp b/libcxxabi/test/test_fallback_malloc.pass.cpp
index 885960ddb4b00..c8a6a0797510d 100644
--- a/libcxxabi/test/test_fallback_malloc.pass.cpp
+++ b/libcxxabi/test/test_fallback_malloc.pass.cpp
@@ -11,12 +11,7 @@
 #include <cassert>
 #include <inttypes.h>
 
-// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
-#if __has_include(<__thread/support.h>)
-#  include <__thread/support.h>
-#else
-#  include <__threading_support>
-#endif
+#include <__thread/support.h>
 
 // UNSUPPORTED: c++03
 // UNSUPPORTED: modules-build && no-threads