summaryrefslogtreecommitdiffstats
path: root/libcxxabi/src/cxa_exception.cpp
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-02-01 18:15:15 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-02-01 18:15:15 +0000
commit8aa78517ab3dff4faeff521bdca94c40419fa204 (patch)
tree941b08c88274461006bf248e6ab3e9aeb225b776 /libcxxabi/src/cxa_exception.cpp
parent6b8ef34f8483dc8ada88d7c35abf9e280d35e584 (diff)
downloadbcm5719-llvm-8aa78517ab3dff4faeff521bdca94c40419fa204.tar.gz
bcm5719-llvm-8aa78517ab3dff4faeff521bdca94c40419fa204.zip
Treat all exceptions except that the ones that this library throws as foreign. Even other C++ exceptions.
llvm-svn: 149518
Diffstat (limited to 'libcxxabi/src/cxa_exception.cpp')
-rw-r--r--libcxxabi/src/cxa_exception.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp
index 0bc8f2ba851..b6b91538458 100644
--- a/libcxxabi/src/cxa_exception.cpp
+++ b/libcxxabi/src/cxa_exception.cpp
@@ -82,8 +82,8 @@ static void setDependentExceptionClass(_Unwind_Exception* unwind_exception) {
// Is it one of ours?
static bool isOurExceptionClass(const _Unwind_Exception* unwind_exception) {
- return (unwind_exception->exception_class & get_language) ==
- (kOurExceptionClass & get_language);
+ return (unwind_exception->exception_class & get_vendor_and_language) ==
+ (kOurExceptionClass & get_vendor_and_language);
}
static bool isDependentException(_Unwind_Exception* unwind_exception) {
OpenPOWER on IntegriCloud