maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

bugfix in InfiniteLoopCheck to not print warnings for unevaluated loops 

Added a separate check for unevaluated statements. Updated InfiniteLoopCheck to use new check

Differential Revision: https://reviews.llvm.org/D126246
This commit is contained in:
usama hameed 2022-05-23 14:52:14 -07:00
parent 602682225a
commit 63ecb7dcc8
3 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
View File

@ -81,22 +81,6 @@ static bool isVarThatIsPossiblyChanged(const Decl *Func, const Stmt *LoopStmt,
return false;
}
bool isUnevaluated(const Decl *Func, const Stmt *LoopStmt, const Stmt *Cond,
ASTContext *Context) {
if (const auto *Exp = dyn_cast<Expr>(Cond)) {
if (const auto *ForLoop = dyn_cast<ForStmt>(LoopStmt)) {
return (ForLoop->getInc() && ExprMutationAnalyzer::isUnevaluated(
Exp, *ForLoop->getInc(), *Context)) ||
(ForLoop->getBody() && ExprMutationAnalyzer::isUnevaluated(
Exp, *ForLoop->getBody(), *Context)) ||
(ForLoop->getCond() && ExprMutationAnalyzer::isUnevaluated(
Exp, *ForLoop->getCond(), *Context));
}
return ExprMutationAnalyzer::isUnevaluated(Exp, *LoopStmt, *Context);
}
return true;
}
/// Return whether at least one variable of `Cond` changed in `LoopStmt`.
static bool isAtLeastOneCondVarChanged(const Decl *Func, const Stmt *LoopStmt,
const Stmt *Cond, ASTContext *Context) {
@ -193,7 +177,7 @@ void InfiniteLoopCheck::check(const MatchFinder::MatchResult &Result) {
}
}
if (isUnevaluated(Func, LoopStmt, Cond, Result.Context))
if (ExprMutationAnalyzer::isUnevaluated(LoopStmt, *LoopStmt, *Result.Context))
return;
if (isAtLeastOneCondVarChanged(Func, LoopStmt, Cond, Result.Context))

2
clang/include/clang/Analysis/Analyses/ExprMutationAnalyzer.h
View File

@ -38,6 +38,8 @@ public:
}
const Stmt *findPointeeMutation(const Expr *Exp);
const Stmt *findPointeeMutation(const Decl *Dec);
static bool isUnevaluated(const Stmt *Smt, const Stmt &Stm,
ASTContext &Context);
static bool isUnevaluated(const Expr *Exp, const Stmt &Stm,
ASTContext &Context);

62
clang/lib/Analysis/ExprMutationAnalyzer.cpp
View File

@ -194,36 +194,44 @@ const Stmt *ExprMutationAnalyzer::tryEachDeclRef(const Decl *Dec,
return nullptr;
}
auto isUnevaluatedMatcher(const Stmt *Exp) {
return anyOf(
// `Exp` is part of the underlying expression of
// decltype/typeof if it has an ancestor of
// typeLoc.
hasAncestor(typeLoc(unless(hasAncestor(unaryExprOrTypeTraitExpr())))),
hasAncestor(expr(anyOf(
// `UnaryExprOrTypeTraitExpr` is unevaluated
// unless it's sizeof on VLA.
unaryExprOrTypeTraitExpr(
unless(sizeOfExpr(hasArgumentOfType(variableArrayType())))),
// `CXXTypeidExpr` is unevaluated unless it's
// applied to an expression of glvalue of
// polymorphic class type.
cxxTypeidExpr(unless(isPotentiallyEvaluated())),
// The controlling expression of
// `GenericSelectionExpr` is unevaluated.
genericSelectionExpr(
hasControllingExpr(hasDescendant(equalsNode(Exp)))),
cxxNoexceptExpr()))));
}
bool ExprMutationAnalyzer::isUnevaluated(const Expr *Exp, const Stmt &Stm,
ASTContext &Context) {
return selectFirst<Expr>(
return selectFirst<Expr>(NodeID<Expr>::value,
match(findAll(expr(canResolveToExpr(equalsNode(Exp)),
isUnevaluatedMatcher(Exp))
.bind(NodeID<Expr>::value)),
Stm, Context)) != nullptr;
}
bool ExprMutationAnalyzer::isUnevaluated(const Stmt *Exp, const Stmt &Stm,
ASTContext &Context) {
return selectFirst<Stmt>(
NodeID<Expr>::value,
match(
findAll(
expr(canResolveToExpr(equalsNode(Exp)),
anyOf(
// `Exp` is part of the underlying expression of
// decltype/typeof if it has an ancestor of
// typeLoc.
hasAncestor(typeLoc(unless(
hasAncestor(unaryExprOrTypeTraitExpr())))),
hasAncestor(expr(anyOf(
// `UnaryExprOrTypeTraitExpr` is unevaluated
// unless it's sizeof on VLA.
unaryExprOrTypeTraitExpr(unless(sizeOfExpr(
hasArgumentOfType(variableArrayType())))),
// `CXXTypeidExpr` is unevaluated unless it's
// applied to an expression of glvalue of
// polymorphic class type.
cxxTypeidExpr(
unless(isPotentiallyEvaluated())),
// The controlling expression of
// `GenericSelectionExpr` is unevaluated.
genericSelectionExpr(hasControllingExpr(
hasDescendant(equalsNode(Exp)))),
cxxNoexceptExpr())))))
.bind(NodeID<Expr>::value)),
Stm, Context)) != nullptr;
match(findAll(stmt(equalsNode(Exp), isUnevaluatedMatcher(Exp))
.bind(NodeID<Expr>::value)),
Stm, Context)) != nullptr;
}
bool ExprMutationAnalyzer::isUnevaluated(const Expr *Exp) {