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

Jump to bottom

Add support for compatibility shims that we don't want to -force-load #1361

Merged
merged 1 commit into from May 15, 2023
Merged

Add support for compatibility shims that we don't want to -force-load #1361

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift
View file
Open in desktop
Expand Up @@ -77,6 +77,7 @@ public struct FrontendTargetInfo: Codable {

let libraryName: String
let filter: Filter
let forceLoad: Bool?
}

struct Target: Codable {
Expand Down
10 changes: 7 additions & 3 deletions Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift
View file
Open in desktop
Expand Up @@ -100,11 +100,13 @@ extension DarwinToolchain {

// Link compatibility libraries, if we're deploying back to OSes that
// have an older Swift runtime.
func addArgsForBackDeployLib(_ libName: String) throws {
func addArgsForBackDeployLib(_ libName: String, forceLoad: Bool) throws {
let backDeployLibPath = VirtualPath.lookup(targetInfo.runtimeResourcePath.path)
.appending(components: targetTriple.platformName() ?? "", libName)
if try fileSystem.exists(backDeployLibPath) {
commandLine.append(.flag("-force_load"))
if forceLoad {
commandLine.append(.flag("-force_load"))
}
commandLine.appendPath(backDeployLibPath)
}
}
Expand All @@ -121,7 +123,9 @@ extension DarwinToolchain {
}

if shouldLink {
try addArgsForBackDeployLib("lib" + compatibilityLib.libraryName + ".a")
// Old frontends don't set forceLoad at all; assume it's true in that case
try addArgsForBackDeployLib("lib" + compatibilityLib.libraryName + ".a",
forceLoad: compatibilityLib.forceLoad ?? true)
}
}

Expand Down
16 changes: 15 additions & 1 deletion Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Expand Up @@ -2262,10 +2262,12 @@ final class SwiftDriverTests: XCTestCase {
let path5_0iOS = path.appending(components: "iphoneos", "libswiftCompatibility50.a")
let path5_1iOS = path.appending(components: "iphoneos", "libswiftCompatibility51.a")
let pathDynamicReplacementsiOS = path.appending(components: "iphoneos", "libswiftCompatibilityDynamicReplacements.a")
let pathCompatibilityPacksMac = path.appending(components: "macosx", "libswiftCompatibilityPacks.a")

for compatibilityLibPath in [path5_0Mac, path5_1Mac,
pathDynamicReplacementsMac, path5_0iOS,
path5_1iOS, pathDynamicReplacementsiOS] {
path5_1iOS, pathDynamicReplacementsiOS,
pathCompatibilityPacksMac] {
try localFileSystem.writeFileContents(compatibilityLibPath) { $0 <<< "Empty" }
}
let commonArgs = ["swiftc", "foo.swift", "bar.swift", "-module-name", "Test", "-resource-dir", path.pathString]
Expand All @@ -2282,6 +2284,9 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertTrue(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_0Mac))]))
XCTAssertTrue(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_1Mac))]))
XCTAssertTrue(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathDynamicReplacementsMac))]))

XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathCompatibilityPacksMac))]))
XCTAssertTrue(cmd.contains(subsequence: [.path(.absolute(pathCompatibilityPacksMac))]))
}

do {
Expand All @@ -2296,6 +2301,9 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_0Mac))]))
XCTAssertTrue(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_1Mac))]))
XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathDynamicReplacementsMac))]))

XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathCompatibilityPacksMac))]))
XCTAssertTrue(cmd.contains(subsequence: [.path(.absolute(pathCompatibilityPacksMac))]))
}

do {
Expand All @@ -2310,6 +2318,9 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_0Mac))]))
XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_1Mac))]))
XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathDynamicReplacementsMac))]))

XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathCompatibilityPacksMac))]))
XCTAssertTrue(cmd.contains(subsequence: [.path(.absolute(pathCompatibilityPacksMac))]))
}

do {
Expand All @@ -2324,6 +2335,9 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertTrue(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_0Mac))]))
XCTAssertTrue(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(path5_1Mac))]))
XCTAssertTrue(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathDynamicReplacementsMac))]))

XCTAssertFalse(cmd.contains(subsequence: [.flag("-force_load"), .path(.absolute(pathCompatibilityPacksMac))]))
XCTAssertTrue(cmd.contains(subsequence: [.path(.absolute(pathCompatibilityPacksMac))]))
}

do {
Expand Down