[cfe-commits] r123216 - in /cfe/trunk: include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h lib/StaticAnalyzer/CoreEngine.cpp

[Ted Kremenek]

Author: kremenek
Date: Mon Jan 10 22:49:40 2011
New Revision: 123216

URL: http://llvm.org/viewvc/llvm-project?rev=123216&view=rev
Log:
Remove several silly methods from ento::CoreEngine
that just forwarded to ento::SubEngine.

Modified:
    cfe/trunk/include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h
    cfe/trunk/lib/StaticAnalyzer/CoreEngine.cpp

Modified: cfe/trunk/include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h?rev=123216&r1=123215&r2=123216&view=diff
==============================================================================
--- cfe/trunk/include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h (original)
+++ cfe/trunk/include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h Mon Jan 10 22:49:40 2011
@@ -82,48 +82,6 @@
                        unsigned Index, ExplodedNode *Pred);
   void HandleCallExit(const CallExit &L, ExplodedNode *Pred);
 
-  /// Get the initial state from the subengine.
-  const GRState* getInitialState(const LocationContext *InitLoc) {
-    return SubEng.getInitialState(InitLoc);
-  }
-
-  void processEndOfFunction(EndOfFunctionNodeBuilder& Builder) {
-    SubEng.processEndOfFunction(Builder);
-  }
-
-  void processCFGElement(const CFGElement E, StmtNodeBuilder& Builder) {
-    SubEng.processCFGElement(E, Builder);
-  }
-
-  bool processCFGBlockEntrance(const CFGBlock* Blk, const ExplodedNode *Pred,
-                            BlockCounter BC) {
-    return SubEng.processCFGBlockEntrance(Blk, Pred, BC);
-  }
-
-
-  void processBranch(const Stmt* Condition, const Stmt* Terminator,
-                     BranchNodeBuilder& Builder) {
-    SubEng.processBranch(Condition, Terminator, Builder);
-  }
-
-
-  void processIndirectGoto(IndirectGotoNodeBuilder& Builder) {
-    SubEng.processIndirectGoto(Builder);
-  }
-
-
-  void processSwitch(SwitchNodeBuilder& Builder) {
-    SubEng.processSwitch(Builder);
-  }
-
-  void processCallEnter(CallEnterNodeBuilder &Builder) {
-    SubEng.processCallEnter(Builder);
-  }
-
-  void processCallExit(CallExitNodeBuilder &Builder) {
-    SubEng.processCallExit(Builder);
-  }
-
 private:
   CoreEngine(const CoreEngine&); // Do not implement.
   CoreEngine& operator=(const CoreEngine&);

Modified: cfe/trunk/lib/StaticAnalyzer/CoreEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/CoreEngine.cpp?rev=123216&r1=123215&r2=123216&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/CoreEngine.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/CoreEngine.cpp Mon Jan 10 22:49:40 2011
@@ -189,7 +189,7 @@
 
     if (!InitState)
       // Generate the root.
-      generateNode(StartLoc, getInitialState(L), 0);
+      generateNode(StartLoc, SubEng.getInitialState(L), 0);
     else
       generateNode(StartLoc, InitState, 0);
   }
@@ -262,12 +262,12 @@
                                    unsigned Index, ExplodedNode *Pred) {
   CallEnterNodeBuilder Builder(*this, Pred, L.getCallExpr(), 
                                  L.getCalleeContext(), Block, Index);
-  processCallEnter(Builder);
+  SubEng.processCallEnter(Builder);
 }
 
 void CoreEngine::HandleCallExit(const CallExit &L, ExplodedNode *Pred) {
   CallExitNodeBuilder Builder(*this, Pred);
-  processCallExit(Builder);
+  SubEng.processCallExit(Builder);
 }
 
 void CoreEngine::HandleBlockEdge(const BlockEdge& L, ExplodedNode* Pred) {
@@ -282,7 +282,7 @@
 
     // Process the final state transition.
     EndOfFunctionNodeBuilder Builder(Blk, Pred, this);
-    processEndOfFunction(Builder);
+    SubEng.processEndOfFunction(Builder);
 
     // This path is done. Don't enqueue any more nodes.
     return;
@@ -290,7 +290,7 @@
 
   // FIXME: Should we allow processCFGBlockEntrance to also manipulate state?
 
-  if (processCFGBlockEntrance(Blk, Pred, WList->getBlockCounter()))
+  if (SubEng.processCFGBlockEntrance(Blk, Pred, WList->getBlockCounter()))
     generateNode(BlockEntrance(Blk, Pred->getLocationContext()),
                  Pred->State, Pred);
   else {
@@ -312,7 +312,7 @@
   if (CFGElement E = L.getFirstElement()) {
     StmtNodeBuilder Builder(L.getBlock(), 0, Pred, this,
                               SubEng.getStateManager());
-    processCFGElement(E, Builder);
+    SubEng.processCFGElement(E, Builder);
   }
   else
     HandleBlockExit(L.getBlock(), Pred);
@@ -366,7 +366,7 @@
            builder(Pred, B, cast<IndirectGotoStmt>(Term)->getTarget(),
                    *(B->succ_begin()), this);
 
-        processIndirectGoto(builder);
+        SubEng.processIndirectGoto(builder);
         return;
       }
 
@@ -389,7 +389,7 @@
         SwitchNodeBuilder builder(Pred, B, cast<SwitchStmt>(Term)->getCond(),
                                     this);
 
-        processSwitch(builder);
+        SubEng.processSwitch(builder);
         return;
       }
 
@@ -408,12 +408,10 @@
 
 void CoreEngine::HandleBranch(const Stmt* Cond, const Stmt* Term, 
                                 const CFGBlock * B, ExplodedNode* Pred) {
-  assert (B->succ_size() == 2);
-
+  assert(B->succ_size() == 2);
   BranchNodeBuilder Builder(B, *(B->succ_begin()), *(B->succ_begin()+1),
-                              Pred, this);
-
-  processBranch(Cond, Term, Builder);
+                            Pred, this);
+  SubEng.processBranch(Cond, Term, Builder);
 }
 
 void CoreEngine::HandlePostStmt(const CFGBlock* B, unsigned StmtIdx, 
@@ -425,7 +423,7 @@
   else {
     StmtNodeBuilder Builder(B, StmtIdx, Pred, this,
                               SubEng.getStateManager());
-    processCFGElement((*B)[StmtIdx], Builder);
+    SubEng.processCFGElement((*B)[StmtIdx], Builder);
   }
 }