[cfe-commits] r47955 - in /cfe/trunk/Analysis: GRCoreEngine.cpp GRExprEngine.cpp LiveVariables.cpp

[Ted Kremenek]

Author: kremenek
Date: Wed Mar  5 13:08:15 2008
New Revision: 47955

URL: http://llvm.org/viewvc/llvm-project?rev=47955&view=rev
Log:
Minor cleanups (mainly indentation).

Modified:
    cfe/trunk/Analysis/GRCoreEngine.cpp
    cfe/trunk/Analysis/GRExprEngine.cpp
    cfe/trunk/Analysis/LiveVariables.cpp

Modified: cfe/trunk/Analysis/GRCoreEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/GRCoreEngine.cpp?rev=47955&r1=47954&r2=47955&view=diff

==============================================================================
--- cfe/trunk/Analysis/GRCoreEngine.cpp (original)
+++ cfe/trunk/Analysis/GRCoreEngine.cpp Wed Mar  5 13:08:15 2008
@@ -113,7 +113,8 @@
   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::HandleBlockEntrance(const BlockEntrance& L,
-                                       ExplodedNodeImpl* Pred) {
+                                           ExplodedNodeImpl* Pred) {
   
   // Increment the block counter.
   GRBlockCounter Counter = WList->getBlockCounter();

Modified: cfe/trunk/Analysis/GRExprEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/GRExprEngine.cpp?rev=47955&r1=47954&r2=47955&view=diff

==============================================================================
--- cfe/trunk/Analysis/GRExprEngine.cpp (original)
+++ cfe/trunk/Analysis/GRExprEngine.cpp Wed Mar  5 13:08:15 2008
@@ -69,20 +69,6 @@
   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) {

Modified: cfe/trunk/Analysis/LiveVariables.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Analysis/LiveVariables.cpp?rev=47955&r1=47954&r2=47955&view=diff

==============================================================================
--- cfe/trunk/Analysis/LiveVariables.cpp (original)
+++ cfe/trunk/Analysis/LiveVariables.cpp Wed Mar  5 13:08:15 2008
@@ -86,7 +86,8 @@
     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))