diff --git a/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp --- a/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp @@ -16,15 +16,35 @@ using clang::tidy::utils::hasPtrOrReferenceInFunc; namespace clang { +namespace ast_matchers { +/// matches a Decl if it has a "no return" attribute of any kind +AST_MATCHER(Decl, declHasNoReturnAttr) { + return Node.hasAttr() || Node.hasAttr() || + Node.hasAttr(); +} + +/// matches a FunctionType if the type includes the GNU no return attribute +AST_MATCHER(FunctionType, typeHasNoReturnAttr) { + return Node.getNoReturnAttr(); +} +} // namespace ast_matchers namespace tidy { namespace bugprone { static internal::Matcher loopEndingStmt(internal::Matcher Internal) { - // FIXME: Cover noreturn ObjC methods (and blocks?). + internal::Matcher isNoReturnFunType = + ignoringParens(functionType(typeHasNoReturnAttr())); + internal::Matcher isNoReturnDecl = + anyOf(declHasNoReturnAttr(), functionDecl(hasType(isNoReturnFunType)), + varDecl(hasType(blockPointerType(pointee(isNoReturnFunType))))); + return stmt(anyOf( mapAnyOf(breakStmt, returnStmt, gotoStmt, cxxThrowExpr).with(Internal), - callExpr(Internal, callee(functionDecl(isNoReturn()))))); + callExpr(Internal, + callee(mapAnyOf(functionDecl, /* block callee */ varDecl) + .with(isNoReturnDecl))), + objcMessageExpr(Internal, callee(isNoReturnDecl)))); } /// Return whether `Var` was changed in `LoopStmt`. diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop-noreturn.mm b/clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop-noreturn.mm new file mode 100644 --- /dev/null +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/infinite-loop-noreturn.mm @@ -0,0 +1,62 @@ +// RUN: %check_clang_tidy %s bugprone-infinite-loop %t -- -- -fblocks -fexceptions +// RUN: %check_clang_tidy %s bugprone-infinite-loop %t -- -- -fblocks -fobjc-arc -fexceptions + +@interface I ++ (void)foo; ++ (void)bar; ++ (void)baz __attribute__((noreturn)); ++ (instancetype)alloc; +- (instancetype)init; +@end + +_Noreturn void term(); + +void plainCFunction() { + int i = 0; + int j = 0; + int a[10]; + + while (i < 10) { + // no warning, function term has C noreturn attribute + term(); + } + while (i < 10) { + // no warning, class method baz has noreturn attribute + [I baz]; + } + while (i + j < 10) { + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this loop is infinite; none of its condition variables (i, j) are updated in the loop body [bugprone-infinite-loop] + [I foo]; + } + while (i + j < 10) { + [I foo]; + [I baz]; // no warning, class method baz has noreturn attribute + } + + void (^block)() = ^{ + }; + void __attribute__((noreturn)) (^block_nr)(void) = ^void __attribute__((noreturn)) (void) { throw "err"; }; + + while (i < 10) { + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this loop is infinite; none of its condition variables (i) are updated in the loop body [bugprone-infinite-loop] + block(); + } + while (i < 10) { + // no warning, the block has "noreturn" arribute + block_nr(); + } +} + +@implementation I ++ (void)bar { +} + ++ (void)foo { + static int i = 0; + + while (i < 10) { + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this loop is infinite; none of its condition variables (i) are updated in the loop body [bugprone-infinite-loop] + [I bar]; + } +} +@end