summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-04-11 23:57:12 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-04-11 23:57:12 +0000
commit5811fd6cc45d0af6fc7eb714fa60bf8f1ef5e75f (patch)
treeb31d64a2c4d827734f0a31d281e64d2f993955f9 /clang/lib
parente9c64d104f3574210c095e153fa4d6c92c46486e (diff)
downloadbcm5719-llvm-5811fd6cc45d0af6fc7eb714fa60bf8f1ef5e75f.tar.gz
bcm5719-llvm-5811fd6cc45d0af6fc7eb714fa60bf8f1ef5e75f.zip
modern objective-c translator. Fixes a mis-translation when
of a __block struct object. // rdar://11230308 llvm-svn: 154566
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Rewrite/RewriteModernObjC.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Rewrite/RewriteModernObjC.cpp b/clang/lib/Rewrite/RewriteModernObjC.cpp
index fd433f88c2e..fd621a2a5cc 100644
--- a/clang/lib/Rewrite/RewriteModernObjC.cpp
+++ b/clang/lib/Rewrite/RewriteModernObjC.cpp
@@ -4812,6 +4812,10 @@ void RewriteModernObjC::RewriteByRefVar(VarDecl *ND) {
// {0, &ND, some_flag, __size=sizeof(struct __Block_byref_ND),
// initializer-if-any};
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;
unsigned flags = 0;
if (HasCopyAndDispose)
flags |= BLOCK_HAS_COPY_DISPOSE;
OpenPOWER on IntegriCloud