From 1ed8e2a39456d064a346a6a5c2f6bd53e6d57345 Mon Sep 17 00:00:00 2001
From: Ted Kremenek <kremenek@apple.com>
Date: Mon, 6 Oct 2008 22:16:13 +0000
Subject: [PATCH] Use DeclStmt::getSolitaryDecl() instead of
 DeclStmt::getDecl() when rewriting Objective-c foreach statements.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57212 91177308-0d34-0410-b5e6-96231b3b80d8
---
 Driver/RewriteObjC.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index 1ec83bf9c8..d23bf2d225 100644
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -1161,11 +1161,12 @@ Stmt *RewriteObjC::RewriteObjCForCollectionStmt(ObjCForCollectionStmt *S,
   buf = "\n{\n\t";
   if (DeclStmt *DS = dyn_cast<DeclStmt>(S->getElement())) {
     // type elem;
-    QualType ElementType = cast<ValueDecl>(DS->getDecl())->getType();
+    ScopedDecl* D = DS->getSolitaryDecl();
+    QualType ElementType = cast<ValueDecl>(D)->getType();
     elementTypeAsString = ElementType.getAsString();
     buf += elementTypeAsString;
     buf += " ";
-    elementName = DS->getDecl()->getName();
+    elementName = D->getName();
     buf += elementName;
     buf += ";\n\t";
   }
-- 
2.40.0