[Sema] Check that all callee decls in a function scope have attribute before downgrading diagnostic to warning

Author: angela-laar

lib/Sema/TypeCheckConcurrency.cpp

@@ -2145,11 +2145,13 @@ namespace {
         DiagnosticList errors = list.getSecond();
         ActorIsolation isolation = key.second;
 
-        auto behavior = DiagnosticBehavior::Error;
-
-        // Limit behavior if @preconcurrency detected
-        if (errors.front().preconcurrency)
-          behavior = DiagnosticBehavior::Warning;
+        auto behavior = DiagnosticBehavior::Warning;
+        // Upgrade behavior if @preconcurrency not detected
+        if (llvm::any_of(errors, [&](IsolationError error) {
+          return !error.preconcurrency;
+        })) {
+          behavior = DiagnosticBehavior::Error;
+        }
 
         // Add Fix-it for missing @SomeActor annotation
         if (isolation.isGlobalActor()) {
@@ -2174,11 +2176,14 @@ namespace {
         DiagnosticList errors = list.getSecond();
         ActorIsolation isolation = key.first;
 
-        auto behavior = DiagnosticBehavior::Error;
+        auto behavior = DiagnosticBehavior::Warning;
+        // Upgrade behavior if @preconcurrency not detected
+        if (llvm::any_of(errors, [&](IsolationError error) {
+          return !error.preconcurrency;
+        })) {
+          behavior = DiagnosticBehavior::Error;
+        }
 
-        // Limit behavior if @preconcurrency detected
-        if (errors.front().preconcurrency)
-          behavior = DiagnosticBehavior::Warning;
 
         // Add Fix-it for missing @SomeActor annotation
         if (isolation.isGlobalActor()) {
@@ -2194,7 +2199,7 @@ namespace {
           // Diagnose actor_isolated_call as note if
           // if there are multiple actor-isolated function calls
           // from outside the actor
-            ctx.Diags.diagnose(error.loc, error.diag)
+          ctx.Diags.diagnose(error.loc, error.diag)
             .limitBehaviorUntilSwiftVersion(behavior, 6);
         }
       }
@@ -3458,7 +3463,8 @@ namespace {
 
           IsolationError mismatch([calleeDecl, apply, unsatisfiedIsolation, getContextIsolation]() {
             if (calleeDecl) {
-              auto preconcurrency = getContextIsolation().preconcurrency() || getActorIsolation(calleeDecl).preconcurrency();
+              auto preconcurrency = getContextIsolation().preconcurrency() || 
+                getActorIsolation(calleeDecl).preconcurrency();
 
               return IsolationError(
                              apply->getLoc(),
@@ -3488,7 +3494,8 @@ namespace {
           }
         } else {
           if (calleeDecl) {
-            auto preconcurrency = getContextIsolation().preconcurrency() || getActorIsolation(calleeDecl).preconcurrency();
+            auto preconcurrency = getContextIsolation().preconcurrency() ||
+              getActorIsolation(calleeDecl).preconcurrency();
 
             ctx.Diags.diagnose(
                                apply->getLoc(), diag::actor_isolated_call_decl,

test/Concurrency/grouped_actor_isolation_diagnostics.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature GroupActorErrors
+// RUN: %target-typecheck-verify-swift -disable-availability-checking -enable-experimental-feature GroupActorErrors  -strict-concurrency=complete
 // REQUIRES: concurrency
 
 @MainActor
@@ -7,19 +7,25 @@ protocol P {
   nonisolated func g()
 }
 
+@preconcurrency @MainActor
+protocol Q {
+  func f()
+  nonisolated func g()
+}
+
 struct S: P {
   func f() { }
   func g() { }
 }
 
-@preconcurrency struct NonConcurrentS: P {
+@preconcurrency
+struct NonConcurrentS: Q {
   func f() { }
   func g() { }
 }
 
 // expected-note@+1{{add '@MainActor' to make global function 'testP(s:p:)' part of global actor 'MainActor'}}
 func testP(s: S, p: P) { // expected-error {{calls to '@MainActor'-isolated' code in global function 'testP(s:p:)'}}
-
   p.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
   p.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
   p.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
@@ -29,8 +35,20 @@ func testP(s: S, p: P) { // expected-error {{calls to '@MainActor'-isolated' cod
   s.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
   s.g() // OKAY
 }
-// expected-note @+1{{add '@MainActor' to make global function 'testPreconcurrencyP(ncs:)' part of global actor 'MainActor'}}
-func testPreconcurrencyP(ncs: NonConcurrentS) { // expected-error {{calls to '@MainActor'-isolated' code in global function 'testPreconcurrencyP(ncs:)'}}
+// expected-note @+1{{add '@MainActor' to make global function 'testPreconcurrency(ncs:s:)' part of global actor 'MainActor'}}
+func testPreconcurrency(ncs: NonConcurrentS, s:S ) { // expected-error {{calls to '@MainActor'-isolated' code in global function 'testPreconcurrency(ncs:s:)'}}
+  ncs.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
+  ncs.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
+  ncs.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
+  ncs.g() // OKAY
+  s.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
+  s.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
+  s.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
+  s.g() // OKAY
+}
+
+// expected-note @+1{{add '@MainActor' to make global function 'testOnlyPreconcurrency(ncs:)' part of global actor 'MainActor'}}
+func testOnlyPreconcurrency(ncs: NonConcurrentS) { // expected-warning {{calls to '@MainActor'-isolated' code in global function 'testOnlyPreconcurrency(ncs:)'}}
   ncs.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
   ncs.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}
   ncs.f() // expected-note{{call to main actor-isolated instance method 'f()' in a synchronous nonisolated context}}