Skip to content

[libc++] Work around new GCC 15 type_traits builtins that can't be used as Clang's can #137871

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 6 commits into from
May 13, 2025
Merged

[libc++] Work around new GCC 15 type_traits builtins that can't be used as Clang's can #137871

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d2d49d
[libc++] Support more GCC 15 type_traits builtins
frobtech Apr 29, 2025
36df21c
Merge branch 'main' into p/libcxx-gcc15-type-traits
frobtech May 2, 2025
7af1511
Merge branch 'main' into p/libcxx-gcc15-type-traits
frobtech May 9, 2025
b8a57c4
Just disable broken __has_builtin(...) branches for GCC 15.
frobtech May 9, 2025
0f3d120
Merge branch 'main' into p/libcxx-gcc15-type-traits
frobtech May 13, 2025
978d12d
Use !defined(_LIBCPP_COMPILER_GCC)
frobtech May 13, 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
2 changes: 1 addition & 1 deletion libcxx/include/__type_traits/add_lvalue_reference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

_LIBCPP_BEGIN_NAMESPACE_STD

#if __has_builtin(__add_lvalue_reference)
#if __has_builtin(__add_lvalue_reference) && __GNUC__ < 15
Copy link
Contributor

@philnik777 philnik777 May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if __has_builtin(__add_lvalue_reference) && __GNUC__ < 15
#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC)

We usually don't test the version since we support only one and these builtins are new anyways, so there isn't much use to check the version.

Copy link
Contributor Author

@frobtech frobtech May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.


template <class _Tp>
using __add_lvalue_reference_t _LIBCPP_NODEBUG = __add_lvalue_reference(_Tp);
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__type_traits/add_pointer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

_LIBCPP_BEGIN_NAMESPACE_STD

#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer)
#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__add_pointer) && __GNUC__ < 15

template <class _Tp>
using __add_pointer_t _LIBCPP_NODEBUG = __add_pointer(_Tp);
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__type_traits/add_rvalue_reference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

_LIBCPP_BEGIN_NAMESPACE_STD

#if __has_builtin(__add_rvalue_reference)
#if __has_builtin(__add_rvalue_reference) && __GNUC__ < 15

template <class _Tp>
using __add_rvalue_reference_t _LIBCPP_NODEBUG = __add_rvalue_reference(_Tp);
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__type_traits/decay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

_LIBCPP_BEGIN_NAMESPACE_STD

#if __has_builtin(__decay)
#if __has_builtin(__decay) && __GNUC__ < 15
template <class _Tp>
using __decay_t _LIBCPP_NODEBUG = __decay(_Tp);

Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__type_traits/remove_all_extents.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

_LIBCPP_BEGIN_NAMESPACE_STD

#if __has_builtin(__remove_all_extents)
#if __has_builtin(__remove_all_extents) && __GNUC__ < 15
template <class _Tp>
struct _LIBCPP_NO_SPECIALIZATIONS remove_all_extents {
using type _LIBCPP_NODEBUG = __remove_all_extents(_Tp);
Expand Down
2 changes: 1 addition & 1 deletion libcxx/include/__type_traits/remove_extent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

_LIBCPP_BEGIN_NAMESPACE_STD

#if __has_builtin(__remove_extent)
#if __has_builtin(__remove_extent) && __GNUC__ < 15
template <class _Tp>
struct _LIBCPP_NO_SPECIALIZATIONS remove_extent {
using type _LIBCPP_NODEBUG = __remove_extent(_Tp);
Expand Down
Loading