From 9d40ee50f8a013e5253101648092cf0daa76c335 Mon Sep 17 00:00:00 2001 From: Steve Naroff Date: Tue, 3 Mar 2009 21:16:54 +0000 Subject: [PATCH] Fix [sema] qualified id should be disallowed in @catch statements. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65969 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/DiagnosticSemaKinds.def | 2 ++ lib/Sema/SemaStmt.cpp | 11 ++++++++--- test/SemaObjC/catch-stmt.m | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def index c02ee6e538..f1495a2ef4 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.def +++ b/include/clang/Basic/DiagnosticSemaKinds.def @@ -962,6 +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") // C++ casts diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 7e7edbe51a..12db433768 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -968,9 +968,14 @@ Sema::ActOnObjCAtCatchStmt(SourceLocation AtLoc, ParmVarDecl *PVD = static_cast(Parm); // PVD == 0 implies @catch(...). - if (PVD && !Context.isObjCObjectPointerType(PVD->getType())) - return StmtError(Diag(PVD->getLocation(), - diag::err_catch_param_not_objc_type)); + if (PVD) { + if (!Context.isObjCObjectPointerType(PVD->getType())) + return StmtError(Diag(PVD->getLocation(), + diag::err_catch_param_not_objc_type)); + if (PVD->getType()->isObjCQualifiedIdType()) + return StmtError(Diag(PVD->getLocation(), + diag::warn_ignoring_qualifiers_on_catch_parm)); + } ObjCAtCatchStmt *CS = new (Context) ObjCAtCatchStmt(AtLoc, RParen, PVD, static_cast(Body.release()), CatchList); diff --git a/test/SemaObjC/catch-stmt.m b/test/SemaObjC/catch-stmt.m index 9aa6e057f4..33ad9ddc81 100644 --- a/test/SemaObjC/catch-stmt.m +++ b/test/SemaObjC/catch-stmt.m @@ -1,10 +1,13 @@ // RUN: clang -verify %s +@protocol P; + void f() { @try { } @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

c) { // expected-warning{{ignoring qualifiers on @catch parameter}} } } -- 2.40.0