address review feedback and improve diagnostic detail

Author: sophiapoirier

include/swift/AST/DiagnosticsSema.def

@@ -5243,15 +5243,15 @@ NOTE(actor_mutable_state,none,
 WARNING(shared_mutable_state_access,none,
         "reference to %kind0 is not concurrency-safe because it involves "
         "shared mutable state", (const ValueDecl *))
-ERROR(shared_mutable_state_decl,none,
-      "%kind0 is not concurrency-safe because it is global shared mutable "
-      "state", (const ValueDecl *))
+WARNING(shared_mutable_state_decl,none,
+        "%kind0 is not concurrency-safe because it is non-isolated global "
+        "shared mutable state", (const ValueDecl *))
 NOTE(shared_mutable_state_decl_note,none,
-     "isolate %0 to a global actor, or convert it to a constant",
-     (const ValueDecl *))
-ERROR(shared_non_sendable_decl,none,
-      "%kind0 is not concurrency-safe because it does not conform to "
-      "'Sendable'", (const ValueDecl *))
+     "isolate %0 to a global actor, or convert it to a 'let' constant and "
+     "conform it to 'Sendable'", (const ValueDecl *))
+WARNING(shared_immutable_state_decl,none,
+        "%kind0 is not concurrency-safe because it is not either conforming to "
+        "'Sendable' or isolated to a global actor", (const ValueDecl *))
 ERROR(actor_isolated_witness,none,
      "%select{|distributed }0%1 %kind2 cannot be used to satisfy %3 protocol "
      "requirement",

lib/Sema/TypeCheckConcurrency.cpp

@@ -4083,18 +4083,14 @@ ActorIsolation ActorIsolationRequest::evaluate(
       auto *classDecl = var->getDeclContext()->getSelfClassDecl();
       const bool isActorType = classDecl && classDecl->isAnyActor();
       if (isGlobalState && !isActorType) {
-        auto &ctx = var->getASTContext();
         if (var->isLet()) {
           if (!isSendableType(var->getModuleContext(),
                               var->getInterfaceType())) {
-            ctx.Diags.diagnose(var->getLoc(), diag::shared_non_sendable_decl,
-                               var);
+            var->diagnose(diag::shared_immutable_state_decl, var);
           }
         } else {
-          ctx.Diags.diagnose(var->getLoc(), diag::shared_mutable_state_decl,
-                             var);
-          ctx.Diags.diagnose(var->getLoc(),
-                             diag::shared_mutable_state_decl_note, var);
+          var->diagnose(diag::shared_mutable_state_decl, var);
+          var->diagnose(diag::shared_mutable_state_decl_note, var);
         }
       }
     }

test/Concurrency/experimental_feature_strictconcurrency.swift

@@ -29,20 +29,25 @@ actor TestGlobalActor {
 @TestGlobalActor
 var mutableIsolatedGlobal = 1
 
-var mutableNonisolatedGlobal = 1 // expected-error{{var 'mutableNonisolatedGlobal' is not concurrency-safe because it is global shared mutable state}}
-// expected-note@-1{{isolate 'mutableNonisolatedGlobal' to a global actor, or convert it to a constant}}
+var mutableNonisolatedGlobal = 1 // expected-warning{{var 'mutableNonisolatedGlobal' is not concurrency-safe because it is non-isolated global shared mutable state}}
+// expected-note@-1{{isolate 'mutableNonisolatedGlobal' to a global actor, or convert it to a 'let' constant and conform it to 'Sendable'}}
 
 let immutableGlobal = 1
 
 final class TestSendable: Sendable {
   init() {}
 }
 
+final class TestNonsendable {
+  init() {}
+}
+
 struct A {
   static let immutableExplicitSendable = TestSendable()
+  static let immutableNonsendableGlobal = TestNonsendable() // expected-warning{{static property 'immutableNonsendableGlobal' is not concurrency-safe because it is not either conforming to 'Sendable' or isolated to a global actor}}
   static let immutableInferredSendable = 0
-  static var mutable = 0 // expected-error{{static property 'mutable' is not concurrency-safe because it is global shared mutable state}}
-  // expected-note@-1{{isolate 'mutable' to a global actor, or convert it to a constant}}
+  static var mutable = 0 // expected-warning{{static property 'mutable' is not concurrency-safe because it is non-isolated global shared mutable state}}
+  // expected-note@-1{{isolate 'mutable' to a global actor, or convert it to a 'let' constant and conform it to 'Sendable'}}
   // expected-note@-2{{static property declared here}}
 }