Merge pull request #83048 from xedin/rdar-153487603-6.2

[6.2][Serialization] Move `nonisolated(nonsending)` isolation kind above g…

Author: xedin

lib/Serialization/ModuleFormat.h

@@ -58,7 +58,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
 /// describe what change you made. The content of this comment isn't important;
 /// it just ensures a conflict if two people change the module format.
 /// Don't worry about adhering to the 80-column limit for this line.
-const uint16_t SWIFTMODULE_VERSION_MINOR = 943; // Lifetime dependencies on enum element
+const uint16_t SWIFTMODULE_VERSION_MINOR = 944; // nonisolated(nonsending) isolation was moved
 
 /// A standard hash seed used for all string hashes in a serialized module.
 ///
@@ -707,8 +707,9 @@ enum class FunctionTypeIsolation : uint8_t {
   NonIsolated,
   Parameter,
   Erased,
-  GlobalActorOffset, // Add this to the global actor type ID
   NonIsolatedCaller,
+  // NOTE: All of the new kinds should be added above.
+  GlobalActorOffset, // Add this to the global actor type ID
 };
 using FunctionTypeIsolationField = TypeIDField;
 

test/Concurrency/attr_execution/cross_module.swift

@@ -0,0 +1,30 @@
+// RUN: %empty-directory(%t/src)
+// RUN: split-file %s %t/src
+
+/// Build the library A
+// RUN: %target-swift-frontend -emit-module %t/src/A.swift \
+// RUN:   -module-name A -swift-version 6 -enable-library-evolution \
+// RUN:   -emit-module-path %t/A.swiftmodule \
+// RUN:   -emit-module-interface-path %t/A.swiftinterface
+
+// Build the client using module
+// RUN: %target-swift-emit-sil -verify -module-name Client -I %t %t/src/Client.swift
+
+// RUN: rm %t/A.swiftmodule
+
+// Re-build the client using interface
+// RUN: %target-swift-emit-sil -verify -module-name Client -I %t %t/src/Client.swift
+
+//--- A.swift
+@MainActor
+public final class Test {
+  public func test(_: @escaping @Sendable @MainActor () -> Void) {}
+}
+
+//--- Client.swift
+import A
+
+@MainActor
+func test(t: Test, fn: @escaping @Sendable @MainActor () -> Void) {
+  t.test(fn) // Ok
+}