diff options
| author | John McCall <rjmccall@apple.com> | 2010-07-22 21:25:44 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-07-22 21:25:44 +0000 |
| commit | db2cfecf0eb6683be103b8550026817426da2d42 (patch) | |
| tree | 919f4f7b974c959d0725eeb0faab0132b061c407 /lib/CodeGen/CGDecl.cpp | |
| parent | a8e5c5bdbe387b2552c1c23b828f54abcf085a40 (diff) | |
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
Diffstat (limited to 'lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 7dcd465de7..c4ce008748 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -804,8 +804,10 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D, 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) |