nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call objc_terminate() instead of abort() when a cleanup throws an

Browse Source 
exception in Objective-C;  in Objective-C++ we still use std::terminate().
This is only available in very recent runtimes.

llvm-svn: 134456
This commit is contained in:
John McCall
2011-07-06 01:22:26 +00:00
parent 6dd2417dbe
commit 9de1978f6e
9 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
clang/lib/CodeGen/CGException.cpp
View File

@@ -137,8 +137,17 @@ static llvm::Constant *getTerminateFn(CodeGenFunction &CGF) {
llvm::FunctionType::get(llvm::Type::getVoidTy(CGF.getLLVMContext()),
/*IsVarArgs=*/false);
return CGF.CGM.CreateRuntimeFunction(FTy,
CGF.CGM.getLangOptions().CPlusPlus ? "_ZSt9terminatev" : "abort");
llvm::StringRef name;
// In C++, use std::terminate().
if (CGF.getLangOptions().CPlusPlus)
name = "_ZSt9terminatev"; // FIXME: mangling!
else if (CGF.getLangOptions().ObjC1 &&
CGF.CGM.getCodeGenOpts().ObjCRuntimeHasTerminate)
name = "objc_terminate";
else
name = "abort";
return CGF.CGM.CreateRuntimeFunction(FTy, name);
}
static llvm::Constant *getCatchallRethrowFn(CodeGenFunction &CGF,