CallExprs are now no longer block-level expressions in the CFG by construction.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47913 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/AST/CFG.cpp b/AST/CFG.cpp
index 0cab1f1b5c7431b68ac4b4d87c9f1919da263416..f571e4e73beca8d08751af8233eba52aaa87b392 100644 (file)
--- a/AST/CFG.cpp
+++ b/AST/CFG.cpp
@@ -120,7 +120,6 @@ private:
   CFGBlock* WalkAST_VisitChildren(Stmt* S);
   CFGBlock* WalkAST_VisitDeclSubExprs(StmtIterator& I);
   CFGBlock* WalkAST_VisitStmtExpr(StmtExpr* S);
-  CFGBlock* WalkAST_VisitCallExpr(CallExpr* C);
   void FinishBlock(CFGBlock* B);
   
 };
@@ -318,9 +317,6 @@ CFGBlock* CFGBuilder::WalkAST(Stmt* S, bool AlwaysAddStmt = false) {
       return Block;
     }
     
-    case Stmt::CallExprClass:
-      return WalkAST_VisitCallExpr(cast<CallExpr>(S));
-      
     case Stmt::StmtExprClass:
       return WalkAST_VisitStmtExpr(cast<StmtExpr>(S));
 
@@ -438,14 +434,6 @@ CFGBlock* CFGBuilder::WalkAST_VisitStmtExpr(StmtExpr* S) {
   return VisitCompoundStmt(S->getSubStmt());  
 }
 
-/// WalkAST_VisitCallExpr - Utility method to handle function calls that
-///  are nested in expressions.  The idea is that each function call should
-///  appear as a distinct statement in the CFGBlock.
-CFGBlock* CFGBuilder::WalkAST_VisitCallExpr(CallExpr* C) {
-  Block->appendStmt(C);
-  return WalkAST_VisitChildren(C);
-}
-
 /// VisitStmt - Handle statements with no branching control flow.
 CFGBlock* CFGBuilder::VisitStmt(Stmt* Statement) {
   // We cannot assume that we are in the middle of a basic block, since