Don't assert when we think we need copy/dispose, but don't need them.
Radar 6838889
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70525 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index 8ab4a44..dee9d4c 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -158,6 +158,8 @@
BlockHasCopyDispose |= subBlockHasCopyDispose;
Elts[3] = Fn;
+ // FIXME: Don't use BlockHasCopyDispose, it is set more often then necessary, for
+ // example: { ^{ __block int i; ^{ i = 1; }(); }(); }
if (subBlockHasCopyDispose)
flags |= BLOCK_HAS_COPY_DISPOSE;
@@ -557,7 +559,6 @@
subBlockHasCopyDispose);
assert(subBlockSize == BlockLiteralSize
&& "no imports allowed for global block");
- assert(!subBlockHasCopyDispose && "no imports allowed for global block");
// isa
LiteralFields[0] = getNSConcreteGlobalBlock();