https://github.com/Michael137 updated https://github.com/llvm/llvm-project/pull/147709
>From 816d7b09be98a875774242d638f31cf88835b857 Mon Sep 17 00:00:00 2001 From: Michael Buch <[email protected]> Date: Wed, 9 Jul 2025 13:41:29 +0100 Subject: [PATCH] [lldb][Formatters] Simplify std::list libc++ formatter matching regex --- .../Language/CPlusPlus/CPlusPlusLanguage.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp index ae6086ff89d71..dd3b84e47dec3 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp @@ -880,11 +880,7 @@ static void LoadLibCxxFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { AddCXXSynthetic( cpp_category_sp, lldb_private::formatters::LibcxxStdListSyntheticFrontEndCreator, - "libc++ std::list synthetic children", - // A POSIX variant of: "^std::__(?!cxx11:)[[:alnum:]]+::list<.+>$" - // so that it does not clash with: "^std::(__cxx11::)?list<.+>$" - "^std::__([A-Zabd-z0-9]|cx?[A-Za-wyz0-9]|cxx1?[A-Za-z02-9]|" - "cxx11[[:alnum:]])[[:alnum:]]*::list<.+>$", + "libc++ std::list synthetic children", "^std::__[[:alnum:]]+::list<.+>$", stl_deref_flags, true); AddCXXSynthetic( cpp_category_sp, @@ -1006,14 +1002,10 @@ static void LoadLibCxxFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { cpp_category_sp, lldb_private::formatters::ContainerSizeSummaryProvider, "libc++ std::list summary provider", "^std::__[[:alnum:]]+::forward_list<.+>$", stl_summary_flags, true); - AddCXXSummary( - cpp_category_sp, lldb_private::formatters::ContainerSizeSummaryProvider, - "libc++ std::list summary provider", - // A POSIX variant of: "^std::__(?!cxx11:)[[:alnum:]]+::list<.+>$" - // so that it does not clash with: "^std::(__cxx11::)?list<.+>$" - "^std::__([A-Zabd-z0-9]|cx?[A-Za-wyz0-9]|cxx1?[A-Za-z02-9]|" - "cxx11[[:alnum:]])[[:alnum:]]*::list<.+>$", - stl_summary_flags, true); + AddCXXSummary(cpp_category_sp, + lldb_private::formatters::ContainerSizeSummaryProvider, + "libc++ std::list summary provider", + "^std::__[[:alnum:]]+::list<.+>$", stl_summary_flags, true); AddCXXSummary(cpp_category_sp, lldb_private::formatters::ContainerSizeSummaryProvider, "libc++ std::map summary provider", _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
