From 5811fd6cc45d0af6fc7eb714fa60bf8f1ef5e75f Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Wed, 11 Apr 2012 23:57:12 +0000
Subject: modern objective-c translator. Fixes a mis-translation when of a
 __block struct object. // rdar://11230308

llvm-svn: 154566
---
 clang/lib/Rewrite/RewriteModernObjC.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'clang/lib')

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;
-- 
cgit v1.2.3