Skip to content

[libc++] Simplify std::launder #147985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2025
+7 −10
Merged

[libc++] Simplify std::launder #147985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f3806a
[libc++] Simplify std::launder
philnik777 Jul 10, 2025
2f16bf5
Update libcxx/include/__new/launder.h
ldionne Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions libcxx/include/__new/launder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#define _LIBCPP___NEW_LAUNDER_H

#include <__config>
#include <__type_traits/is_function.h>
#include <__type_traits/is_void.h>

#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
Expand All @@ -20,15 +18,15 @@
_LIBCPP_BEGIN_NAMESPACE_STD
template <class _Tp>
[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* __launder(_Tp* __p) _NOEXCEPT {
static_assert(!(is_function<_Tp>::value), "can't launder functions");
static_assert(!is_void<_Tp>::value, "can't launder cv-void");
// The compiler diagnoses misuses of __builtin_launder, so we don't need to add any static_asserts
// to implement the Mandates.
return __builtin_launder(__p);
}

#if _LIBCPP_STD_VER >= 17
template <class _Tp>
[[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI constexpr _Tp* launder(_Tp* __p) noexcept {
return std::__launder(__p);
return __builtin_launder(__p);
}
#endif
_LIBCPP_END_NAMESPACE_STD
Expand Down
9 changes: 4 additions & 5 deletions libcxx/test/std/language.support/support.dynamic/ptr.launder/launder.types.verify.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ int main(int, char**) {
(void)std::launder((void*)nullptr);
(void)std::launder((const void*)nullptr);
(void)std::launder((volatile void*)nullptr);
(void)std::launder(
(const volatile void*)nullptr); // expected-error-re@*:* 4 {{static assertion failed{{.*}}can't launder cv-void}}
// expected-error@*:* 0-4 {{void pointer argument to '__builtin_launder' is not allowed}}
(void)std::launder((const volatile void*)nullptr);
// expected-error@*:* 4 {{void pointer argument to '__builtin_launder' is not allowed}}

(void)std::launder(foo); // expected-error-re@*:* 1 {{static assertion failed{{.*}}can't launder functions}}
// expected-error@*:* 0-1 {{function pointer argument to '__builtin_launder' is not allowed}}
(void)std::launder(foo);
// expected-error@*:* 1 {{function pointer argument to '__builtin_launder' is not allowed}}

return 0;
}
Loading