https://github.com/charles-zablit updated
https://github.com/llvm/llvm-project/pull/141790
>From 788cabe234336be7168996805f40da7f26fdbec9 Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zab...@apple.com>
Date: Wed, 28 May 2025 16:17:34 +0100
Subject: [PATCH 1/3] add explicit default initialization to DemangledNameInfo
to remove warning
---
lldb/include/lldb/Core/DemangledNameInfo.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lldb/include/lldb/Core/DemangledNameInfo.h
b/lldb/include/lldb/Core/DemangledNameInfo.h
index ab9bb3e211b66..e26adc7035a56 100644
--- a/lldb/include/lldb/Core/DemangledNameInfo.h
+++ b/lldb/include/lldb/Core/DemangledNameInfo.h
@@ -62,12 +62,12 @@ struct DemangledNameInfo {
/// Indicates the [start, end) of the function's prefix. This is a
/// catch-all range for anything that is not tracked by the rest of
/// the pairs.
- std::pair<size_t, size_t> PrefixRange;
+ std::pair<size_t, size_t> PrefixRange{};
/// Indicates the [start, end) of the function's suffix. This is a
/// catch-all range for anything that is not tracked by the rest of
/// the pairs.
- std::pair<size_t, size_t> SuffixRange;
+ std::pair<size_t, size_t> SuffixRange{};
/// Returns \c true if this object holds a valid basename range.
bool hasBasename() const {
>From 10696e6d502eec558c1b4bc58586207e0d1f402c Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zab...@apple.com>
Date: Wed, 28 May 2025 18:18:59 +0100
Subject: [PATCH 2/3] Revert "add explicit default initialization to
DemangledNameInfo to remove warning"
This reverts commit 788cabe234336be7168996805f40da7f26fdbec9.
---
lldb/include/lldb/Core/DemangledNameInfo.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lldb/include/lldb/Core/DemangledNameInfo.h
b/lldb/include/lldb/Core/DemangledNameInfo.h
index e26adc7035a56..ab9bb3e211b66 100644
--- a/lldb/include/lldb/Core/DemangledNameInfo.h
+++ b/lldb/include/lldb/Core/DemangledNameInfo.h
@@ -62,12 +62,12 @@ struct DemangledNameInfo {
/// Indicates the [start, end) of the function's prefix. This is a
/// catch-all range for anything that is not tracked by the rest of
/// the pairs.
- std::pair<size_t, size_t> PrefixRange{};
+ std::pair<size_t, size_t> PrefixRange;
/// Indicates the [start, end) of the function's suffix. This is a
/// catch-all range for anything that is not tracked by the rest of
/// the pairs.
- std::pair<size_t, size_t> SuffixRange{};
+ std::pair<size_t, size_t> SuffixRange;
/// Returns \c true if this object holds a valid basename range.
bool hasBasename() const {
>From 84df64a3775ee4e0c0978b3f11c6e3792977f843 Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zab...@apple.com>
Date: Wed, 28 May 2025 18:26:28 +0100
Subject: [PATCH 3/3] add missing initializer in MangledTest.cpp
---
lldb/unittests/Core/MangledTest.cpp | 42 +++++++++++++++--------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/lldb/unittests/Core/MangledTest.cpp
b/lldb/unittests/Core/MangledTest.cpp
index 44651eb94c23b..ff8ae1b2f3a47 100644
--- a/lldb/unittests/Core/MangledTest.cpp
+++ b/lldb/unittests/Core/MangledTest.cpp
@@ -414,110 +414,112 @@ DemanglingPartsTestCase g_demangling_parts_test_cases[]
= {
// clang-format off
{
"_ZNVKO3BarIN2ns3QuxIiEEE1CIPFi3FooIS_IiES6_EEE6methodIS6_EENS5_IT_SC_E5InnerIiEESD_SD_",
{ /*.BasenameRange=*/{92, 98}, /*.ScopeRange=*/{36, 92},
/*.ArgumentsRange=*/{ 108, 158 },
- /*.QualifiersRange=*/{158, 176} },
+ /*.QualifiersRange=*/{158, 176}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"method",
/*.scope=*/"Bar<ns::Qux<int>>::C<int (*)(Foo<Bar<int>, Bar<int>>)>::",
/*.qualifiers=*/" const volatile &&"
},
{ "_Z7getFuncIfEPFiiiET_",
- { /*.BasenameRange=*/{6, 13}, /*.ScopeRange=*/{6, 6},
/*.ArgumentsRange=*/{ 20, 27 }, /*.QualifiersRange=*/{38, 38} },
+ { /*.BasenameRange=*/{6, 13}, /*.ScopeRange=*/{6, 6},
/*.ArgumentsRange=*/{ 20, 27 },
+ /*.QualifiersRange=*/{38, 38}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"getFunc",
/*.scope=*/"",
/*.qualifiers=*/""
},
{ "_ZN1f1b1c1gEv",
{ /*.BasenameRange=*/{9, 10}, /*.ScopeRange=*/{0, 9},
/*.ArgumentsRange=*/{ 10, 12 },
- /*.QualifiersRange=*/{12, 12} },
+ /*.QualifiersRange=*/{12, 12}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"g",
/*.scope=*/"f::b::c::",
/*.qualifiers=*/""
},
{ "_ZN5test73fD1IiEEDTcmtlNS_1DEL_ZNS_1bEEEcvT__EES2_",
{ /*.BasenameRange=*/{45, 48}, /*.ScopeRange=*/{38, 45},
/*.ArgumentsRange=*/{ 53, 58 },
- /*.QualifiersRange=*/{58, 58} },
+ /*.QualifiersRange=*/{58, 58}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fD1",
/*.scope=*/"test7::",
/*.qualifiers=*/""
},
{ "_ZN5test73fD1IiEEDTcmtlNS_1DEL_ZNS_1bINDT1cE1dEEEEEcvT__EES2_",
{ /*.BasenameRange=*/{61, 64}, /*.ScopeRange=*/{54, 61},
/*.ArgumentsRange=*/{ 69, 79 },
- /*.QualifiersRange=*/{79, 79} },
+ /*.QualifiersRange=*/{79, 79}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fD1",
/*.scope=*/"test7::",
/*.qualifiers=*/""
},
{
"_ZN5test7INDT1cE1dINDT1cE1dEEEE3fD1INDT1cE1dINDT1cE1dEEEEEDTcmtlNS_1DEL_ZNS_1bINDT1cE1dEEEEEcvT__EES2_",
{ /*.BasenameRange=*/{120, 123}, /*.ScopeRange=*/{81, 120},
/*.ArgumentsRange=*/{ 155, 168 },
- /*.QualifiersRange=*/{168, 168} },
+ /*.QualifiersRange=*/{168, 168}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fD1",
/*.scope=*/"test7<decltype(c)::d<decltype(c)::d>>::",
/*.qualifiers=*/""
},
{
"_ZN8nlohmann16json_abi_v3_11_310basic_jsonINSt3__13mapENS2_6vectorENS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEbxydS8_NS0_14adl_serializerENS4_IhNS8_IhEEEEvE5parseIRA29_KcEESE_OT_NS2_8functionIFbiNS0_6detail13parse_event_tERSE_EEEbb",
{ /*.BasenameRange=*/{687, 692}, /*.ScopeRange=*/{343, 687},
/*.ArgumentsRange=*/{ 713, 1174 },
- /*.QualifiersRange=*/{1174, 1174} },
+ /*.QualifiersRange=*/{1174, 1174}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"parse",
/*.scope=*/"nlohmann::json_abi_v3_11_3::basic_json<std::__1::map,
std::__1::vector, std::__1::basic_string<char, std::__1::char_traits<char>,
std::__1::allocator<char>>, bool, long long, unsigned long long, double,
std::__1::allocator, nlohmann::json_abi_v3_11_3::adl_serializer,
std::__1::vector<unsigned char, std::__1::allocator<unsigned char>>, void>::",
/*.qualifiers=*/""
},
{
"_ZN8nlohmann16json_abi_v3_11_310basic_jsonINSt3__13mapENS2_6vectorENS2_12basic_stringIcNS2_11char_traitsIcEENS2_9allocatorIcEEEEbxydS8_NS0_14adl_serializerENS4_IhNS8_IhEEEEvEC1EDn",
{ /*.BasenameRange=*/{344, 354}, /*.ScopeRange=*/{0, 344},
/*.ArgumentsRange=*/{ 354, 370 },
- /*.QualifiersRange=*/{370, 370} },
+ /*.QualifiersRange=*/{370, 370}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"basic_json",
/*.scope=*/"nlohmann::json_abi_v3_11_3::basic_json<std::__1::map,
std::__1::vector, std::__1::basic_string<char, std::__1::char_traits<char>,
std::__1::allocator<char>>, bool, long long, unsigned long long, double,
std::__1::allocator, nlohmann::json_abi_v3_11_3::adl_serializer,
std::__1::vector<unsigned char, std::__1::allocator<unsigned char>>, void>::",
/*.qualifiers=*/""
},
{ "_Z3fppIiEPFPFvvEiEf",
- { /*.BasenameRange=*/{10, 13}, /*.ScopeRange=*/{10, 10},
/*.ArgumentsRange=*/{ 18, 25 }, /*.QualifiersRange=*/{34,34} },
+ { /*.BasenameRange=*/{10, 13}, /*.ScopeRange=*/{10, 10},
/*.ArgumentsRange=*/{ 18, 25 },
+ /*.QualifiersRange=*/{34,34}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fpp",
/*.scope=*/"",
/*.qualifiers=*/""
},
{ "_Z3fppIiEPFPFvvEN2ns3FooIiEEEf",
{ /*.BasenameRange=*/{10, 13}, /*.ScopeRange=*/{10, 10},
/*.ArgumentsRange=*/{ 18, 25 },
- /*.QualifiersRange=*/{43, 43} },
+ /*.QualifiersRange=*/{43, 43}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fpp",
/*.scope=*/"",
/*.qualifiers=*/""
},
{ "_Z3fppIiEPFPFvPFN2ns3FooIiEENS2_3BarIfE3QuxEEEPFS2_S2_EEf",
{ /*.BasenameRange=*/{10, 13}, /*.ScopeRange=*/{10, 10},
/*.ArgumentsRange=*/{ 18, 25 },
- /*.QualifiersRange=*/{108, 108} },
+ /*.QualifiersRange=*/{108, 108}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fpp",
/*.scope=*/"",
/*.qualifiers=*/""
},
{ "_ZN2ns8HasFuncsINS_3FooINS1_IiE3BarIfE3QuxEEEE3fppIiEEPFPFvvEiEf",
{ /*.BasenameRange=*/{64, 67}, /*.ScopeRange=*/{10, 64},
/*.ArgumentsRange=*/{ 72, 79 },
- /*.QualifiersRange=*/{88, 88} },
+ /*.QualifiersRange=*/{88, 88}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fpp",
/*.scope=*/"ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
/*.qualifiers=*/""
},
{ "_ZN2ns8HasFuncsINS_3FooINS1_IiE3BarIfE3QuxEEEE3fppIiEEPFPFvvES2_Ef",
{ /*.BasenameRange=*/{64, 67}, /*.ScopeRange=*/{10, 64},
/*.ArgumentsRange=*/{ 72, 79 },
- /*.QualifiersRange=*/{97, 97} },
+ /*.QualifiersRange=*/{97, 97}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fpp",
/*.scope=*/"ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
/*.qualifiers=*/"",
},
{
"_ZN2ns8HasFuncsINS_3FooINS1_IiE3BarIfE3QuxEEEE3fppIiEEPFPFvPFS2_S5_EEPFS2_S2_EEf",
{ /*.BasenameRange=*/{64, 67}, /*.ScopeRange=*/{10, 64},
/*.ArgumentsRange=*/{ 72, 79 },
- /*.QualifiersRange=*/{162, 162} },
+ /*.QualifiersRange=*/{162, 162}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"fpp",
/*.scope=*/"ns::HasFuncs<ns::Foo<ns::Foo<int>::Bar<float>::Qux>>::",
/*.qualifiers=*/"",
},
{ "_ZNKO2ns3ns23Bar3fooIiEEPFPFNS0_3FooIiEEiENS3_IfEEEi",
{ /*.BasenameRange=*/{37, 40}, /*.ScopeRange=*/{23, 37},
/*.ArgumentsRange=*/{ 45, 50 },
- /*.QualifiersRange=*/{78, 87} },
+ /*.QualifiersRange=*/{78, 87}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"foo",
/*.scope=*/"ns::ns2::Bar::",
/*.qualifiers=*/" const &&",
},
{ "_ZTV11ImageLoader",
{ /*.BasenameRange=*/{0, 0}, /*.ScopeRange=*/{0, 0},
/*.ArgumentsRange=*/{ 0, 0 },
- /*.QualifiersRange=*/{0, 0} },
+ /*.QualifiersRange=*/{0, 0}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"",
/*.scope=*/"",
/*.qualifiers=*/"",
@@ -525,28 +527,28 @@ DemanglingPartsTestCase g_demangling_parts_test_cases[] =
{
},
{
"___ZNK5dyld313MachOAnalyzer18forEachInitializerER11DiagnosticsRKNS0_15VMAddrConverterEU13block_pointerFvjEPKv_block_invoke.204",
{ /*.BasenameRange=*/{55, 73}, /*.ScopeRange=*/{33, 55},
/*.ArgumentsRange=*/{ 73, 181 },
- /*.QualifiersRange=*/{181, 187} },
+ /*.QualifiersRange=*/{181, 187}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"forEachInitializer",
/*.scope=*/"dyld3::MachOAnalyzer::",
/*.qualifiers=*/" const",
},
{ "_ZZN5dyld45startEPNS_10KernelArgsEPvS2_ENK3$_1clEv",
{ /*.BasenameRange=*/{53, 63}, /*.ScopeRange=*/{0, 53},
/*.ArgumentsRange=*/{ 63, 65 },
- /*.QualifiersRange=*/{65, 71} },
+ /*.QualifiersRange=*/{65, 71}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"operator()",
/*.scope=*/"dyld4::start(dyld4::KernelArgs*, void*, void*)::$_1::",
/*.qualifiers=*/" const",
},
{
"_ZZNK5dyld46Loader38runInitializersBottomUpPlusUpwardLinksERNS_12RuntimeStateEENK3$_0clEv",
{ /*.BasenameRange=*/{88, 98}, /*.ScopeRange=*/{0, 88},
/*.ArgumentsRange=*/{ 98, 100 },
- /*.QualifiersRange=*/{100, 106} },
+ /*.QualifiersRange=*/{100, 106}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"operator()",
/*.scope=*/"dyld4::Loader::runInitializersBottomUpPlusUpwardLinks(dyld4::RuntimeState&)
const::$_0::",
/*.qualifiers=*/" const",
},
{
"_ZZNK5dyld46Loader38runInitializersBottomUpPlusUpwardLinksERNS_12RuntimeStateEENK3$_0clEv.cold",
{ /*.BasenameRange=*/{88, 98}, /*.ScopeRange=*/{0, 88},
/*.ArgumentsRange=*/{ 98, 100 },
- /*.QualifiersRange=*/{100, 106} },
+ /*.QualifiersRange=*/{100, 106}, /*.PrefixRange=*/{0, 0},
/*.SuffixRange=*/{0, 0} },
/*.basename=*/"operator()",
/*.scope=*/"dyld4::Loader::runInitializersBottomUpPlusUpwardLinks(dyld4::RuntimeState&)
const::$_0::",
/*.qualifiers=*/" const",
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
