This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG5ad2eeeadaf1: [clang-tidy] bugprone-infinite-loop: React to
ObjC ivars and messages. (authored by dergachev.a).
Changed prior to commit:
https://reviews.llvm.org/D102294?vs=345018&id=345234#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D102294/new/
https://reviews.llvm.org/D102294
Files:
clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.mm
Index: clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.mm
===================================================================
--- clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.mm
+++ clang-tools-extra/test/clang-tidy/checkers/bugprone-infinite-loop.mm
@@ -1,8 +1,20 @@
// RUN: %check_clang_tidy %s bugprone-infinite-loop %t -- -- -fblocks
+// RUN: %check_clang_tidy %s bugprone-infinite-loop %t -- -- -fblocks -fobjc-arc
+
+typedef __typeof(sizeof(int)) NSUInteger;
+
+@interface NSArray
++(instancetype)alloc;
+-(instancetype)init;
+@property(readonly) NSUInteger count;
+-(void)addObject: (id)anObject;
+@end
@interface I
-(void) instanceMethod;
+(void) classMethod;
++(instancetype)alloc;
+-(instancetype)init;
@end
void plainCFunction() {
@@ -33,3 +45,81 @@
}
}
@end
+
+void testArrayCount() {
+ NSArray *arr = [[NSArray alloc] init];
+ NSUInteger max_count = 10;
+ while ([arr count] < max_count) {
+ // No warning. Array count is updated on every iteration.
+ [arr addObject: [[I alloc] init]];
+ }
+}
+
+void testArrayCountWithConstant() {
+ NSArray *arr = [[NSArray alloc] init];
+ while ([arr count] < 10) {
+ // No warning. Array count is updated on every iteration.
+ [arr addObject: [[I alloc] init]];
+ }
+}
+
+void testArrayCountProperty() {
+ NSArray *arr = [[NSArray alloc] init];
+ NSUInteger max_count = 10;
+ while (arr.count < max_count) {
+ // No warning. Array count is updated on every iteration.
+ [arr addObject: [[I alloc] init]];
+ }
+}
+
+void testArrayCountPropertyWithConstant() {
+ NSArray *arr = [[NSArray alloc] init];
+ while (arr.count < 10) {
+ // No warning. Array count is updated on every iteration.
+ [arr addObject: [[I alloc] init]];
+ }
+}
+
+@interface MyArray {
+ @public NSUInteger _count;
+}
++(instancetype)alloc;
+-(instancetype)init;
+-(void)addObject: (id)anObject;
+
+-(void)populate;
+@end
+
+@implementation MyArray
+-(void)populate {
+ NSUInteger max_count = 10;
+ while (_count < max_count) {
+ // No warning. Array count is updated on every iteration.
+ [self addObject: [[I alloc] init]];
+ }
+}
+
+-(void)populateWithConstant {
+ while (_count < 10) {
+ // No warning. Array count is updated on every iteration.
+ [self addObject: [[I alloc] init]];
+ }
+}
+@end
+
+void testArrayCountIvar() {
+ MyArray *arr = [[MyArray alloc] init];
+ NSUInteger max_count = 10;
+ while (arr->_count < max_count) {
+ // No warning. Array count is updated on every iteration.
+ [arr addObject: [[I alloc] init]];
+ }
+}
+
+void testArrayCountIvarWithConstant() {
+ MyArray *arr = [[MyArray alloc] init];
+ while (arr->_count < 10) {
+ // No warning. Array count is updated on every iteration.
+ [arr addObject: [[I alloc] init]];
+ }
+}
Index: clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
+++ clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
@@ -61,7 +61,8 @@
isChanged(LoopStmt, Var, Context);
// FIXME: Track references.
}
- } else if (isa<MemberExpr>(Cond) || isa<CallExpr>(Cond)) {
+ } else if (isa<MemberExpr, CallExpr,
+ ObjCIvarRefExpr, ObjCPropertyRefExpr, ObjCMessageExpr>(Cond)) {
// FIXME: Handle MemberExpr.
return true;
}
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
