Turn off EH cleanups for __block variables; they caused some internal buildbot
failures. There's a radar tracking this.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@109170 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index 7dcd465..c4ce008 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -804,8 +804,10 @@
F, &Info, DeclPtr, &D);
}
+ // If this is a block variable, clean it up.
+ // FIXME: this should be an EH cleanup as well. rdar://problem/8224178
if (needsDispose && CGM.getLangOptions().getGCMode() != LangOptions::GCOnly)
- EHStack.pushCleanup<CallBlockRelease>(NormalAndEHCleanup, DeclPtr);
+ EHStack.pushCleanup<CallBlockRelease>(NormalCleanup, DeclPtr);
}
/// Emit an alloca (or GlobalValue depending on target)