Skip to content

Commit 1eca275

Browse files
authored
Merge pull request #1797 from swiftlang/rdar-143965800-6.1
[6.1] Add support for `-disable-dynamic-actor-isolation`
2 parents 7cb8cf9 + f628730 commit 1eca275

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,10 @@ extension Driver {
367367
try commandLine.appendLast(.disableSandbox, from: &parsedOptions)
368368
}
369369

370+
if isFrontendArgSupported(.disableDynamicActorIsolation) {
371+
try commandLine.appendLast(.disableDynamicActorIsolation, from: &parsedOptions)
372+
}
373+
370374
if !directModuleCC1Mode, let workingDirectory = workingDirectory {
371375
// Add -Xcc -working-directory before any other -Xcc options to ensure it is
372376
// overridden by an explicit -Xcc -working-directory, although having a

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3859,6 +3859,19 @@ final class SwiftDriverTests: XCTestCase {
38593859
XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-enable-bare-slash-regex")))
38603860
}
38613861

3862+
func testDisableDynamicActorIsolation() throws {
3863+
var driver = try Driver(args: ["swiftc", "test.swift", "-disable-dynamic-actor-isolation"])
3864+
guard driver.isFrontendArgSupported(.disableDynamicActorIsolation) else {
3865+
throw XCTSkip("Skipping: compiler does not support '-disable-dynamic-actor-isolation'")
3866+
}
3867+
let plannedJobs = try driver.planBuild()
3868+
XCTAssertEqual(plannedJobs.count, 2)
3869+
XCTAssertEqual(plannedJobs[0].kind, .compile)
3870+
XCTAssertEqual(plannedJobs[1].kind, .link)
3871+
XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-frontend")))
3872+
XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-disable-dynamic-actor-isolation")))
3873+
}
3874+
38623875
func testImmediateMode() throws {
38633876
do {
38643877
var driver = try Driver(args: ["swift", "foo.swift"])

0 commit comments

Comments
 (0)