[llvm-branch-commits] [cfe-branch] r119264 - /cfe/branches/Apple/whitney/lib/Checker/IdempotentOperationChecker.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Mon Nov 15 15:46:56 2010
New Revision: 119264

URL: http://llvm.org/viewvc/llvm-project?rev=119264&view=rev
Log:
Merge r118983:
--
Author: Ted Kremenek <kremenek at apple.com>
Date:   Sat Nov 13 05:04:52 2010 +0000

    Teach IdempotentOperations::PathWasCompletelyAnalyzed to also consider items remaining in the
    worklist that could have impacted the evaluation of a block.

    Fixes <rdar://problem/8663596>.

Modified:
    cfe/branches/Apple/whitney/lib/Checker/IdempotentOperationChecker.cpp

Modified: cfe/branches/Apple/whitney/lib/Checker/IdempotentOperationChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Checker/IdempotentOperationChecker.cpp?rev=119264&r1=119263&r2=119264&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Checker/IdempotentOperationChecker.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Checker/IdempotentOperationChecker.cpp Mon Nov 15 15:46:56 2010
@@ -82,6 +82,7 @@
                                               const Expr *RHS);
   bool PathWasCompletelyAnalyzed(const CFG *C,
                                  const CFGBlock *CB,
+                                 const CFGStmtMap *CBM,
                                  const GRCoreEngine &CE);
   static bool CanVary(const Expr *Ex,
                       AnalysisContext *AC);
@@ -386,7 +387,7 @@
 
       // If we can trace back
       if (!PathWasCompletelyAnalyzed(AC->getCFG(),
-                                     CBM->getBlock(B),
+                                     CBM->getBlock(B), CBM,
                                      Eng.getCoreEngine()))
         continue;
 
@@ -550,6 +551,7 @@
 bool IdempotentOperationChecker::PathWasCompletelyAnalyzed(
                                                        const CFG *C,
                                                        const CFGBlock *CB,
+                                                       const CFGStmtMap *CBM,
                                                        const GRCoreEngine &CE) {
   // Test for reachability from any aborted blocks to this block
   typedef GRCoreEngine::BlocksAborted::const_iterator AbortedIterator;
@@ -563,6 +565,34 @@
     if (CRA.isReachable(BE.getDst(), CB))
       return false;
   }
+  
+  // For the items still on the worklist, see if they are in blocks that
+  // can eventually reach 'CB'.
+  class VisitWL : public GRWorkList::Visitor {
+    const CFGStmtMap *CBM;
+    const CFGBlock *TargetBlock;
+    CFGReachabilityAnalysis &CRA;
+  public:
+    VisitWL(const CFGStmtMap *cbm, const CFGBlock *targetBlock,
+            CFGReachabilityAnalysis &cra)
+      : CBM(cbm), TargetBlock(targetBlock), CRA(cra) {}
+    virtual bool Visit(const GRWorkListUnit &U) {
+      ProgramPoint P = U.getNode()->getLocation();
+      const CFGBlock *B = 0;
+      if (StmtPoint *SP = dyn_cast<StmtPoint>(&P)) {
+        B = CBM->getBlock(SP->getStmt());
+      }
+      if (!B)
+        return true;
+      
+      return CRA.isReachable(B, TargetBlock);
+    }
+  };
+  VisitWL visitWL(CBM, CB, CRA);
+  // Were there any items in the worklist that could potentially reach
+  // this block?
+  if (CE.getWorkList()->VisitItemsInWorkList(visitWL))
+    return false;
 
   // Verify that this block is reachable from the entry block
   if (!CRA.isReachable(&C->getEntry(), CB))