summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2011-06-23 19:00:08 +0000
committerFariborz Jahanian <fjahanian@apple.com>2011-06-23 19:00:08 +0000
commit831f0fc2e0cd38da906cbb7b6a6d94b0024d04bf (patch)
tree44caf453522870f8edf896c2fd36a1469396b696 /clang/lib/Sema/SemaDeclCXX.cpp
parent402491558b93497e8c464d2971ab08a1b2a47e61 (diff)
downloadbcm5719-llvm-831f0fc2e0cd38da906cbb7b6a6d94b0024d04bf.tar.gz
bcm5719-llvm-831f0fc2e0cd38da906cbb7b6a6d94b0024d04bf.zip
Support for catching objc pointer objects in c++ catch-statement
in fragile abi mode and some other cleanups. // rdar://8940528 llvm-svn: 133747
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 93f97f66eec..a7bd46a2ca7 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/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);
}
}
OpenPOWER on IntegriCloud