commit e38be617437ccdcc180c5a49e447cbcd07539292
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 49bbb2e609b767a523648d1ac6c2c5714190ac6d
parent e3c60a7ce9e0f42c7ca2344b33203266aceca1db

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


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@119411 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGDecl.cpp

diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index cb0b09d..7ccd80d 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/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;
     }