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 | 256a76e0b0e0c9e65a3122917d553ef10bc84d29 (patch) | |
tree | eed80264ac453d3e22cd9e9d1b364c41e1a12c5a /lib/Driver/ToolChain.cpp | |
parent | c06e0743431b28c96e0bbe27cc07851d2e0d2681 (diff) |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134456 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/ToolChain.cpp')
-rw-r--r-- | lib/Driver/ToolChain.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp index 0cce517549..74b65918f3 100644 --- a/lib/Driver/ToolChain.cpp +++ b/lib/Driver/ToolChain.cpp @@ -55,12 +55,14 @@ void ToolChain::configureObjCRuntime(ObjCRuntime &runtime) const { // Assume a minimal NeXT runtime. runtime.HasARC = false; runtime.HasWeak = false; + runtime.HasTerminate = false; return; case ObjCRuntime::GNU: // Assume a maximal GNU runtime. runtime.HasARC = true; runtime.HasWeak = true; + runtime.HasTerminate = false; // to be added return; } llvm_unreachable("invalid runtime kind!"); |