git: 2643a65e5d47 - main - devel/llvm13: fix build with libc++ 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 02 Aug 2024 22:04:16 UTC
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=2643a65e5d4700feaae78bfafe8bf9ab9b37f03c commit 2643a65e5d4700feaae78bfafe8bf9ab9b37f03c Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-08-02 19:59:56 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-08-02 22:01:29 +0000 devel/llvm13: fix build with libc++ 19 As noted in the libc++ 19 release notes [1], std::char_traits<> is now only provided for char, char8_t, char16_t, char32_t and wchar_t, and any instantiation for other types will fail. This causes devel/llvm13 to fail to compile with clang 19 and libc++ 19, resulting in errors similar to: /usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned char>' 820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value, | ^ /wrkdirs/usr/ports/devel/llvm13/work-default/llvm-project-13.0.1.src/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp:595:34: note: in instantiation of template class 'std::basic_string<unsigned char>' requested here 638 | std::basic_string<uint8_t> zeros(reg_info.byte_size, '\0'); | ^ /usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here 23 | struct _LIBCPP_TEMPLATE_VIS char_traits; | ^ Upstream llvm has fixed this in commit 68744ffbdd7d [2], so add this as a backported patch file. [1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals [2] https://github.com/llvm/llvm-project/commit/68744ffbdd7d PR: 280579 Approved by: brooks (maintainer) MFH: 2024Q3 --- devel/llvm13/files/patch-backport-68744ffbdd | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/devel/llvm13/files/patch-backport-68744ffbdd b/devel/llvm13/files/patch-backport-68744ffbdd new file mode 100644 index 000000000000..253e44a6ef6b --- /dev/null +++ b/devel/llvm13/files/patch-backport-68744ffbdd @@ -0,0 +1,29 @@ +commit 68744ffbdd7daac41da274eef9ac0d191e11c16d +Author: Martin Storsjö <martin@martin.st> +Date: 2023-08-10T11:09:36+03:00 + + [lldb] Fix building with latest libc++ + + Since https://reviews.llvm.org/D157058 in libc++, + the base template for char_traits has been removed - it is only + provided for char, wchar_t, char8_t, char16_t and char32_t. + (Thus, to use basic_string with a type other than those, we'd need + to supply suitable traits ourselves.) + + For this particular use, a vector works just as well as basic_string. + + Differential Revision: https://reviews.llvm.org/D157589 + +diff --git lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +index 4efc454967a1..f9d95fc5d2a6 100644 +--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp ++++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp +@@ -631,7 +631,7 @@ static void WriteRegisterValueInHexFixedWidth( + } else { + // Zero-out any unreadable values. + if (reg_info.byte_size > 0) { +- std::basic_string<uint8_t> zeros(reg_info.byte_size, '\0'); ++ std::vector<uint8_t> zeros(reg_info.byte_size, '\0'); + AppendHexValue(response, zeros.data(), zeros.size(), false); + } + }