From db2cfecf0eb6683be103b8550026817426da2d42 Mon Sep 17 00:00:00 2001 From: John McCall Date: Thu, 22 Jul 2010 21:25:44 +0000 Subject: [PATCH] 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 --- lib/CodeGen/CGDecl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(NormalAndEHCleanup, DeclPtr); + EHStack.pushCleanup(NormalCleanup, DeclPtr); } /// Emit an alloca (or GlobalValue depending on target) -- 2.40.0