1 files changed, 2 insertions, 2 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);
   }
 };