diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.def | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaStmt.cpp | 2 | ||||
| -rw-r--r-- | test/SemaObjC/catch-stmt.m | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def index 6c635dae58..a691a1f702 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.def +++ b/include/clang/Basic/DiagnosticSemaKinds.def @@ -962,8 +962,8 @@ DIAG(err_attribute_multiple_objc_gc, ERROR, "multiple garbage collection attributes specified for type") DIAG(err_catch_param_not_objc_type, ERROR, "@catch parameter is not an Objective-C class type") -DIAG(warn_ignoring_qualifiers_on_catch_parm, WARNING, - "ignoring qualifiers on @catch parameter") +DIAG(err_illegal_qualifiers_on_catch_parm, ERROR, + "illegal qualifiers on @catch parameter") // C++ casts diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 12db433768..ea9ba4c393 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -974,7 +974,7 @@ Sema::ActOnObjCAtCatchStmt(SourceLocation AtLoc, diag::err_catch_param_not_objc_type)); if (PVD->getType()->isObjCQualifiedIdType()) return StmtError(Diag(PVD->getLocation(), - diag::warn_ignoring_qualifiers_on_catch_parm)); + diag::err_illegal_qualifiers_on_catch_parm)); } ObjCAtCatchStmt *CS = new (Context) ObjCAtCatchStmt(AtLoc, RParen, diff --git a/test/SemaObjC/catch-stmt.m b/test/SemaObjC/catch-stmt.m index 33ad9ddc81..33894a2c0b 100644 --- a/test/SemaObjC/catch-stmt.m +++ b/test/SemaObjC/catch-stmt.m @@ -7,7 +7,7 @@ void f() { } @catch (void a) { // expected-error{{@catch parameter is not an Objective-C class type}} } @catch (int) { // expected-error{{@catch parameter is not an Objective-C class type}} } @catch (int *b) { // expected-error{{@catch parameter is not an Objective-C class type}} - } @catch (id <P> c) { // expected-warning{{ignoring qualifiers on @catch parameter}} + } @catch (id <P> c) { // expected-error{{illegal qualifiers on @catch parameter}} } } |