commit 5d9b6bf9de98a33427fc7a3beeca90a3002b4744
author Fariborz Jahanian <fjahanian@apple.com> Wed Jun 29 18:41:17 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Jun 29 18:41:17 2011 +0000
tree 57e0d2a0c0e54abbd68dc7e6b0fc6ad828485af6
parent c3151c4328ad7233a269a53e8d523e1f0562594d

Use existing -fcatch-undefined-behavior option,
replacing -freset-local-blocks. // rdar://9227352


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134082 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGBlocks.cpp

diff --git a/lib/CodeGen/CGBlocks.cpp b/lib/CodeGen/CGBlocks.cpp
index 20b5c9b..3488f2e 100644
--- a/lib/CodeGen/CGBlocks.cpp
+++ b/lib/CodeGen/CGBlocks.cpp
@@ -665,7 +665,7 @@
   llvm::Value *result =
     Builder.CreateBitCast(blockAddr,
                           ConvertType(blockInfo.getBlockExpr()->getType()));
-  if (getLangOptions().ResetLocalBlocks)
+  if (getLangOptions().CatchUndefined)
     EHStack.pushCleanup<CallMemsetLocalBlockObject>(NormalCleanup, blockAddr, 
                                                     blockInfo.BlockSize);