Skip to content

Commit ec0c226

Browse files
authored
Merge pull request #7494 from augusto2112/dont-cache-parse-nullptr
[lldb] Check for nullptr before accessing parsed_expr->code_manipulator
2 parents cccbbd6 + 8b13537 commit ec0c226

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,16 +1724,16 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
17241724
return ParseResult::unrecoverable_error;
17251725
}
17261726

1727-
{
1728-
// If any generics are present, this expression is not parseable.
1727+
// If any generics are present, this expression is not parseable.
1728+
if (parsed_expr->code_manipulator)
17291729
m_is_cacheable =
17301730
!llvm::any_of(parsed_expr->code_manipulator->GetVariableInfo(),
1731-
[](const auto &variable) {
1732-
return variable.IsMetadataPointer() ||
1733-
variable.IsPackCount() ||
1734-
variable.IsUnboundPack();
1735-
});
1736-
}
1731+
[](const auto &variable) {
1732+
return variable.IsMetadataPointer() ||
1733+
variable.IsPackCount() ||
1734+
variable.IsUnboundPack();
1735+
});
1736+
17371737
auto dumpModule = [&](const char *msg) {
17381738
std::string s;
17391739
llvm::raw_string_ostream ss(s);

0 commit comments

Comments
 (0)