diff options
| -rw-r--r-- | lib/Sema/Sema.cpp | 5 | ||||
| -rw-r--r-- | test/SemaObjC/block-ivar.m | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp index b78336b6cd..6495949526 100644 --- a/lib/Sema/Sema.cpp +++ b/lib/Sema/Sema.cpp @@ -241,5 +241,8 @@ const LangOptions &Sema::getLangOptions() const { } ObjCMethodDecl *Sema::getCurMethodDecl() { - return dyn_cast<ObjCMethodDecl>(CurContext); + DeclContext *DC = CurContext; + while (isa<BlockDecl>(DC)) + DC = DC->getParent(); + return dyn_cast<ObjCMethodDecl>(DC); } diff --git a/test/SemaObjC/block-ivar.m b/test/SemaObjC/block-ivar.m new file mode 100644 index 0000000000..d1f56b651d --- /dev/null +++ b/test/SemaObjC/block-ivar.m @@ -0,0 +1,19 @@ +// RUN: clang -fsyntax-only -verify %s + +@interface NSObject { + struct objc_object *isa; +} +@end +@interface Foo : NSObject { + int _prop; +} +@end + +@implementation Foo +- (int)doSomething { + int (^blk)(void) = ^{ return _prop; }; + return blk(); +} + +@end + |