Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SE-0466: Add support for -default-isolation flag #1850

Merged
merged 1 commit into from
Mar 24, 2025
Merged

SE-0466: Add support for -default-isolation flag #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,9 @@ extension Driver {
if isFrontendArgSupported(.strictConcurrency) {
try commandLine.appendLast(.strictConcurrency, from: &parsedOptions)
}
if isFrontendArgSupported(.defaultIsolation) {
try commandLine.appendLast(.defaultIsolation, from: &parsedOptions)
}
if kind == .scanDependencies,
isFrontendArgSupported(.experimentalClangImporterDirectCc1Scan) {
try commandLine.appendAll(
Expand Down
4 changes: 4 additions & 0 deletions Sources/SwiftOptions/Options.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ extension Option {
public static let debugTimeFunctionBodies: Option = Option("-debug-time-function-bodies", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Dumps the time it takes to type-check each function body")
public static let debuggerSupport: Option = Option("-debugger-support", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Process swift code as if running in the debugger")
public static let debuggerTestingTransform: Option = Option("-debugger-testing-transform", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Instrument the code with calls to an intrinsic that record the expected values of local variables so they can be compared against the results from the debugger.")
public static let defaultIsolationEQ: Option = Option("-default-isolation=", .joined, alias: Option.defaultIsolation, attributes: [.frontend])
public static let defaultIsolation: Option = Option("-default-isolation", .separate, attributes: [.frontend], metaVar: "MainActor|nonisolated", helpText: "Specify the default actor isolation: MainActor or nonisolated. Defaults to nonisolated.")
public static let defineAvailability: Option = Option("-define-availability", .separate, attributes: [.frontend, .noInteractive], metaVar: "<macro>", helpText: "Define an availability macro in the format 'macroName : iOS 13.0, macOS 10.15'")
public static let defineDisabledAvailabilityDomain: Option = Option("-define-disabled-availability-domain", .separate, attributes: [.helpHidden, .frontend, .noInteractive], metaVar: "<domain>", helpText: "Defines a custom availability domain that is unavailable at compile time")
public static let defineDynamicAvailabilityDomain: Option = Option("-define-dynamic-availability-domain", .separate, attributes: [.helpHidden, .frontend, .noInteractive], metaVar: "<domain>", helpText: "Defines a custom availability domain that can be enabled or disabled at runtime")
Expand Down Expand Up @@ -1079,6 +1081,8 @@ extension Option {
Option.debugTimeFunctionBodies,
Option.debuggerSupport,
Option.debuggerTestingTransform,
Option.defaultIsolationEQ,
Option.defaultIsolation,
Option.defineAvailability,
Option.defineDisabledAvailabilityDomain,
Option.defineDynamicAvailabilityDomain,
Expand Down
12 changes: 12 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3935,6 +3935,18 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-disable-dynamic-actor-isolation")))
}

func testDefaultIsolation() throws {
var driver = try Driver(args: ["swiftc", "test.swift", "-default-isolation", "MainActor"])
guard driver.isFrontendArgSupported(.defaultIsolation) else {
throw XCTSkip("Skipping: compiler does not support '-default-isolation'")
}
let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
XCTAssertEqual(plannedJobs.count, 2)
XCTAssertEqual(plannedJobs[0].kind, .compile)
XCTAssertEqual(plannedJobs[1].kind, .link)
try XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-default-isolation"), "MainActor")
}

func testImmediateMode() throws {
do {
var driver = try Driver(args: ["swift", "foo.swift"])
Expand Down