From 1b7f49c2d6072f3e1432877a5e78ca946845bd2c Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 25 Aug 2011 19:28:55 +0000 Subject: Teach -Wunreachable-code about dead code caused by macro expansions. This should suppress false positives resulting from 'assert' and friends. llvm-svn: 138576 --- clang/lib/Analysis/ReachableCode.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'clang/lib/Analysis/ReachableCode.cpp') diff --git a/clang/lib/Analysis/ReachableCode.cpp b/clang/lib/Analysis/ReachableCode.cpp index e3194cb6a16..49317718c38 100644 --- a/clang/lib/Analysis/ReachableCode.cpp +++ b/clang/lib/Analysis/ReachableCode.cpp @@ -86,12 +86,10 @@ bool DeadCodeScan::isDeadCodeRoot(const clang::CFGBlock *Block) { } static bool isValidDeadStmt(const Stmt *S) { - SourceLocation Loc = S->getLocStart(); - if (!(Loc.isValid() && !Loc.isMacroID())) + if (S->getLocStart().isInvalid()) return false; - if (const BinaryOperator *BO = dyn_cast(S)) { + if (const BinaryOperator *BO = dyn_cast(S)) return BO->getOpcode() != BO_Comma; - } return true; } @@ -144,6 +142,12 @@ unsigned DeadCodeScan::scanBackwards(const clang::CFGBlock *Start, } continue; } + + // Specially handle macro-expanded code. + if (S->getLocStart().isMacroID()) { + count += clang::reachable_code::ScanReachableFromBlock(Block, Reachable); + continue; + } if (isDeadCodeRoot(Block)) { reportDeadCode(S, CB); -- cgit v1.2.3