Fixed horrid bug in LiveVariables analysis where we were only merging at

confluence points the liveness information for variables (Decls) and NOT
block-level expressions.

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

diff --git a/Analysis/LiveVariables.cpp b/Analysis/LiveVariables.cpp
index 59039fb14af2c6d8ff0e2d8d4f565c02bbd83687..1201eb021d7497d0bc36d92aabf02006d3ab0ce2 100644 (file)
--- a/Analysis/LiveVariables.cpp
+++ b/Analysis/LiveVariables.cpp
@@ -173,7 +173,7 @@ void TransferFuncs::VisitDeclStmt(DeclStmt* DS) {
 //===----------------------------------------------------------------------===//      
 
 namespace {
-typedef DeclBitVector_Types::Union Merge;
+typedef ExprDeclBitVector_Types::Union Merge;
 typedef DataflowSolver<LiveVariables,TransferFuncs,Merge> Solver;
 } // end anonymous namespace