averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Serialization] Move nonisolated(nonsending) isolation kind above global actor one

Browse Source 
Global actor kind also appends type offset that indicates what
global actor to use with the type. All of the isolation kinds
should be placed above it to make sure that there is never a
clash when i.e. `MainActor` is serialized as id `1`.

Resolves: rdar://153487603
This commit is contained in:
Pavel Yaskevich
2025-07-14 14:21:32 -07:00
parent 439afd6406
commit ace6f738ba
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Serialization/ModuleFormat.h
View File

@@ -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 = 955; // Lifetime dependencies on enum element
const uint16_t SWIFTMODULE_VERSION_MINOR = 956; // 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;

30
test/Concurrency/attr_execution/cross_module.swift Normal file
View File

@@ -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
}