Rename header file.

Update include files.

llvm-svn: 59284

2 files changed, 4 insertions, 4 deletions

diff --git a/clang/lib/Analysis/LiveVariables.cpp b/clang/lib/Analysis/LiveVariables.cpp
index 03a4bc7eb10..98b1ee28209 100644
--- a/clang/lib/Analysis/LiveVariables.cpp
+++ b/clang/lib/Analysis/LiveVariables.cpp
@@ -276,11 +276,11 @@ void TransferFuncs::VisitDeclStmt(DeclStmt* DS) {
 namespace {
 
 struct Merge {
-  typedef ExprDeclBitVector_Types::ValTy ValTy; 
+  typedef StmtDeclBitVector_Types::ValTy ValTy; 
     
   void operator()(ValTy& Dst, const ValTy& Src) {
     Dst.OrDeclBits(Src);
-    Dst.AndExprBits(Src);
+    Dst.AndBlkExprBits(Src);
   }
 };
   
diff --git a/clang/lib/Analysis/UninitializedValues.cpp b/clang/lib/Analysis/UninitializedValues.cpp
index 0e4a387620d..b673713bb35 100644
--- a/clang/lib/Analysis/UninitializedValues.cpp
+++ b/clang/lib/Analysis/UninitializedValues.cpp
@@ -65,7 +65,7 @@ public:
   
   void SetTopValue(UninitializedValues::ValTy& X) {
     X.setDeclValues(AD);
-    X.resetExprValues(AD);
+    X.resetBlkExprValues(AD);
   }
     
   bool VisitDeclRefExpr(DeclRefExpr* DR);
@@ -251,7 +251,7 @@ bool TransferFuncs::BlockStmt_VisitExpr(Expr* E) {
 //===----------------------------------------------------------------------===//      
 
 namespace {
-  typedef ExprDeclBitVector_Types::Union Merge;
+  typedef StmtDeclBitVector_Types::Union Merge;
   typedef DataflowSolver<UninitializedValues,TransferFuncs,Merge> Solver;
 }