squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[ASTMatchers] Fix segfault when Action is nullptr

Browse source 
It can be nullptr in unit tests.
This commit is contained in:
Stephen Kelly 2021-02-05 15:10:10 +00:00
parent 38f28f4621
commit 4cbea09431
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clang/lib/ASTMatchers/ASTMatchFinder.cpp
View file

@ -1336,7 +1336,10 @@ MatchFinder::~MatchFinder() {}
void MatchFinder::addMatcher(const DeclarationMatcher &NodeMatch,
MatchCallback *Action) {
if (auto TK = Action->getCheckTraversalKind())
llvm::Optional<TraversalKind> TK;
if (Action)
TK = Action->getCheckTraversalKind();
if (TK)
Matchers.DeclOrStmt.emplace_back(traverse(*TK, NodeMatch), Action);
else
Matchers.DeclOrStmt.emplace_back(NodeMatch, Action);
@ -1351,7 +1354,10 @@ void MatchFinder::addMatcher(const TypeMatcher &NodeMatch,
void MatchFinder::addMatcher(const StatementMatcher &NodeMatch,
MatchCallback *Action) {
if (auto TK = Action->getCheckTraversalKind())
llvm::Optional<TraversalKind> TK;
if (Action)
TK = Action->getCheckTraversalKind();
if (TK)
Matchers.DeclOrStmt.emplace_back(traverse(*TK, NodeMatch), Action);
else
Matchers.DeclOrStmt.emplace_back(NodeMatch, Action);