From 1c4af5edf4e92f1436b6668ab665dea42d512834 Mon Sep 17 00:00:00 2001 From: Alexander Kornienko Date: Sun, 15 Mar 2015 02:19:37 +0000 Subject: [clang-tidy] Fix false positives in the misc-static-assert check http://llvm.org/PR22880 The misc-static-assert check will not warn on assert(false), assert(False), assert(FALSE); where false / False / FALSE are macros expanding to the false or 0 literals. Also added corresponding test cases. http://reviews.llvm.org/D8328 Patch by Szabolcs Sipos! llvm-svn: 232306 --- clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp') diff --git a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp index fd6c4ca92fc..91451e680ca 100644 --- a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp +++ b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp @@ -75,9 +75,17 @@ void StaticAssertCheck::check(const MatchFinder::MatchResult &Result) { return; // False literal is not the result of macro expansion. - if (IsAlwaysFalse && - !SM.getImmediateSpellingLoc(IsAlwaysFalse->getExprLoc()).isMacroID()) - return; + if (IsAlwaysFalse) { + SourceLocation FalseLiteralLoc = + SM.getImmediateSpellingLoc(IsAlwaysFalse->getExprLoc()); + if (!FalseLiteralLoc.isMacroID()) + return; + + StringRef FalseMacroName = + Lexer::getImmediateMacroName(FalseLiteralLoc, SM, Opts); + if (FalseMacroName.compare_lower("false") == 0) + return; + } SourceLocation AssertLoc = SM.getImmediateMacroCallerLoc(AssertExpansionLoc); -- cgit v1.2.3