diff options
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 11 | ||||
| -rw-r--r-- | test/SemaObjC/catch-invalid.m | 9 |
2 files changed, 17 insertions, 3 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 87d37e6825..d7544ecfaf 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -4838,12 +4838,17 @@ VarDecl *Sema::BuildObjCExceptionDecl(TypeSourceInfo *TInfo, QualType T, // Don't do any further checking. } else if (T->isDependentType()) { // Okay: we don't know what this type will instantiate to. - } else if (!T->isObjCObjectPointerType()) { - Invalid = true; - Diag(IdLoc ,diag::err_catch_param_not_objc_type); } else if (T->isObjCQualifiedIdType()) { Invalid = true; Diag(IdLoc, diag::err_illegal_qualifiers_on_catch_parm); + } else if (T->isObjCIdType()) { + // Okay: we don't know what this type will instantiate to. + } else if (!T->isObjCObjectPointerType()) { + Invalid = true; + Diag(IdLoc, diag::err_catch_param_not_objc_type); + } else if (!T->getAs<ObjCObjectPointerType>()->getInterfaceType()) { + Invalid = true; + Diag(IdLoc, diag::err_catch_param_not_objc_type); } VarDecl *New = VarDecl::Create(Context, CurContext, StartLoc, IdLoc, Id, diff --git a/test/SemaObjC/catch-invalid.m b/test/SemaObjC/catch-invalid.m new file mode 100644 index 0000000000..352b2fbaa8 --- /dev/null +++ b/test/SemaObjC/catch-invalid.m @@ -0,0 +1,9 @@ +// RUN: %clang_cc1 -triple thumbv7-unknown-windows-msvc -fobjc-exceptions -fobjc-runtime=ios -verify %s + +extern void g(void); +void f() { + @try { + g(); + } @catch (Class c) { // expected-error{{@catch parameter is not a pointer to an interface type}} + } +} |