diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.def | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaStmt.cpp | 19 | ||||
| -rw-r--r-- | test/Parser/objc-try-catch-1.m | 2 | ||||
| -rw-r--r-- | test/SemaObjC/try-catch.m | 6 |
4 files changed, 25 insertions, 4 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def index c58c0750a5..4fed9443d0 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.def +++ b/include/clang/Basic/DiagnosticSemaKinds.def @@ -846,6 +846,8 @@ DIAG(warn_method_not_found_in_protocol, WARNING, "method %objcinstance0 not found in protocol (return type defaults to 'id')") DIAG(error_bad_receiver_type, ERROR, "bad receiver type %0") +DIAG(warn_objc_throw_expects_object, WARNING, + "invalid %0 argument (expected an ObjC object type)") // C++ casts diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 18d9ad6f8b..f4eb22df1f 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -981,9 +981,22 @@ Sema::ActOnObjCAtTryStmt(SourceLocation AtLoc, } Action::OwningStmtResult -Sema::ActOnObjCAtThrowStmt(SourceLocation AtLoc, ExprArg Throw) { - return Owned(new (Context) ObjCAtThrowStmt(AtLoc, - static_cast<Expr*>(Throw.release()))); +Sema::ActOnObjCAtThrowStmt(SourceLocation AtLoc, ExprArg expr) { + Expr *ThrowExpr = static_cast<Expr*>(expr.release()); + if (!ThrowExpr) { + // FIXME: verify the 'rethrow' is within a @catch block + } else { + QualType ThrowType = ThrowExpr->getType(); + // Make sure the expression type is an ObjC pointer or "void *". + if (!Context.isObjCObjectPointerType(ThrowType)) { + const PointerType *PT = ThrowType->getAsPointerType(); + if (!PT || !PT->getPointeeType()->isVoidType()) + // This should be an error, however GCC only yields a warning. + Diag(AtLoc, diag::warn_objc_throw_expects_object) + << ThrowExpr->getType() << ThrowExpr->getSourceRange(); + } + } + return Owned(new (Context) ObjCAtThrowStmt(AtLoc, ThrowExpr)); } Action::OwningStmtResult diff --git a/test/Parser/objc-try-catch-1.m b/test/Parser/objc-try-catch-1.m index 2e3c5b14a3..0e8a91977d 100644 --- a/test/Parser/objc-try-catch-1.m +++ b/test/Parser/objc-try-catch-1.m @@ -27,7 +27,7 @@ void * foo() return proc(); } @catch (Frob* ex) { - @throw 1,2; + @throw 1,2; // expected-warning {{invalid 'int' argument (expected an ObjC object type)}} } @catch(...) { @throw (4,3,proc()); diff --git a/test/SemaObjC/try-catch.m b/test/SemaObjC/try-catch.m index e4c20b7343..00f1129d31 100644 --- a/test/SemaObjC/try-catch.m +++ b/test/SemaObjC/try-catch.m @@ -35,3 +35,9 @@ typedef struct _NSZone NSZone; // the exception name is optional (weird) @catch (NSException *) {} } +@end + +int foo() { + @throw 42; // expected-warning {{invalid 'int' argument (expected an ObjC object type)}} + @throw; // FIXME: error: ‘@throw’ (rethrow) used outside of a @catch block +} |