diff options
author | Fariborz Jahanian <fjahanian@apple.com> | 2011-06-23 19:00:08 +0000 |
---|---|---|
committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-06-23 19:00:08 +0000 |
commit | cf5abc7ba032bd35158e4d75b0bc92a482fc67e8 (patch) | |
tree | 84687f1541301b30a527f804d1367dca86f61580 /lib/Sema/SemaDeclCXX.cpp | |
parent | b9b4b789ebd28d6fde1c42de820b036ffaf95162 (diff) |
Support for catching objc pointer objects in c++ catch-statement
in fragile abi mode and some other cleanups. // rdar://8940528
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133747 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclCXX.cpp')
-rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 93f97f66ee..a7bd46a2ca 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -8045,14 +8045,8 @@ VarDecl *Sema::BuildExceptionDeclaration(Scope *S, Diag(Loc, diag::err_objc_object_catch); Invalid = true; } else if (T->isObjCObjectPointerType()) { - if (!getLangOptions().ObjCNonFragileABI) { - if (T->isObjCIdType() || T->isObjCQualifiedIdType()) - Diag(Loc, diag::warn_objc_pointer_cxx_catch_fragile); - else { - Diag(Loc, diag::err_objc_pointer_cxx_catch_fragile); - Invalid = true; - } - } + if (!getLangOptions().ObjCNonFragileABI) + Diag(Loc, diag::warn_objc_pointer_cxx_catch_fragile); } } |