3 files changed, 5 insertions, 17 deletions
diff --git a/Analysis/GRCoreEngine.cpp b/Analysis/GRCoreEngine.cpp
index 4eb024f036..cff33373cf 100644
--- a/Analysis/GRCoreEngine.cpp
+++ b/Analysis/GRCoreEngine.cpp
@@ -113,7 +113,8 @@ bool GRCoreEngineImpl::ExecuteWorkList(unsigned Steps) {
   return WList->hasWork();
 }
 
-void GRCoreEngineImpl::HandleBlockEdge(const BlockEdge& L, ExplodedNodeImpl* Pred) {
+void GRCoreEngineImpl::HandleBlockEdge(const BlockEdge& L,
+                                       ExplodedNodeImpl* Pred) {
   
   CFGBlock* Blk = L.getDst();
   
@@ -144,7 +145,7 @@ void GRCoreEngineImpl::HandleBlockEdge(const BlockEdge& L, ExplodedNodeImpl* Pre
 }
 
 void GRCoreEngineImpl::HandleBlockEntrance(const BlockEntrance& L,
-                                       ExplodedNodeImpl* Pred) {
+                                           ExplodedNodeImpl* Pred) {
   
   // Increment the block counter.
   GRBlockCounter Counter = WList->getBlockCounter();
diff --git a/Analysis/GRExprEngine.cpp b/Analysis/GRExprEngine.cpp
index 4cd942b57e..77e97875d0 100644
--- a/Analysis/GRExprEngine.cpp
+++ b/Analysis/GRExprEngine.cpp
@@ -69,20 +69,6 @@ ValueState* GRExprEngine::SetRVal(ValueState* St, Expr* Ex, RVal V) {
   return StateMgr.SetRVal(St, Ex, V, isBlkExpr, false);
 }
 
-#if 0
-const ValueState::BufferTy&
-GRExprEngine::SetRVal(ValueState* St, Expr* Ex, const RVal::BufferTy& RB,
-                      ValueState::BufferTy& RetBuf) {
-  
-  assert (RetBuf.empty());
-  
-  for (RVal::BufferTy::const_iterator I = RB.begin(), E = RB.end(); I!=E; ++I)
-    RetBuf.push_back(SetRVal(St, Ex, *I));
-                     
-  return RetBuf;
-}
-#endif
-
 ValueState* GRExprEngine::SetRVal(ValueState* St, LVal LV, RVal RV) {
   
   if (!StateCleaned) {
diff --git a/Analysis/LiveVariables.cpp b/Analysis/LiveVariables.cpp
index 52f7f4d19b..9515cb8eb7 100644
--- a/Analysis/LiveVariables.cpp
+++ b/Analysis/LiveVariables.cpp
@@ -86,7 +86,8 @@ void TransferFuncs::Visit(Stmt *S) {
     AD.Observer->ObserveStmt(S,AD,LiveState);
   
   if (S == getCurrentBlkStmt()) {
-    if (getCFG().isBlkExpr(S)) LiveState(S,AD) = Dead;
+    assert (!isa<Expr>(S) || getCFG().isBlkExpr(S));
+    if (isa<Expr>(S)) LiveState(S,AD) = Dead;
     StmtVisitor<TransferFuncs,void>::Visit(S);
   }
   else if (!getCFG().isBlkExpr(S))