diff options
| author | John McCall <rjmccall@apple.com> | 2011-07-06 01:22:26 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2011-07-06 01:22:26 +0000 |
| commit | 9de1978f6e03619f5ca292a1525279a3d5a98c7a (patch) | |
| tree | cf20cb67825fbb6dddc0ee806662dc90d42c277f /clang/lib/CodeGen/CGException.cpp | |
| parent | 6dd2417dbeac1716e0c0af9e0c156d61f47850c1 (diff) | |
| download | bcm5719-llvm-9de1978f6e03619f5ca292a1525279a3d5a98c7a.tar.gz bcm5719-llvm-9de1978f6e03619f5ca292a1525279a3d5a98c7a.zip | |
Call objc_terminate() instead of abort() when a cleanup throws an
exception in Objective-C; in Objective-C++ we still use std::terminate().
This is only available in very recent runtimes.
llvm-svn: 134456
Diffstat (limited to 'clang/lib/CodeGen/CGException.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGException.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 1a4a5f988a5..af54f396868 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -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, |
