This revision was automatically updated to reflect the committed changes.
Closed by commit rGb92a39ac1319: [clang-tidy] bugprone-assert-side-effect: Warn
on NSAssert by default. (authored by dergachev.a).
Herald added a project: clang.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D95519/new/
https://reviews.llvm.org/D95519
Files:
clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m
Index: clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m
===================================================================
--- /dev/null
+++ clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m
@@ -0,0 +1,53 @@
+// RUN: %check_clang_tidy %s bugprone-assert-side-effect %t
+
+int abort();
+
+@interface NSObject
+@end
+
+@interface NSString
+@end
+
+@interface NSAssertionHandler
++ (NSAssertionHandler *)currentHandler;
+- handleFailureInMethod:(SEL)cmd object:(NSObject *)obj desc:(NSString *)desc;
+- handleFailureInFunction:(NSString *)desc;
+@end
+
+#ifndef NDEBUG
+#define NSAssert(condition, description, ...)
\
+ do {
\
+ if (__builtin_expect(!(condition), 0)) {
\
+ [[NSAssertionHandler currentHandler] handleFailureInMethod:_cmd
\
+ object:self
\
+
desc:(description)]; \
+ }
\
+ } while (0);
+#define NSCAssert(condition, description, ...)
\
+ do {
\
+ if (__builtin_expect(!(condition), 0)) {
\
+ [[NSAssertionHandler currentHandler]
handleFailureInFunction:(description)]; \
+ }
\
+ } while (0);
+#else
+#define NSAssert(condition, description, ...) do {} while (0)
+#define NSCAssert(condition, description, ...) do {} while (0)
+#endif
+
+@interface I : NSObject
+- (void)foo;
+@end
+
+@implementation I
+- (void)foo {
+ int x = 0;
+ NSAssert((++x) == 1, @"Ugh.");
+ // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: side effect in NSAssert()
condition discarded in release builds [bugprone-assert-side-effect]
+}
+@end
+
+void foo() {
+ int x = 0;
+ NSCAssert((++x) == 1, @"Ugh.");
+ // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: side effect in NSCAssert()
condition discarded in release builds [bugprone-assert-side-effect]
+}
Index: clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
+++ clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
@@ -72,7 +72,8 @@
ClangTidyContext *Context)
: ClangTidyCheck(Name, Context),
CheckFunctionCalls(Options.get("CheckFunctionCalls", false)),
- RawAssertList(Options.get("AssertMacros", "assert")) {
+ RawAssertList(Options.get("AssertMacros",
+ "assert,NSAssert,NSCAssert")) {
StringRef(RawAssertList).split(AssertMacros, ",", -1, false);
}
Index: clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m
===================================================================
--- /dev/null
+++ clang-tools-extra/test/clang-tidy/checkers/bugprone-assert-side-effect.m
@@ -0,0 +1,53 @@
+// RUN: %check_clang_tidy %s bugprone-assert-side-effect %t
+
+int abort();
+
+@interface NSObject
+@end
+
+@interface NSString
+@end
+
+@interface NSAssertionHandler
++ (NSAssertionHandler *)currentHandler;
+- handleFailureInMethod:(SEL)cmd object:(NSObject *)obj desc:(NSString *)desc;
+- handleFailureInFunction:(NSString *)desc;
+@end
+
+#ifndef NDEBUG
+#define NSAssert(condition, description, ...) \
+ do { \
+ if (__builtin_expect(!(condition), 0)) { \
+ [[NSAssertionHandler currentHandler] handleFailureInMethod:_cmd \
+ object:self \
+ desc:(description)]; \
+ } \
+ } while (0);
+#define NSCAssert(condition, description, ...) \
+ do { \
+ if (__builtin_expect(!(condition), 0)) { \
+ [[NSAssertionHandler currentHandler] handleFailureInFunction:(description)]; \
+ } \
+ } while (0);
+#else
+#define NSAssert(condition, description, ...) do {} while (0)
+#define NSCAssert(condition, description, ...) do {} while (0)
+#endif
+
+@interface I : NSObject
+- (void)foo;
+@end
+
+@implementation I
+- (void)foo {
+ int x = 0;
+ NSAssert((++x) == 1, @"Ugh.");
+ // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: side effect in NSAssert() condition discarded in release builds [bugprone-assert-side-effect]
+}
+@end
+
+void foo() {
+ int x = 0;
+ NSCAssert((++x) == 1, @"Ugh.");
+ // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: side effect in NSCAssert() condition discarded in release builds [bugprone-assert-side-effect]
+}
Index: clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
+++ clang-tools-extra/clang-tidy/bugprone/AssertSideEffectCheck.cpp
@@ -72,7 +72,8 @@
ClangTidyContext *Context)
: ClangTidyCheck(Name, Context),
CheckFunctionCalls(Options.get("CheckFunctionCalls", false)),
- RawAssertList(Options.get("AssertMacros", "assert")) {
+ RawAssertList(Options.get("AssertMacros",
+ "assert,NSAssert,NSCAssert")) {
StringRef(RawAssertList).split(AssertMacros, ",", -1, false);
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
