Skip to content

[lldb] switch to CalculateNumChildren where possible #142607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[lldb] switch to CalculateNumChildren where possible #142607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lldb/source/DataFormatters/VectorType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,13 @@ class VectorTypeSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down
8 changes: 7 additions & 1 deletion lldb/source/Plugins/Language/CPlusPlus/LibCxxVector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,13 @@ lldb_private::formatters::LibcxxVectorBoolSyntheticFrontEnd::
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down
8 changes: 7 additions & 1 deletion lldb/source/Plugins/Language/ObjC/NSArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,13 @@ llvm::Expected<size_t> lldb_private::formatters::NSArrayMSyntheticFrontEndBase::
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down
40 changes: 35 additions & 5 deletions lldb/source/Plugins/Language/ObjC/NSDictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,13 @@ llvm::Expected<size_t> lldb_private::formatters::
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down Expand Up @@ -731,7 +737,13 @@ llvm::Expected<size_t> lldb_private::formatters::
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down Expand Up @@ -868,7 +880,13 @@ lldb_private::formatters::NSConstantDictionarySyntheticFrontEnd::
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down Expand Up @@ -1073,7 +1091,13 @@ lldb_private::formatters::GenericNSDictionaryMSyntheticFrontEnd<
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down Expand Up @@ -1235,7 +1259,13 @@ llvm::Expected<size_t> lldb_private::formatters::Foundation1100::
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down
8 changes: 7 additions & 1 deletion lldb/source/Plugins/Language/ObjC/NSIndexPath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,13 @@ class NSIndexPathSyntheticFrontEnd : public SyntheticChildrenFrontEnd {
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down
24 changes: 21 additions & 3 deletions lldb/source/Plugins/Language/ObjC/NSSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,13 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::GetIndexOfChildWithName(
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down Expand Up @@ -533,7 +539,13 @@ lldb_private::formatters::NSCFSetSyntheticFrontEnd::GetIndexOfChildWithName(
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down Expand Up @@ -672,7 +684,13 @@ llvm::Expected<size_t> lldb_private::formatters::GenericNSSetMSyntheticFrontEnd<
name.AsCString());
}
uint32_t idx = *optional_idx;
if (idx >= CalculateNumChildrenIgnoringErrors())
auto num_children_or_err = CalculateNumChildren();
if (!num_children_or_err) {
llvm::consumeError(num_children_or_err.takeError());
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
}
if (idx >= *num_children_or_err)
return llvm::createStringError("Type has no child named '%s'",
name.AsCString());
return idx;
Expand Down
Loading