[libcxx-commits] [libcxx] 483edfe - [libc++] Use __add_pointer and __remove_pointer builtins when they are fixed (#134147)

[via libcxx-commits]

Author: Nikolas Klauser
Date: 2025-04-08T13:05:24+02:00
New Revision: 483edfeeb55420d509671406b889eadcce24114c

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

LOG: [libc++] Use __add_pointer and __remove_pointer builtins when they are fixed (#134147)

Added: 
    

Modified: 
    libcxx/include/__config

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__config b/libcxx/include/__config
index ce8bc38acfe3e..d1cbc278862b0 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1073,9 +1073,8 @@ typedef __char32_t char32_t;
 #    define _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(_ClassName) static_assert(true, "")
 #  endif
 
-// TODO(varconst): currently, there are bugs in Clang's intrinsics when handling Objective-C++ `id`, so don't use
-// compiler intrinsics in the Objective-C++ mode.
-#  ifdef __OBJC__
+// TODO(LLVM 22): Remove the workaround
+#  if defined(__OBJC__) && (!defined(_LIBCPP_CLANG_VER) || _LIBCPP_CLANG_VER < 2001)
 #    define _LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS
 #  endif