commit a00076cda5ed9dec83b851f165eb335782d71d92
author Fariborz Jahanian <fjahanian@apple.com> Wed Nov 17 00:21:28 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Nov 17 00:21:28 2010 +0000
tree d19e985f3b7f378d519b91d1bf8214a9b8b372f8
parent 68dbaead7b3ecd2a13e38488e4aa32c363733d4d

Fixes synthesis of type for the object which holds info.
about a __block cxx object.

llvm-svn: 119411

clang/lib/CodeGen/CGDecl.cpp

diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index cb0b09d..7ccd80d 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -659,7 +659,8 @@
     if (Ty->isBlockPointerType()) {
       flag |= BLOCK_FIELD_IS_BLOCK;
       flags |= BLOCK_HAS_COPY_DISPOSE;
-    } else if (BlockRequiresCopying(Ty)) {
+    } else if (getContext().isObjCNSObjectType(Ty) || 
+               Ty->isObjCObjectPointerType()) {
       flag |= BLOCK_FIELD_IS_OBJECT;
       flags |= BLOCK_HAS_COPY_DISPOSE;
     }