diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-06-23 21:17:59 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-06-23 21:17:59 +0000 |
| commit | 08e17b506e3c96a2116c3ca708ef7277c6807ce6 (patch) | |
| tree | dc414cf1f9c3f30c614cc6d4ad290f9683cad1e8 | |
| parent | 5c958bb528d9010f11ef9eb4aa779810fc779235 (diff) | |
| download | bcm5719-llvm-08e17b506e3c96a2116c3ca708ef7277c6807ce6.tar.gz bcm5719-llvm-08e17b506e3c96a2116c3ca708ef7277c6807ce6.zip | |
Improve on warning when objc pointer is used in
c++ catch in fragile abi - per Eli's request.
llvm-svn: 133760
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/test/SemaObjCXX/exceptions-fragile.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index fb031596d5b..c734c064e7f 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -3154,7 +3154,7 @@ def err_qualified_objc_catch_parm : Error< def err_objc_pointer_cxx_catch_gnu : Error< "can't catch Objective C exceptions in C++ in the GNU runtime">; def warn_objc_pointer_cxx_catch_fragile : Warning< - "catching Objective C exceptions in C++ in the non-unified " + "can not catch an exception thrown with @throw in C++ in the non-unified " "exception model">, InGroup<ObjCNonUnifiedException>; def err_objc_object_catch : Error< "can't catch an Objective C object by value">; diff --git a/clang/test/SemaObjCXX/exceptions-fragile.mm b/clang/test/SemaObjCXX/exceptions-fragile.mm index ebbf6a0374d..71e259aa6bb 100644 --- a/clang/test/SemaObjCXX/exceptions-fragile.mm +++ b/clang/test/SemaObjCXX/exceptions-fragile.mm @@ -6,7 +6,7 @@ void opaque(); namespace test0 { void test() { try { - } catch (NSException *e) { // expected-warning {{catching Objective C exceptions in C++ in the non-unified exception model [-Wobjc-nonunified-exceptions]}} + } catch (NSException *e) { // expected-warning {{can not catch an exception thrown with @throw in C++ in the non-unified exception model}} } } } |
