Skip to content

Commit 3db059d

Browse files
switch to generic error message
1 parent 4699999 commit 3db059d

37 files changed

+70
-247
lines changed

lldb/include/lldb/DataFormatters/TypeSynthetic.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ 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(
122-
"'SyntheticChildrenFrontEnd::SyntheticValueProviderFrontEnd' cannot "
123-
"find index of child '%s'",
124-
name.AsCString());
121+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
125122
}
126123

127124
lldb::ChildCacheState Update() override {

lldb/include/lldb/Interpreter/ScriptInterpreter.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,7 @@ class ScriptInterpreter : public PluginInterface {
371371
virtual llvm::Expected<int>
372372
GetIndexOfChildWithName(const StructuredData::ObjectSP &implementor,
373373
const char *child_name) {
374-
return llvm::createStringError(
375-
"'PluginInterface::ScriptInterpreter' cannot find index of child '%s'",
376-
child_name);
374+
return llvm::createStringError("Type has no child named '%s'", child_name);
377375
}
378376

379377
virtual bool

lldb/source/DataFormatters/TypeSynthetic.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ TypeFilterImpl::FrontEnd::GetIndexOfChildWithName(ConstString name) {
6767
}
6868
}
6969
}
70-
return llvm::createStringError(
71-
"'SyntheticChildrenFrontEnd::FrontEnd' cannot find index of child '%s'",
72-
name.AsCString());
70+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
7371
}
7472

7573
std::string TypeFilterImpl::GetDescription() {
@@ -223,9 +221,7 @@ bool ScriptedSyntheticChildren::FrontEnd::MightHaveChildren() {
223221
llvm::Expected<size_t>
224222
ScriptedSyntheticChildren::FrontEnd::GetIndexOfChildWithName(ConstString name) {
225223
if (!m_wrapper_sp || m_interpreter == nullptr)
226-
return llvm::createStringError(
227-
"'ScriptedSyntheticChildren::FrontEnd' cannot find index of child '%s'",
228-
name.AsCString());
224+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
229225
return m_interpreter->GetIndexOfChildWithName(m_wrapper_sp,
230226
name.GetCString());
231227
}

lldb/source/DataFormatters/VectorType.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,7 @@ 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(
278-
"'SyntheticChildrenFrontEnd::VectorTypeSyntheticFrontEnd' cannot "
279-
"find index of child '%s'. (idx='" PRIu32 "')",
280-
name.AsCString(), idx);
277+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
281278
return idx;
282279
}
283280

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,7 @@ 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("'BlockPointerSyntheticFrontEnd' cannot "
150-
"find index of child '%s'",
151-
name.AsCString());
149+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
152150

153151
const bool omit_empty_base_classes = false;
154152
return m_block_struct_type.GetIndexOfChildWithName(name.AsCString(),

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,7 @@ llvm::Expected<size_t>
203203
StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
204204
ConstString name) {
205205
if (!m_resume_ptr_sp || !m_destroy_ptr_sp)
206-
return llvm::createStringError(
207-
"'StdlibCoroutineHandleSyntheticFrontEnd' "
208-
"cannot find index of child '%s'. (m_resume_ptr_sp='%p', "
209-
"m_destroy_ptr_sp='%p')",
210-
name.AsCString(), m_resume_ptr_sp.get(), m_destroy_ptr_sp.get());
206+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
211207

212208
if (name == ConstString("resume"))
213209
return 0;
@@ -216,9 +212,7 @@ StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
216212
if (name == ConstString("promise_ptr") && m_promise_ptr_sp)
217213
return 2;
218214

219-
return llvm::createStringError("'StdlibCoroutineHandleSyntheticFrontEnd' "
220-
"cannot find index of child '%s'",
221-
name.AsCString());
215+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
222216
}
223217

224218
SyntheticChildrenFrontEnd *

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ class GenericBitsetFrontEnd : public SyntheticChildrenFrontEnd {
3030

3131
llvm::Expected<size_t> GetIndexOfChildWithName(ConstString name) override {
3232
size_t idx = formatters::ExtractIndexFromString(name.GetCString());
33-
if (idx == UINT32_MAX) {
34-
return llvm::createStringError("'GenericBitsetFrontEnd' cannot find "
35-
"index of child '%s'",
36-
name.AsCString());
37-
}
33+
if (idx == UINT32_MAX)
34+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
3835
return idx;
3936
}
4037

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,8 @@ class GenericOptionalFrontend : public SyntheticChildrenFrontEnd {
4040
if (name == "$$dereference$$")
4141
return 0;
4242
size_t idx = formatters::ExtractIndexFromString(name.GetCString());
43-
if (idx == UINT32_MAX) {
44-
return llvm::createStringError("'GenericOptionalFrontend' cannot find "
45-
"index of child '%s'",
46-
name.AsCString());
47-
}
43+
if (idx == UINT32_MAX)
44+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
4845
return idx;
4946
}
5047

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

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

324322
lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
@@ -419,10 +417,7 @@ lldb_private::formatters::LibcxxUniquePtrSyntheticFrontEnd::
419417
return 1;
420418
if (name == "$$dereference$$")
421419
return 2;
422-
return llvm::createStringError(
423-
"'ScriptedSyntheticChildren::LibcxxUniquePtrSyntheticFrontEnd' cannot "
424-
"find index of child '%s'",
425-
name.AsCString());
420+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
426421
}
427422

428423
bool lldb_private::formatters::LibcxxContainerSummaryProvider(

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@ lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
135135
GetIndexOfChildWithName(ConstString name) {
136136
if (name == "Value")
137137
return 0;
138-
return llvm::createStringError("'LibcxxStdAtomicSyntheticFrontEnd' cannot "
139-
"find index of child '%s'",
140-
name.AsCString());
138+
return llvm::createStringError("Type has no child named '%s'", name.AsCString());
141139
}
142140

143141
SyntheticChildrenFrontEnd *

0 commit comments

Comments
 (0)