diff options
| author | John McCall <rjmccall@apple.com> | 2010-10-06 18:56:43 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-10-06 18:56:43 +0000 |
| commit | 34fdee3771efcfc02333d0d99f29d01a7d2e2d27 (patch) | |
| tree | 94d452a816b2a41d56939cc4c06098117482fc3a /lib/CodeGen/CGDecl.cpp | |
| parent | edd59112ab812ad498b8cc29ad2b6e2b90de787a (diff) | |
Re-enable EH cleanups to destroy __block variables, now that we have a moment to
deal with the consequences. Fixes rdar://problem/8224178.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@115816 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGDecl.cpp')
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index b743c0c6b4..e1be2d29be 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -806,9 +806,8 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &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>(NormalCleanup, DeclPtr); + EHStack.pushCleanup<CallBlockRelease>(NormalAndEHCleanup, DeclPtr); } /// Emit an alloca (or GlobalValue depending on target) |