Author: Sergei Druzhkov Date: 2026-06-30T22:59:17+03:00 New Revision: ab99d704c2ae98d3ff1341341831efd52d9818e0
URL: https://github.com/llvm/llvm-project/commit/ab99d704c2ae98d3ff1341341831efd52d9818e0 DIFF: https://github.com/llvm/llvm-project/commit/ab99d704c2ae98d3ff1341341831efd52d9818e0.diff LOG: [lldb] Add std::source_location summary provider (#203185) Added simple summary provider for `std::source_location` from C++20. Added: lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/Makefile lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/main.cpp Modified: lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp lldb/source/Plugins/Language/CPlusPlus/LibCxx.h lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h Removed: ################################################################################ diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp index 74a5a414de67b..8225c2141a84a 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp @@ -1302,6 +1302,12 @@ static void LoadLibCxxFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { "libc++ std::strong_ordering summary provider", "^std::__[[:alnum:]]+::strong_ordering$", eTypeOptionHideChildren | eTypeOptionHideValue, true); + + AddCXXSummary(cpp_category_sp, + lldb_private::formatters::LibcxxSourceLocationSummaryProvider, + "libc++ std::source_location summary provider", + "^std::__[[:alnum:]]+::source_location$", stl_summary_flags, + true); } static void RegisterStdStringSummaryProvider( @@ -1522,6 +1528,12 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) { lldb_private::formatters::StdlibCoroutineHandleSummaryProvider, "libstdc++ std::coroutine_handle summary provider", libstdcpp_std_coroutine_handle_regex, stl_summary_flags, true); + + AddCXXSummary( + cpp_category_sp, + lldb_private::formatters::LibStdcppSourceLocationSummaryProvider, + "libstdc++ std::source_location summary provider", "std::source_location", + stl_summary_flags); } static lldb_private::SyntheticChildrenFrontEnd * diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp index d70769f3a0e3e..bf856cd4c9e42 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp @@ -982,3 +982,36 @@ bool lldb_private::formatters::LibcxxChronoYearMonthDaySummaryProvider( return true; } + +bool lldb_private::formatters::LibcxxSourceLocationSummaryProvider( + ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) { + ValueObjectSP ptr_sp = valobj.GetChildMemberWithName("__ptr_"); + if (!ptr_sp) + return false; + + ValueObjectSP file_sp = ptr_sp->GetChildMemberWithName("_M_file_name"); + ValueObjectSP function_sp = + ptr_sp->GetChildMemberWithName("_M_function_name"); + ValueObjectSP line_sp = ptr_sp->GetChildMemberWithName("_M_line"); + ValueObjectSP column_sp = ptr_sp->GetChildMemberWithName("_M_column"); + + if (!file_sp || !function_sp || !line_sp || !column_sp) + return false; + + bool success = false; + uint64_t line = line_sp->GetValueAsUnsigned(0, &success); + if (!success) + return false; + + uint64_t column = column_sp->GetValueAsUnsigned(0, &success); + if (!success) + return false; + + const char *file = file_sp->GetSummaryAsCString(); + stream.Printf("%s:%lu:%lu", file ? file : "<unknown>", line, column); + + if (const char *function = function_sp->GetSummaryAsCString()) + stream.Printf(" (%s)", function); + + return true; +} diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h index d9b3f3a694afc..b2cbff8890861 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h +++ b/lldb/source/Plugins/Language/CPlusPlus/LibCxx.h @@ -103,6 +103,10 @@ bool LibcxxStrongOrderingSummaryProvider( ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options); // libc++ std::strong_ordering +bool LibcxxSourceLocationSummaryProvider( + ValueObject &valobj, Stream &stream, + const TypeSummaryOptions &options); // libc++ std::source_location + SyntheticChildrenFrontEnd * LibcxxVectorBoolSyntheticFrontEndCreator(CXXSyntheticChildren *, lldb::ValueObjectSP); diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp index 83bea8bb533b6..84eb2a2a21ec1 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.cpp @@ -576,3 +576,36 @@ bool lldb_private::formatters::LibStdcppStrongOrderingSummaryProvider( } return true; } + +bool lldb_private::formatters::LibStdcppSourceLocationSummaryProvider( + ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options) { + ValueObjectSP impl_sp = valobj.GetChildMemberWithName("_M_impl"); + if (!impl_sp) + return false; + + ValueObjectSP file_sp = impl_sp->GetChildMemberWithName("_M_file_name"); + ValueObjectSP function_sp = + impl_sp->GetChildMemberWithName("_M_function_name"); + ValueObjectSP line_sp = impl_sp->GetChildMemberWithName("_M_line"); + ValueObjectSP column_sp = impl_sp->GetChildMemberWithName("_M_column"); + + if (!file_sp || !function_sp || !line_sp || !column_sp) + return false; + + bool success = false; + uint64_t line = line_sp->GetValueAsUnsigned(0, &success); + if (!success) + return false; + + uint64_t column = column_sp->GetValueAsUnsigned(0, &success); + if (!success) + return false; + + const char *file = file_sp->GetSummaryAsCString(); + stream.Printf("%s:%lu:%lu", file ? file : "<unknown>", line, column); + + if (const char *function = function_sp->GetSummaryAsCString()) + stream.Printf(" (%s)", function); + + return true; +} diff --git a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h index bc67885787bc2..7da72177e0bc7 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h +++ b/lldb/source/Plugins/Language/CPlusPlus/LibStdcpp.h @@ -56,6 +56,10 @@ bool LibStdcppStrongOrderingSummaryProvider( ValueObject &valobj, Stream &stream, const TypeSummaryOptions &options); // libstdc++ std::strong_ordering +bool LibStdcppSourceLocationSummaryProvider( + ValueObject &valobj, Stream &stream, + const TypeSummaryOptions &options); // libstdc++ std::source_location + SyntheticChildrenFrontEnd * LibstdcppMapIteratorSyntheticFrontEndCreator(CXXSyntheticChildren *, lldb::ValueObjectSP); diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/Makefile b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/Makefile new file mode 100644 index 0000000000000..4f79c0a900c3a --- /dev/null +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/Makefile @@ -0,0 +1,4 @@ +CXX_SOURCES := main.cpp +CXXFLAGS_EXTRAS := -std=c++20 + +include Makefile.rules diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py new file mode 100644 index 0000000000000..4dd28c816a10c --- /dev/null +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py @@ -0,0 +1,53 @@ +""" +Test std::source_location summary. +""" + +import lldb +from lldbsuite.test.decorators import * +from lldbsuite.test.lldbtest import * +from lldbsuite.test import lldbutil + + +class StdSourceLocationTestCase(TestBase): + SHARED_BUILD_TESTCASE = False + TEST_WITH_PDB_DEBUG_INFO = True + + def do_test(self): + lldbutil.run_to_source_breakpoint( + self, "// break here", lldb.SBFileSpec("main.cpp") + ) + + frame = self.frame() + + loc_main = frame.FindVariable("loc_main") + self.assertTrue(loc_main.GetError().Success()) + self.assertRegex(loc_main.summary, r"main\.cpp\":6:\d+ \(\"int main\(\)\"\)") + + loc_foo = frame.FindVariable("loc_foo") + self.assertTrue(loc_foo.GetError().Success()) + self.assertRegex( + loc_foo.summary, r"main\.cpp\":3:\d+ \(\"std::source_location foo\(\)\"\)" + ) + + loc_empty = frame.FindVariable("loc_empty") + self.assertTrue(loc_empty.GetError().Success()) + self.assertIsNone(loc_empty.summary) + + self.expect( + "frame variable", + substrs=[ + f"loc_main = {loc_main.summary}", + f"loc_foo = {loc_foo.summary}", + "loc_empty = ", + ], + ) + + @add_test_categories(["libc++"]) + def test_libcxx(self): + self.build(dictionary={"USE_LIBCPP": 1}) + self.do_test() + + @add_test_categories(["libstdcxx"]) + def test_libstdcxx(self): + self.build(dictionary={"USE_LIBSTDCPP": 1}) + self.do_test() diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/main.cpp new file mode 100644 index 0000000000000..2927d9cbe2c77 --- /dev/null +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/main.cpp @@ -0,0 +1,10 @@ +#include <source_location> + +std::source_location foo() { return std::source_location::current(); } + +int main() { + auto loc_main = std::source_location::current(); + auto loc_foo = foo(); + auto loc_empty = std::source_location{}; + return 0; // break here +} _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
