diff options
| -rw-r--r-- | lib/Frontend/RewriteObjC.cpp | 4 | ||||
| -rw-r--r-- | test/Rewriter/rewrite-block-pointer.mm | 25 |
2 files changed, 29 insertions, 0 deletions
diff --git a/lib/Frontend/RewriteObjC.cpp b/lib/Frontend/RewriteObjC.cpp index 0156d1da91..521abf489b 100644 --- a/lib/Frontend/RewriteObjC.cpp +++ b/lib/Frontend/RewriteObjC.cpp @@ -2815,6 +2815,10 @@ Stmt *RewriteObjC::SynthMessageExpr(ObjCMessageExpr *Exp, } returnType = OMD->getResultType()->isObjCQualifiedIdType() ? Context->getObjCIdType() : OMD->getResultType(); + if (isTopLevelBlockPointerType(returnType)) { + const BlockPointerType *BPT = returnType->getAs<BlockPointerType>(); + returnType = Context->getPointerType(BPT->getPointeeType()); + } } else { returnType = Context->getObjCIdType(); } diff --git a/test/Rewriter/rewrite-block-pointer.mm b/test/Rewriter/rewrite-block-pointer.mm index 4a4fa34708..8698b93c18 100644 --- a/test/Rewriter/rewrite-block-pointer.mm +++ b/test/Rewriter/rewrite-block-pointer.mm @@ -3,6 +3,7 @@ // radar 7638400 typedef void * id; +void *sel_registerName(const char *); @interface X @end @@ -33,3 +34,27 @@ void *_Block_copy(const void *aBlock); void x(void (^block)(void)) { block = ((__typeof(block))_Block_copy((const void *)(block))); } + +// radar 7682149 +@interface Y { +@private + id _private; +} +- (void (^)(void))f; +@end + +typedef void (^void_block_t)(void); + +@interface YY { + void_block_t __completion; +} +@property (copy) void_block_t f; +@end + +@implementation Y +- (void (^)(void))f { + return [_private f]; +} + +@end + |