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 | 775f9f9919c658967a1f5c32c6466d8c824b9442 (patch) | |
| tree | a5454c86010504f026dcf7f489af979ed746e42e /clang/lib/CodeGen/CGDecl.cpp | |
| parent | aba8ee38c27eba47b2ef610d25122c5ef947df0c (diff) | |
| download | bcm5719-llvm-775f9f9919c658967a1f5c32c6466d8c824b9442.tar.gz bcm5719-llvm-775f9f9919c658967a1f5c32c6466d8c824b9442.zip | |
Turn off EH cleanups for __block variables; they caused some internal buildbot
failures. There's a radar tracking this.
llvm-svn: 109170
Diffstat (limited to 'clang/lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGDecl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp index 7dcd465de77..c4ce008748a 100644 --- a/clang/lib/CodeGen/CGDecl.cpp +++ b/clang/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) |
