- Detect ObjC @throw and @catch, diagnose identically to their C++ counterparts.

- Tweak test cases.

Author: Doug Wyatt

clang/lib/Sema/AnalysisBasedWarnings.cpp

@@ -3487,6 +3487,18 @@ class Analyzer {
       return Proceed;
     }
 
+    bool VisitObjCAtThrowStmt(ObjCAtThrowStmt *Throw) {
+      diagnoseLanguageConstruct(FunctionEffect::FE_ExcludeThrow,
+                                DiagnosticID::Throws, Throw->getThrowLoc());
+      return Proceed;
+    }
+
+    bool VisitObjCAtCatchStmt(ObjCAtCatchStmt *Catch) {
+      diagnoseLanguageConstruct(FunctionEffect::FE_ExcludeCatch,
+                                DiagnosticID::Catches, Catch->getAtCatchLoc());
+      return Proceed;
+    }
+
     bool VisitObjCMessageExpr(ObjCMessageExpr *Msg) {
       diagnoseLanguageConstruct(FunctionEffect::FE_ExcludeObjCMessageSend,
                                 DiagnosticID::CallsObjC, Msg->getBeginLoc());

clang/test/Sema/attr-nonblocking-constraints.cpp

@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -fblocks -fcxx-exceptions -verify %s
 // These are in a separate file because errors (e.g. incompatible attributes) currently prevent
-// the AnalysisBasedWarnings pass from running at all.
+// the FXAnalysis pass from running at all.
 
 // This diagnostic is re-enabled and exercised in isolation later in this file.
 #pragma clang diagnostic ignored "-Wperf-constraint-implies-noexcept"
@@ -9,7 +9,8 @@
 
 void nl1() [[clang::nonblocking]]
 {
-	auto* pInt = new int; // expected-warning {{'nonblocking' function must not allocate or deallocate memory}}
+	int *pInt = new int; // expected-warning {{'nonblocking' function must not allocate or deallocate memory}}
+	delete pInt; // expected-warning {{'nonblocking' function must not allocate or deallocate memory}}
 }
 
 void nl2() [[clang::nonblocking]]

clang/test/SemaObjCXX/attr-nonblocking-constraints.mm

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fblocks -fcxx-exceptions -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fblocks -fcxx-exceptions -fobjc-exceptions -verify %s
 
 #pragma clang diagnostic ignored "-Wperf-constraint-implies-noexcept"
 
@@ -7,13 +7,20 @@ @interface OCClass
 - (void)method;
 @end
 
-void nl14(OCClass *oc) [[clang::nonblocking]] {
+void nb1(OCClass *oc) [[clang::nonblocking]] {
 	[oc method]; // expected-warning {{'nonblocking' function must not access an ObjC method or property}}
 }
-void nl15(OCClass *oc) {
+void nb2(OCClass *oc) {
 	[oc method]; // expected-note {{function cannot be inferred 'nonblocking' because it accesses an ObjC method or property}}
 }
-void nl16(OCClass *oc) [[clang::nonblocking]] {
-	nl15(oc); // expected-warning {{'nonblocking' function must not call non-'nonblocking' function 'nl15'}}
+void nb3(OCClass *oc) [[clang::nonblocking]] {
+	nb2(oc); // expected-warning {{'nonblocking' function must not call non-'nonblocking' function 'nb2'}}
 }
 
+void nb4() [[clang::nonblocking]] {
+	@try {
+		@throw @"foo"; // expected-warning {{'nonblocking' function must not throw or catch exceptions}}
+	}
+	@catch (...) { // expected-warning {{'nonblocking' function must not throw or catch exceptions}}
+	}
+}