commit 55debeaa0826154650118fec248cdbca0478b77d
author Steve Naroff <snaroff@apple.com> Mon Nov 17 16:28:52 2008 +0000
committer Steve Naroff <snaroff@apple.com> Mon Nov 17 16:28:52 2008 +0000
tree 3bc5e4e86bc5fb5f0fa9a2f1d1b10c611d454fe7
parent 682a8cf9b1b84cc299225acd8e0b38e9a6da08ec

Fix <rdar://problem/6320086> parser rejects block capturing ivar.


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

lib/Sema/Sema.cpp

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index b78336b..6495949 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -241,5 +241,8 @@
 }
 
 ObjCMethodDecl *Sema::getCurMethodDecl() {
-  return dyn_cast<ObjCMethodDecl>(CurContext);
+  DeclContext *DC = CurContext;
+  while (isa<BlockDecl>(DC))
+    DC = DC->getParent();
+  return dyn_cast<ObjCMethodDecl>(DC);
 }