diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Analysis/CFG.cpp | 12 | ||||
| -rw-r--r-- | clang/lib/Analysis/ReachableCode.cpp | 16 |
2 files changed, 18 insertions, 10 deletions
diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp index 1ed27e61cb0..f11db625cd8 100644 --- a/clang/lib/Analysis/CFG.cpp +++ b/clang/lib/Analysis/CFG.cpp @@ -1326,8 +1326,8 @@ CFGBuilder::VisitLogicalOperator(BinaryOperator *B, else { RHSBlock->setTerminator(Term); TryResult KnownVal = tryEvaluateBool(RHS); - addSuccessor(RHSBlock, KnownVal.isFalse() ? NULL : TrueBlock); - addSuccessor(RHSBlock, KnownVal.isTrue() ? NULL : FalseBlock); + addSuccessor(RHSBlock, TrueBlock, !KnownVal.isFalse()); + addSuccessor(RHSBlock, FalseBlock, !KnownVal.isTrue()); } Block = RHSBlock; @@ -1370,12 +1370,12 @@ CFGBuilder::VisitLogicalOperator(BinaryOperator *B, // Now link the LHSBlock with RHSBlock. if (B->getOpcode() == BO_LOr) { - addSuccessor(LHSBlock, KnownVal.isFalse() ? NULL : TrueBlock); - addSuccessor(LHSBlock, KnownVal.isTrue() ? NULL : RHSBlock); + addSuccessor(LHSBlock, TrueBlock, !KnownVal.isFalse()); + addSuccessor(LHSBlock, RHSBlock, !KnownVal.isTrue()); } else { assert(B->getOpcode() == BO_LAnd); - addSuccessor(LHSBlock, KnownVal.isFalse() ? NULL : RHSBlock); - addSuccessor(LHSBlock, KnownVal.isTrue() ? NULL : FalseBlock); + addSuccessor(LHSBlock, RHSBlock, !KnownVal.isFalse()); + addSuccessor(LHSBlock, FalseBlock, !KnownVal.isTrue()); } return std::make_pair(EntryLHSBlock, ExitBlock); diff --git a/clang/lib/Analysis/ReachableCode.cpp b/clang/lib/Analysis/ReachableCode.cpp index fa31dc1b068..09abcc9b7dc 100644 --- a/clang/lib/Analysis/ReachableCode.cpp +++ b/clang/lib/Analysis/ReachableCode.cpp @@ -459,9 +459,13 @@ static bool isConfigurationValue(const Stmt *S) { /// Returns true if we should always explore all successors of a block. static bool shouldTreatSuccessorsAsReachable(const CFGBlock *B) { - if (const Stmt *Term = B->getTerminator()) + if (const Stmt *Term = B->getTerminator()) { if (isa<SwitchStmt>(Term)) return true; + // Specially handle '||' and '&&'. + if (isa<BinaryOperator>(Term)) + return isConfigurationValue(Term); + } return isConfigurationValue(B->getTerminatorCondition()); } @@ -491,9 +495,9 @@ unsigned ScanReachableFromBlock(const CFGBlock *Start, // and that we should forge ahead and explore those branches anyway. // This allows us to potentially uncover some "always unreachable" code // within the "sometimes unreachable" code. - bool TreatAllSuccessorsAsReachable = shouldTreatSuccessorsAsReachable(item); - // Look at the successors and mark then reachable. + Optional<bool> TreatAllSuccessorsAsReachable; + for (CFGBlock::const_succ_iterator I = item->succ_begin(), E = item->succ_end(); I != E; ++I) { const CFGBlock *B = *I; @@ -502,7 +506,11 @@ unsigned ScanReachableFromBlock(const CFGBlock *Start, if (!UB) break; - if (TreatAllSuccessorsAsReachable) { + if (!TreatAllSuccessorsAsReachable.hasValue()) + TreatAllSuccessorsAsReachable = + shouldTreatSuccessorsAsReachable(item); + + if (TreatAllSuccessorsAsReachable.getValue()) { B = UB; break; } |
