[llvm-branch-commits] [libcxx] release/23.x: [libc++] Use section-based overridden function detection on Mach-O (#240482) (PR #240670)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Nov 9 18:54:37 PST 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libcxx
Author: llvmbot
<details>
<summary>Changes</summary>
Backport de513b8f794ed75611475fea0f4ff2746a7c663f
Requested by: @<!-- -->ldionne
---
Full diff: https://github.com/llvm/llvm-project/pull/240670.diff
1 Files Affected:
- (modified) libcxx/src/include/overridable_function.h (+9-7)
``````````diff
diff --git a/libcxx/src/include/overridable_function.h b/libcxx/src/include/overridable_function.h
index 307405812f9af7..ff69380d8fa8e9 100644
--- a/libcxx/src/include/overridable_function.h
+++ b/libcxx/src/include/overridable_function.h
@@ -43,10 +43,12 @@
// compares the address of `__impl_ref<f>::__impl_` with the address of `f` loaded from
// GOT: if `f` was overridden by the user in another TU, the addresses will be different.
//
-// When pointer authentication is used, the above mechanism doesn't work (yet) so we use
-// a different strategy placing `f`'s definition (in the libc++ built library) inside
-// a special section, which we do using the `__section__` attribute via the
-// OVERRIDABLE_FUNCTION macro. Then, when comes the time to check whether the function has
+// When pointer authentication is used, the above mechanism doesn't work. It also doesn't work
+// with recent Mach-O linkers, which bind references to a weak definition directly (instead of
+// through a weak-def-coalesced GOT entry) when that definition has a local alias at the same
+// address. In both cases, we use a different strategy, placing `f`'s definition (in the libc++
+// built library) inside a special section, which we do using the `__section__` attribute via
+// the OVERRIDABLE_FUNCTION macro. Then, when comes the time to check whether the function has
// been overridden, we take the address of the function and we check whether it falls inside
// the special section we created. This can be done by finding pointers to the start and
// the end of the section, and then checking whether `f` falls within those bounds.
@@ -63,7 +65,7 @@
# define _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION 1
-# if !__has_feature(ptrauth_calls)
+# if !__has_feature(ptrauth_calls) && !defined(_LIBCPP_OBJECT_FORMAT_MACHO)
# define OVERRIDABLE_FUNCTION [[gnu::weak]]
@@ -112,7 +114,7 @@ _LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {
_LIBCPP_END_NAMESPACE_STD
-# else // __has_feature(ptrauth_calls)
+# else // __has_feature(ptrauth_calls) || defined(_LIBCPP_OBJECT_FORMAT_MACHO)
# include <cstdint>
# include <ptrauth.h>
@@ -152,7 +154,7 @@ _LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {
}
_LIBCPP_END_NAMESPACE_STD
-# endif // __has_feature(ptrauth_calls)
+# endif // __has_feature(ptrauth_calls) || defined(_LIBCPP_OBJECT_FORMAT_MACHO)
#else // defined(_LIBCPP_OBJECT_FORMAT_MACHO) || (defined(_LIBCPP_OBJECT_FORMAT_ELF) && !defined(__NVPTX__))
``````````
</details>
https://github.com/llvm/llvm-project/pull/240670
More information about the llvm-branch-commits
mailing list