Don't crash (assert failure) when generating blocks for C++ types with a non-const copy constructor.

This was caused by the code deciding the number of fields in the byref structure using a different test to the part of the code creating the GEPs into said structure.  



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

2 files changed, 21 insertions, 1 deletions

diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index 9fe31cb958..09d3125ce8 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -1850,7 +1850,8 @@ llvm::Type *CodeGenFunction::BuildByRefType(const VarDecl *D) {
   // int32_t __size;
   types.push_back(Int32Ty);
 
-  bool HasCopyAndDispose = getContext().BlockRequiresCopying(Ty);
+  bool HasCopyAndDispose =
+       (Ty->isObjCRetainableType()) || getContext().getBlockVarCopyInits(D);
   if (HasCopyAndDispose) {
     /// void *__copy_helper;
     types.push_back(Int8PtrTy);
diff --git a/test/CodeGenCXX/block.cpp b/test/CodeGenCXX/block.cpp
new file mode 100644
index 0000000000..619d8b0c7b
--- /dev/null
+++ b/test/CodeGenCXX/block.cpp
@@ -0,0 +1,19 @@
+// RUN: %clang_cc1 %s -emit-llvm -o - -fblocks 
+// Just test that this doesn't crash the compiler...
+
+void func(void*);
+
+struct Test
+{
+  virtual void use() { func((void*)this); }
+  Test(Test&c) { func((void*)this); }
+  Test() { func((void*)this); }
+};
+
+void useBlock(void (^)(void));
+
+int main (void) {
+  __block Test t;
+  useBlock(^(void) { t.use(); });
+}
+