Skip to content

Commit 86f52fa

Browse files
charles-zablitcharles-zablit
committed
address comments
1 parent 14b5250 commit 86f52fa

19 files changed

+64
-79
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,9 @@ 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(
150-
"'SyntheticChildrenFrontend::BlockPointerSyntheticFrontEnd' cannot "
151-
"find index of child '%s'",
152-
name.AsCString());
149+
return llvm::createStringError("'BlockPointerSyntheticFrontEnd' cannot "
150+
"find index of child '%s'",
151+
name.AsCString());
153152

154153
const bool omit_empty_base_classes = false;
155154
return m_block_struct_type.GetIndexOfChildWithName(name.AsCString(),
@@ -179,7 +178,7 @@ bool lldb_private::formatters::BlockPointerSummaryProvider(
179178
synthetic_children->GetIndexOfChildWithName(s_FuncPtr_name);
180179

181180
if (!index_or_err) {
182-
LLDB_LOG_ERROR(GetLog(LLDBLog::Types), index_or_err.takeError(), "{0}");
181+
LLDB_LOG_ERROR(GetLog(LLDBLog::DataFormatters), index_or_err.takeError(), "{0}");
183182
return false;
184183
}
185184

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
204204
ConstString name) {
205205
if (!m_resume_ptr_sp || !m_destroy_ptr_sp)
206206
return llvm::createStringError(
207-
"'SyntheticChildrenFrontend::StdlibCoroutineHandleSyntheticFrontEnd' "
207+
"'StdlibCoroutineHandleSyntheticFrontEnd' "
208208
"cannot find index of child '%s'. (m_resume_ptr_sp='%p', "
209209
"m_destroy_ptr_sp='%p')",
210210
name.AsCString(), m_resume_ptr_sp.get(), m_destroy_ptr_sp.get());
@@ -216,10 +216,9 @@ StdlibCoroutineHandleSyntheticFrontEnd::GetIndexOfChildWithName(
216216
if (name == ConstString("promise_ptr") && m_promise_ptr_sp)
217217
return 2;
218218

219-
return llvm::createStringError(
220-
"'SyntheticChildrenFrontend::StdlibCoroutineHandleSyntheticFrontEnd' "
221-
"cannot find index of child '%s'",
222-
name.AsCString());
219+
return llvm::createStringError("'StdlibCoroutineHandleSyntheticFrontEnd' "
220+
"cannot find index of child '%s'",
221+
name.AsCString());
223222
}
224223

225224
SyntheticChildrenFrontEnd *

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ 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(
35-
"'SyntheticChildrenFrontend::GenericBitsetFrontEnd' cannot find "
36-
"index of child '%s'",
37-
name.AsCString());
34+
return llvm::createStringError("'GenericBitsetFrontEnd' cannot find "
35+
"index of child '%s'",
36+
name.AsCString());
3837
}
3938
return idx;
4039
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ class GenericOptionalFrontend : public SyntheticChildrenFrontEnd {
4141
return 0;
4242
size_t idx = formatters::ExtractIndexFromString(name.GetCString());
4343
if (idx == UINT32_MAX) {
44-
return llvm::createStringError(
45-
"'SyntheticChildrenFrontend::GenericOptionalFrontend' cannot find "
46-
"index of child '%s'",
47-
name.AsCString());
44+
return llvm::createStringError("'GenericOptionalFrontend' cannot find "
45+
"index of child '%s'",
46+
name.AsCString());
4847
}
4948
return idx;
5049
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,9 @@ lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::
316316
return 0;
317317
if (name == "$$dereference$$")
318318
return 1;
319-
return llvm::createStringError(
320-
"'SyntheticChildrenFrontend::LibcxxSharedPtrSyntheticFrontEnd' cannot "
321-
"find index of child '%s'",
322-
name.AsCString());
319+
return llvm::createStringError("'LibcxxSharedPtrSyntheticFrontEnd' cannot "
320+
"find index of child '%s'",
321+
name.AsCString());
323322
}
324323

325324
lldb_private::formatters::LibcxxSharedPtrSyntheticFrontEnd::

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,9 @@ lldb_private::formatters::LibcxxStdAtomicSyntheticFrontEnd::
135135
GetIndexOfChildWithName(ConstString name) {
136136
if (name == "Value")
137137
return 0;
138-
return llvm::createStringError(
139-
"'SyntheticChildrenFrontend::LibcxxStdAtomicSyntheticFrontEnd' cannot "
140-
"find index of child '%s'",
141-
name.AsCString());
138+
return llvm::createStringError("'LibcxxStdAtomicSyntheticFrontEnd' cannot "
139+
"find index of child '%s'",
140+
name.AsCString());
142141
}
143142

144143
SyntheticChildrenFrontEnd *

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,15 @@ lldb_private::formatters::LibcxxInitializerListSyntheticFrontEnd::
105105
GetIndexOfChildWithName(ConstString name) {
106106
if (!m_start) {
107107
return llvm::createStringError(
108-
"'SyntheticChildrenFrontend::LibcxxInitializerListSyntheticFrontEnd' "
108+
"'LibcxxInitializerListSyntheticFrontEnd' "
109109
"cannot find index of child '%s': Invalid start pointer.",
110110
name.AsCString());
111111
}
112112
size_t idx = ExtractIndexFromString(name.GetCString());
113113
if (idx == UINT32_MAX) {
114-
return llvm::createStringError(
115-
"'SyntheticChildrenFrontend::LibcxxInitializerListSyntheticFrontEnd' "
116-
"cannot find index of child '%s'",
117-
name.AsCString());
114+
return llvm::createStringError("'LibcxxInitializerListSyntheticFrontEnd' "
115+
"cannot find index of child '%s'",
116+
name.AsCString());
118117
}
119118
return idx;
120119
}

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxList.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,9 @@ class AbstractListFrontEnd : public SyntheticChildrenFrontEnd {
109109
llvm::Expected<size_t> GetIndexOfChildWithName(ConstString name) override {
110110
size_t idx = ExtractIndexFromString(name.GetCString());
111111
if (idx == UINT32_MAX) {
112-
return llvm::createStringError(
113-
"'SyntheticChildrenFrontend::AbstractListFrontEnd' cannot find index "
114-
"of child '%s'",
115-
name.AsCString());
112+
return llvm::createStringError("'AbstractListFrontEnd' cannot find index "
113+
"of child '%s'",
114+
name.AsCString());
116115
}
117116
return idx;
118117
}

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxMap.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -397,10 +397,9 @@ llvm::Expected<size_t> lldb_private::formatters::LibcxxStdMapSyntheticFrontEnd::
397397
GetIndexOfChildWithName(ConstString name) {
398398
size_t idx = ExtractIndexFromString(name.GetCString());
399399
if (idx == UINT32_MAX) {
400-
return llvm::createStringError(
401-
"'SyntheticChildrenFrontend::LibcxxStdMapSyntheticFrontEnd' cannot "
402-
"find index of child '%s'",
403-
name.AsCString());
400+
return llvm::createStringError("'LibcxxStdMapSyntheticFrontEnd' cannot "
401+
"find index of child '%s'",
402+
name.AsCString());
404403
}
405404
return idx;
406405
}
@@ -500,7 +499,7 @@ lldb_private::formatters::LibCxxMapIteratorSyntheticFrontEnd::
500499
GetIndexOfChildWithName(ConstString name) {
501500
if (!m_pair_sp)
502501
return llvm::createStringError(
503-
"'SyntheticChildrenFrontend::LibCxxMapIteratorSyntheticFrontEnd' "
502+
"'LibCxxMapIteratorSyntheticFrontEnd' "
504503
"cannot find index of child '%s': Invalid underlying pair.",
505504
name.AsCString());
506505

‎lldb/source/Plugins/Language/CPlusPlus/LibCxxProxyArray.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,14 @@ lldb_private::formatters::LibcxxStdProxyArraySyntheticFrontEnd::
178178
GetIndexOfChildWithName(ConstString name) {
179179
if (!m_base)
180180
return llvm::createStringError(
181-
"'SyntheticChildrenFrontend::LibcxxStdProxyArraySyntheticFrontEnd' "
181+
"'LibcxxStdProxyArraySyntheticFrontEnd' "
182182
"cannot find index of child '%s': Invalid base pointer.",
183183
name.AsCString());
184184
size_t idx = ExtractIndexFromString(name.GetCString());
185185
if (idx == UINT32_MAX) {
186-
return llvm::createStringError(
187-
"'SyntheticChildrenFrontend::LibcxxStdProxyArraySyntheticFrontEnd' "
188-
"cannot find index of child '%s'",
189-
name.AsCString());
186+
return llvm::createStringError("'LibcxxStdProxyArraySyntheticFrontEnd' "
187+
"cannot find index of child '%s'",
188+
name.AsCString());
190189
}
191190
return idx;
192191
}

0 commit comments

Comments
 (0)