Merge pull request swiftlang#75112 from xedin/rdar-130776220-6.0

[6.0][Concurrency] Fix disallowed override isolation to carry `@preconcurr…

Author: xedin

lib/Sema/TypeCheckConcurrency.cpp

@@ -5280,7 +5280,12 @@ ActorIsolation ActorIsolationRequest::evaluate(
           break;
 
         case OverrideIsolationResult::Disallowed:
-          inferred = *overriddenIso;
+          if (overriddenValue->hasClangNode() &&
+              overriddenIso->isUnspecified()) {
+            inferred = overriddenIso->withPreconcurrency(true);
+          } else {
+            inferred = *overriddenIso;
+          }
           break;
         }
       }

test/ClangImporter/objc_isolation_complete.swift

@@ -31,3 +31,16 @@ class IsolatedSub: NXSender {
     return mainActorState
   }
 }
+
+@objc
+@MainActor
+class Test : NSObject {
+  static var shared: Test? // expected-note {{mutation of this static property is only permitted within the actor}}
+
+  override init() {
+    super.init()
+
+    Self.shared = self
+    // expected-warning@-1 {{main actor-isolated static property 'shared' can not be mutated from a nonisolated context; this is an error in the Swift 6 language mode}}
+  }
+}