[cfe-commits] r109170 - /cfe/trunk/lib/CodeGen/CGDecl.cpp

[John McCall]

Author: rjmccall
Date: Thu Jul 22 16:25:44 2010
New Revision: 109170

URL: http://llvm.org/viewvc/llvm-project?rev=109170&view=rev
Log:
Turn off EH cleanups for __block variables;  they caused some internal buildbot
failures.  There's a radar tracking this.


Modified:
    cfe/trunk/lib/CodeGen/CGDecl.cpp

Modified: cfe/trunk/lib/CodeGen/CGDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDecl.cpp?rev=109170&r1=109169&r2=109170&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDecl.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDecl.cpp Thu Jul 22 16:25:44 2010
@@ -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)