Skip to content

Commit 23545b8

Browse files
fixup! switch to generic error message
1 parent 3db059d commit 23545b8

35 files changed

+118
-59
lines changed

lldb/include/lldb/DataFormatters/TypeSynthetic.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ class SyntheticValueProviderFrontEnd : public SyntheticChildrenFrontEnd {
118118
lldb::ValueObjectSP GetChildAtIndex(uint32_t idx) override { return nullptr; }
119119

120120
llvm::Expected<size_t> GetIndexOfChildWithName(ConstString name) override {
121-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
121+
return llvm::createStringError("Type has no child named '%s'",
122+
name.AsCString());
122123
}
123124

124125
lldb::ChildCacheState Update() override {

lldb/source/DataFormatters/TypeSynthetic.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ TypeFilterImpl::FrontEnd::GetIndexOfChildWithName(ConstString name) {
6767
}
6868
}
6969
}
70-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
70+
return llvm::createStringError("Type has no child named '%s'",
71+
name.AsCString());
7172
}
7273

7374
std::string TypeFilterImpl::GetDescription() {
@@ -221,7 +222,8 @@ bool ScriptedSyntheticChildren::FrontEnd::MightHaveChildren() {
221222
llvm::Expected<size_t>
222223
ScriptedSyntheticChildren::FrontEnd::GetIndexOfChildWithName(ConstString name) {
223224
if (!m_wrapper_sp || m_interpreter == nullptr)
224-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
225+
return llvm::createStringError("Type has no child named '%s'",
226+
name.AsCString());
225227
return m_interpreter->GetIndexOfChildWithName(m_wrapper_sp,
226228
name.GetCString());
227229
}

lldb/source/DataFormatters/VectorType.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@ class VectorTypeSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
274274
uint32_t idx = ExtractIndexFromString(item_name);
275275
if (idx == UINT32_MAX ||
276276
(idx < UINT32_MAX && idx >= CalculateNumChildrenIgnoringErrors()))
277-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
277+
return llvm::createStringError("Type has no child named '%s'",
278+
name.AsCString());
278279
return idx;
279280
}
280281

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ class BlockPointerSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
146146

147147
llvm::Expected<size_t> GetIndexOfChildWithName(ConstString name) override {
148148
if (!m_block_struct_type.IsValid())
149-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
149+
return llvm::createStringError("Type has no child named '%s'",
150+
name.AsCString());
150151

151152
const bool omit_empty_base_classes = false;
152153
return m_block_struct_type.GetIndexOfChildWithName(name.AsCString(),

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ llvm::Expected<size_t>
203203
StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
204204
ConstString name) {
205205
if (!m_resume_ptr_sp || !m_destroy_ptr_sp)
206-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
206+
return llvm::createStringError("Type has no child named '%s'",
207+
name.AsCString());
207208

208209
if (name == ConstString("resume"))
209210
return 0;
@@ -212,7 +213,8 @@ StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
212213
if (name == ConstString("promise_ptr") && m_promise_ptr_sp)
213214
return 2;
214215

215-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
216+
return llvm::createStringError("Type has no child named '%s'",
217+
name.AsCString());
216218
}
217219

218220
SyntheticChildrenFrontEnd *

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ class GenericBitsetFrontEnd : public SyntheticChildrenFrontEnd {
3131
llvm::Expected<size_t> GetIndexOfChildWithName(ConstString name) override {
3232
size_t idx = formatters::ExtractIndexFromString(name.GetCString());
3333
if (idx == UINT32_MAX)
34-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
34+
return llvm::createStringError("Type has no child named '%s'",
35+
name.AsCString());
3536
return idx;
3637
}
3738

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ class GenericOptionalFrontend : public SyntheticChildrenFrontEnd {
4141
return 0;
4242
size_t idx = formatters::ExtractIndexFromString(name.GetCString());
4343
if (idx == UINT32_MAX)
44-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
44+
return llvm::createStringError("Type has no child named '%s'",
45+
name.AsCString());
4546
return idx;
4647
}
4748

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,8 @@ lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
316316
return 0;
317317
if (name == "$$dereference$$")
318318
return 1;
319-
return llvm::createStringError("Type has no child named '%s'",name.AsCString());
319+
return llvm::createStringError("Type has no child named '%s'",
320+
name.AsCString());
320321
}
321322

322323
lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
@@ -417,7 +418,8 @@ lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
417418
return 1;
418419
if (name == "$$dereference$$")
419420
return 2;
420-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
421+
return llvm::createStringError("Type has no child named '%s'",
422+
name.AsCString());
421423
}
422424

423425
bool lldb_private::formatters::LibcxxContainerSummaryProvider(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
135135
GetIndexOfChildWithName(ConstString name) {
136136
if (name == "Value")
137137
return 0;
138-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
138+
return llvm::createStringError("Type has no child named '%s'",
139+
name.AsCString());
139140
}
140141

141142
SyntheticChildrenFrontEnd *

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,13 @@ llvm::Expected<size_t>
104104
lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
105105
GetIndexOfChildWithName(ConstString name) {
106106
if (!m_start) {
107-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
107+
return llvm::createStringError("Type has no child named '%s'",
108+
name.AsCString());
108109
}
109110
size_t idx = ExtractIndexFromString(name.GetCString());
110111
if (idx == UINT32_MAX) {
111-
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
112+
return llvm::createStringError("Type has no child named '%s'",
113+
name.AsCString());
112114
}
113115
return idx;
114116
}

0 commit comments

Comments
 (0)