Skip to content

Commit 021be3b

Browse files
author
git apple-llvm automerger
committed
Merge commit '87bd6795ccb3' from swift/release/5.5 into swift/main
2 parents 7d7d5e2 + 87bd679 commit 021be3b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeNames.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ enum class ThunkAction {
6060
static swift::Demangle::NodePointer
6161
childAtPath(swift::Demangle::NodePointer node,
6262
llvm::ArrayRef<swift::Demangle::Node::Kind> path) {
63-
if (path.empty())
63+
if (!node || path.empty())
6464
return node;
6565

6666
auto current_step = path.front();
6767
for (auto *child : *node)
68-
if (child->getKind() == current_step)
68+
if (child && child->getKind() == current_step)
6969
return childAtPath(child, path.drop_front());
7070
return nullptr;
7171
}

0 commit comments

Comments
 (0)