diff options
| -rw-r--r-- | lib/Rewrite/RewriteModernObjC.cpp | 9 | ||||
| -rw-r--r-- | test/Rewriter/rewrite-modern-block.mm | 16 |
2 files changed, 23 insertions, 2 deletions
diff --git a/lib/Rewrite/RewriteModernObjC.cpp b/lib/Rewrite/RewriteModernObjC.cpp index 705a046223..041bd60aa3 100644 --- a/lib/Rewrite/RewriteModernObjC.cpp +++ b/lib/Rewrite/RewriteModernObjC.cpp @@ -4814,8 +4814,13 @@ void RewriteModernObjC::RewriteByRefVar(VarDecl *ND, bool firstDecl, bool hasInit = (ND->getInit() != 0); // FIXME. rewriter does not support __block c++ objects which // require construction. - if (hasInit && dyn_cast<CXXConstructExpr>(ND->getInit())) - hasInit = false; + if (hasInit) + if (CXXConstructExpr *CExp = dyn_cast<CXXConstructExpr>(ND->getInit())) { + CXXConstructorDecl *CXXDecl = CExp->getConstructor(); + if (CXXDecl && CXXDecl->isDefaultConstructor()) + hasInit = false; + } + unsigned flags = 0; if (HasCopyAndDispose) flags |= BLOCK_HAS_COPY_DISPOSE; diff --git a/test/Rewriter/rewrite-modern-block.mm b/test/Rewriter/rewrite-modern-block.mm index f446c9c207..675d206c2c 100644 --- a/test/Rewriter/rewrite-modern-block.mm +++ b/test/Rewriter/rewrite-modern-block.mm @@ -46,3 +46,19 @@ int rdar7547630(const char *keybuf, const char *valuebuf) { return BI2; } +// rdar://11326988 +typedef struct _z { + int location; + int length; +} z; + +z w(int loc, int len); + +@interface rdar11326988 +@end +@implementation rdar11326988 +- (void)y:(int)options { + __attribute__((__blocks__(byref))) z firstRange = w(1, 0); + options &= ~(1 | 2); +} +@end |