commit 8ce772b211cea74357ae57348c386c6b589aca7e
author Ted Kremenek <kremenek@apple.com> Mon Oct 01 20:33:52 2007 +0000
committer Ted Kremenek <kremenek@apple.com> Mon Oct 01 20:33:52 2007 +0000
tree 1d2529b41ead500bbce7c2db4e16b18409b112c8
parent 3a8198213c7834c5f122fc73ea90180f885b699e

Migrated LiveVariables and UninitializedVariables to now use the
tracked BlkExpr information now maintained by the CFG class.


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

Analysis/LiveVariables.cpp

diff --git a/Analysis/LiveVariables.cpp b/Analysis/LiveVariables.cpp
index f8c3d37..b4220ef 100644
--- a/Analysis/LiveVariables.cpp
+++ b/Analysis/LiveVariables.cpp
@@ -31,18 +31,16 @@
 //===----------------------------------------------------------------------===//      
 
 namespace {
-class RegisterDeclsExprs : public CFGRecStmtDeclVisitor<RegisterDeclsExprs> {  
+class RegisterDecls : public CFGRecStmtDeclVisitor<RegisterDecls> {  
   LiveVariables::AnalysisDataTy& AD;
 public:
-  RegisterDeclsExprs(LiveVariables::AnalysisDataTy& ad) : AD(ad) {}
-  
+  RegisterDecls(LiveVariables::AnalysisDataTy& ad) : AD(ad) {}  
   void VisitVarDecl(VarDecl* VD) { AD.Register(VD); }
-  void BlockStmt_VisitExpr(Expr* E) { AD.Register(E); }
-};  
+};
 } // end anonymous namespace
 
 void LiveVariables::InitializeValues(const CFG& cfg) {
-  RegisterDeclsExprs R(getAnalysisData());
+  RegisterDecls R(getAnalysisData());
   cfg.VisitBlockStmts(R);
 }
 
@@ -58,10 +56,8 @@
 class TransferFuncs : public CFGStmtVisitor<TransferFuncs> {
   LiveVariables::AnalysisDataTy& AD;
   LiveVariables::ValTy LiveState;
-  bool ExprLiveness;
 public:
-  TransferFuncs(LiveVariables::AnalysisDataTy& ad) : AD(ad), 
-                                                     ExprLiveness(Dead) {}
+  TransferFuncs(LiveVariables::AnalysisDataTy& ad) : AD(ad) {}
 
   LiveVariables::ValTy& getVal() { return LiveState; }
   
@@ -71,16 +67,26 @@
   void VisitDeclStmt(DeclStmt* DS);
   void VisitUnaryOperator(UnaryOperator* U);
   void VisitStmt(Stmt* S);
-  void BlockStmt_VisitExpr(Expr *E);
+  void VisitExpr(Expr* E);
+  void BlockStmt_VisitExpr(Expr *E);    
+  void Visit(Stmt *S);
   
   DeclRefExpr* FindDeclRef(Stmt *S);
-  
-  void Visit(Stmt *S) {
-    if (AD.Observer) AD.Observer->ObserveStmt(S,AD,LiveState);
-    static_cast<CFGStmtVisitor<TransferFuncs>*>(this)->Visit(S);
-  }
 };
+
+void TransferFuncs::VisitExpr(Expr * E) {
+  if (AD.getCFG().isBlkExpr(E)) return;
+  else VisitStmt(E);
+}
+      
+void TransferFuncs::VisitStmt(Stmt* S) { VisitChildren(S); }
+
+void TransferFuncs::Visit(Stmt *S) {
+  if (AD.Observer)
+    AD.Observer->ObserveStmt(S,AD,LiveState);
   
+  static_cast<CFGStmtVisitor<TransferFuncs>*>(this)->Visit(S);
+}
 
 void TransferFuncs::VisitDeclRefExpr(DeclRefExpr* DR) {
   if (VarDecl* V = dyn_cast<VarDecl>(DR->getDecl())) 
@@ -151,17 +157,12 @@
 void TransferFuncs::VisitDeclStmt(DeclStmt* DS) {
   // Declarations effectively "kill" a variable since they cannot
   // possibly be live before they are declared.
-  for (ScopedDecl* D = DS->getDecl(); D != NULL ; D = D->getNextDeclarator())
+  for (ScopedDecl* D = DS->getDecl(); D != NULL; D = D->getNextDeclarator())
     LiveState(D,AD) = Dead;
 }
   
-void TransferFuncs::VisitStmt(Stmt* S) {
-  if (AD.isTracked(static_cast<Expr*>(S))) return;
-  else VisitChildren(S); 
-}
-  
 void TransferFuncs::BlockStmt_VisitExpr(Expr* E) {
-  assert (AD.isTracked(E));
+  assert (AD.getCFG().isBlkExpr(E));
   static_cast<CFGStmtVisitor<TransferFuncs>*>(this)->Visit(E);
 }