Handle the case where 'element' in ObjCforCollectionstmt is not a DeclStmt or DeclRefExpr.

llvm-svn: 59290

1 files changed, 8 insertions, 5 deletions

diff --git a/clang/lib/Analysis/LiveVariables.cpp b/clang/lib/Analysis/LiveVariables.cpp
index 98b1ee28209..7b04beb2b5c 100644
--- a/clang/lib/Analysis/LiveVariables.cpp
+++ b/clang/lib/Analysis/LiveVariables.cpp
@@ -184,18 +184,21 @@ TransferFuncs::BlockStmt_VisitObjCForCollectionStmt(ObjCForCollectionStmt* S) {
   
   // This represents a 'kill' for the variable.
   Stmt* Element = S->getElement();
-  DeclRefExpr *DR = 0;
+  DeclRefExpr* DR = 0;
   VarDecl* VD = 0;
   
   if (DeclStmt* DS = dyn_cast<DeclStmt>(Element))
     VD = cast<VarDecl>(DS->getSolitaryDecl());
   else {
-    DR = cast<DeclRefExpr>(Element);
-    VD = cast<VarDecl>(DR->getDecl());
+    Expr* ElemExpr = cast<Expr>(Element)->IgnoreParens();    
+    if ((DR = dyn_cast<DeclRefExpr>(ElemExpr)))
+      VD = cast<VarDecl>(DR->getDecl());
   }
 
-  LiveState(VD, AD) = Dead;
-  if (AD.Observer && DR) { AD.Observer->ObserverKill(DR); }
+  if (VD) {
+    LiveState(VD, AD) = Dead;
+    if (AD.Observer && DR) { AD.Observer->ObserverKill(DR); }
+  }
 }