Skip to content

Fix __split_buffer_pointer_layout compatibility with swift's C++ interop #170957

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

Open
junov-google wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −2
Open

Fix __split_buffer_pointer_layout compatibility with swift's C++ interop #170957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions libcxx/CREDITS.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ N: Andrew Morrow
E: andrew.c.morrow@gmail.com
D: Minor patches and Linux fixes.

N: Justin Novosad
E: junov@google.com
E: justin.novosad@gmail.com
D: Minor fixes, Swift interoperability.

N: Michael Park
E: mcypark@gmail.com
D: Implementation of <variant>.
Expand Down
12 changes: 10 additions & 2 deletions libcxx/include/__split_buffer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
#include <__type_traits/integral_constant.h>
#include <__type_traits/is_nothrow_assignable.h>
#include <__type_traits/is_nothrow_constructible.h>
#if _LIBCPP_STD_VER >= 20
# include <__type_traits/is_reference.h>
#endif
#include <__type_traits/is_swappable.h>
#include <__type_traits/is_trivially_destructible.h>
#include <__type_traits/is_trivially_relocatable.h>
Expand Down Expand Up @@ -68,8 +71,13 @@ protected:

public:
// Can't be defaulted due to _LIBCPP_COMPRESSED_PAIR not being an aggregate in C++03 and C++11.
_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __split_buffer_pointer_layout() : __back_cap_(nullptr) {}

_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __split_buffer_pointer_layout()
#if _LIBCPP_STD_VER >= 20
// Prevents Swift compiler's C++ importer from implicitly instantiating this ctor when it's not supported.
requires (!is_reference_v<allocator_type>)
#endif
: __back_cap_(nullptr) {}

_LIBCPP_CONSTEXPR_SINCE_CXX20
_LIBCPP_HIDE_FROM_ABI explicit __split_buffer_pointer_layout(const allocator_type& __alloc)
: __back_cap_(nullptr), __alloc_(__alloc) {}
Expand Down