Skip to content

Commit eec98be

Browse files
authored
[LLDB] Add formatters for MSVC STL std::tuple (#148548)
Adds synthetic children for MSVC STL's [`std::tuple`](https://github.com/microsoft/STL/blob/313964b78a8fd5a52e7965e13781f735bcce13c5/stl/inc/tuple). A `tuple` is a chain of base classes: ```cpp template <> class tuple<> {}; template <class _This, class... _Rest> class tuple<_This, _Rest...> : private tuple<_Rest...> { _Tuple_val<_This> _Myfirst; }; ``` So the provider walks the base classes to the desired one. The implementation makes it hard to detect if the empty tuple is from this STL. Fortunately, libstdc++'s synthetic children provider works for empty MSVC STL tuples as well. Towards #24834.
1 parent e6fcd59 commit eec98be

File tree

6 files changed

+136
-9
lines changed

6 files changed

+136
-9
lines changed

lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ add_lldb_library(lldbPluginCPlusPlusLanguage PLUGIN
3535
LibStdcppUniquePointer.cpp
3636
MsvcStl.cpp
3737
MsvcStlSmartPointer.cpp
38+
MsvcStlTuple.cpp
3839
MSVCUndecoratedNameParser.cpp
3940

4041
LINK_COMPONENTS

lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,10 +1507,6 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
15071507
"^std::((__debug::)?|(__cxx11::)?)list<.+>(( )?&)?$",
15081508
stl_summary_flags, true);
15091509

1510-
AddCXXSummary(cpp_category_sp, ContainerSizeSummaryProvider,
1511-
"libstdc++ std::tuple summary provider",
1512-
"^std::tuple<.*>(( )?&)?$", stl_summary_flags, true);
1513-
15141510
cpp_category_sp->AddTypeSummary(
15151511
"^std::((__debug::)?|(__cxx11::)?)forward_list<.+>(( )?&)?$",
15161512
eFormatterMatchRegex,
@@ -1540,11 +1536,6 @@ static void LoadLibStdcppFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
15401536
lldb_private::formatters::LibStdcppUniquePtrSyntheticFrontEndCreator,
15411537
"std::unique_ptr synthetic children", "^std::unique_ptr<.+>(( )?&)?$",
15421538
stl_synth_flags, true);
1543-
AddCXXSynthetic(
1544-
cpp_category_sp,
1545-
lldb_private::formatters::LibStdcppTupleSyntheticFrontEndCreator,
1546-
"std::tuple synthetic children", "^std::tuple<.*>(( )?&)?$",
1547-
stl_synth_flags, true);
15481539

15491540
static constexpr const char *const libstdcpp_std_coroutine_handle_regex =
15501541
"^std::coroutine_handle<.+>(( )?&)?$";
@@ -1613,6 +1604,17 @@ static bool GenericUniquePtrSummaryProvider(ValueObject &valobj, Stream &stream,
16131604
return LibStdcppUniquePointerSummaryProvider(valobj, stream, options);
16141605
}
16151606

1607+
static SyntheticChildrenFrontEnd *
1608+
GenericTupleSyntheticFrontEndCreator(CXXSyntheticChildren *children,
1609+
lldb::ValueObjectSP valobj_sp) {
1610+
if (!valobj_sp)
1611+
return nullptr;
1612+
1613+
if (IsMsvcStlTuple(*valobj_sp))
1614+
return MsvcStlTupleSyntheticFrontEndCreator(children, valobj_sp);
1615+
return LibStdcppTupleSyntheticFrontEndCreator(children, valobj_sp);
1616+
}
1617+
16161618
/// Load formatters that are formatting types from more than one STL
16171619
static void LoadCommonStlFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
16181620
if (!cpp_category_sp)
@@ -1668,6 +1670,9 @@ static void LoadCommonStlFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
16681670
AddCXXSynthetic(cpp_category_sp, GenericUniquePtrSyntheticFrontEndCreator,
16691671
"std::unique_ptr synthetic children",
16701672
"^std::unique_ptr<.+>(( )?&)?$", stl_synth_flags, true);
1673+
AddCXXSynthetic(cpp_category_sp, GenericTupleSyntheticFrontEndCreator,
1674+
"std::tuple synthetic children", "^std::tuple<.*>(( )?&)?$",
1675+
stl_synth_flags, true);
16711676

16721677
AddCXXSummary(cpp_category_sp, GenericSmartPointerSummaryProvider,
16731678
"MSVC STL/libstdc++ std::shared_ptr summary provider",
@@ -1678,6 +1683,9 @@ static void LoadCommonStlFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {
16781683
AddCXXSummary(cpp_category_sp, GenericUniquePtrSummaryProvider,
16791684
"MSVC STL/libstdc++ std::unique_ptr summary provider",
16801685
"^std::unique_ptr<.+>(( )?&)?$", stl_summary_flags, true);
1686+
AddCXXSummary(cpp_category_sp, ContainerSizeSummaryProvider,
1687+
"MSVC STL/libstdc++ std::tuple summary provider",
1688+
"^std::tuple<.*>(( )?&)?$", stl_summary_flags, true);
16811689
}
16821690

16831691
static void LoadMsvcStlFormatters(lldb::TypeCategoryImplSP cpp_category_sp) {

lldb/source/Plugins/Language/CPlusPlus/MsvcStl.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ bool MsvcStlUniquePtrSummaryProvider(ValueObject &valobj, Stream &stream,
4545
lldb_private::SyntheticChildrenFrontEnd *
4646
MsvcStlUniquePtrSyntheticFrontEndCreator(lldb::ValueObjectSP valobj_sp);
4747

48+
// MSVC STL std::tuple<>
49+
bool IsMsvcStlTuple(ValueObject &valobj);
50+
SyntheticChildrenFrontEnd *
51+
MsvcStlTupleSyntheticFrontEndCreator(CXXSyntheticChildren *,
52+
lldb::ValueObjectSP valobj_sp);
53+
4854
} // namespace formatters
4955
} // namespace lldb_private
5056

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
//===-- MsvcStlTuple.cpp --------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#include "MsvcStl.h"
10+
#include "lldb/DataFormatters/FormattersHelpers.h"
11+
12+
using namespace lldb;
13+
using namespace lldb_private;
14+
15+
namespace {
16+
17+
class TupleFrontEnd : public SyntheticChildrenFrontEnd {
18+
public:
19+
TupleFrontEnd(ValueObject &valobj) : SyntheticChildrenFrontEnd(valobj) {
20+
Update();
21+
}
22+
23+
llvm::Expected<size_t> GetIndexOfChildWithName(ConstString name) override {
24+
auto optional_idx = formatters::ExtractIndexFromString(name.GetCString());
25+
if (!optional_idx) {
26+
return llvm::createStringError("Type has no child named '%s'",
27+
name.AsCString());
28+
}
29+
return *optional_idx;
30+
}
31+
32+
lldb::ChildCacheState Update() override;
33+
llvm::Expected<uint32_t> CalculateNumChildren() override {
34+
return m_elements.size();
35+
}
36+
ValueObjectSP GetChildAtIndex(uint32_t idx) override;
37+
38+
private:
39+
// The lifetime of a ValueObject and all its derivative ValueObjects
40+
// (children, clones, etc.) is managed by a ClusterManager. These
41+
// objects are only destroyed when every shared pointer to any of them
42+
// is destroyed, so we must not store a shared pointer to any ValueObject
43+
// derived from our backend ValueObject (since we're in the same cluster).
44+
std::vector<ValueObject *> m_elements;
45+
};
46+
47+
} // namespace
48+
49+
lldb::ChildCacheState TupleFrontEnd::Update() {
50+
m_elements.clear();
51+
52+
size_t n_elements = 0;
53+
for (CompilerType ty = m_backend.GetCompilerType();
54+
ty.GetNumDirectBaseClasses() > 0;
55+
ty = ty.GetDirectBaseClassAtIndex(0, nullptr))
56+
++n_elements;
57+
58+
m_elements.assign(n_elements, nullptr);
59+
return lldb::ChildCacheState::eRefetch;
60+
}
61+
62+
ValueObjectSP TupleFrontEnd::GetChildAtIndex(uint32_t idx) {
63+
if (idx >= m_elements.size())
64+
return nullptr;
65+
if (m_elements[idx])
66+
return m_elements[idx]->GetSP();
67+
68+
CompilerType holder_ty = m_backend.GetCompilerType();
69+
for (uint32_t i = 0; i < idx; i++) {
70+
holder_ty = holder_ty.GetDirectBaseClassAtIndex(0, nullptr);
71+
if (!holder_ty.IsValid())
72+
return nullptr;
73+
}
74+
75+
ValueObjectSP holder_sp = m_backend.Cast(holder_ty);
76+
if (!holder_sp)
77+
return nullptr;
78+
holder_sp = holder_sp->GetChildMemberWithName("_Myfirst");
79+
80+
if (!holder_sp)
81+
return nullptr;
82+
83+
ValueObjectSP val_sp = holder_sp->GetChildMemberWithName("_Val");
84+
if (!val_sp)
85+
return nullptr;
86+
87+
m_elements[idx] =
88+
val_sp->Clone(ConstString(llvm::formatv("[{0}]", idx).str())).get();
89+
return m_elements[idx]->GetSP();
90+
}
91+
92+
bool formatters::IsMsvcStlTuple(ValueObject &valobj) {
93+
// This returns false for empty tuples, but the libstdc++ formatter handles
94+
// this correctly.
95+
if (auto valobj_sp = valobj.GetNonSyntheticValue())
96+
return valobj_sp->GetChildMemberWithName("_Myfirst") != nullptr;
97+
return false;
98+
}
99+
100+
SyntheticChildrenFrontEnd *formatters::MsvcStlTupleSyntheticFrontEndCreator(
101+
CXXSyntheticChildren *, lldb::ValueObjectSP valobj_sp) {
102+
if (valobj_sp)
103+
return new TupleFrontEnd(*valobj_sp);
104+
return nullptr;
105+
}

lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/tuple/TestDataFormatterStdTuple.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,9 @@ def test_libcxx(self):
7474
def test_libstdcxx(self):
7575
self.build(dictionary={"USE_LIBSTDCPP": 1})
7676
self.do_test()
77+
78+
@add_test_categories(["msvcstl"])
79+
def test_msvcstl(self):
80+
# No flags, because the "msvcstl" category checks that the MSVC STL is used by default.
81+
self.build()
82+
self.do_test()

lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/tuple/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ int main() {
66
std::tuple<int> one_elt{47};
77
std::tuple<std::string> string_elt{"foobar"};
88
std::tuple<int, long, std::string> three_elts{1, 47l, "foo"};
9+
auto *foo = &empty; // needed with MSVC STL to keep the variable
910
return 0; // break here
1011
}

0 commit comments

Comments
 (0)