Fix the legacy driver path construction on non-Windows platforms #1756
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci test |
|
Wait, it seems like a swift-foundation side issue: import Foundation
let url = URL(fileURLWithPath: "/tmp/x")
print(url.deletingPathExtension().appendingPathExtension(url.pathExtension))
// Swift 5.10: file:///tmp/x
// Swift 6.0: file:///tmp/x. |
|
@swift-ci test macOS |
kateinoigakukun
added a commit
to swiftwasm/swiftwasm-build
that referenced
this pull request
Dec 11, 2024
should be reverted once swiftlang/swift-driver#1756 is merged
|
Can you check with swift-foundation if the behaviour change is intentional? If not, we should mark this as a workaround and then revert it once we have a newer Foundation. |
kateinoigakukun
force-pushed
the
yt/fix-non-windows-legacy-driver
branch
from
17873dc to
107b39b
Compare
|
@compnerd The team said it was an unintentional change and fixed in the main branch. swiftlang/swift-foundation#1080 |
|
@swift-ci smoke test |
kkebo
reviewed
Dec 12, 2024
compnerd
requested changes
Dec 12, 2024
Sources/swift-driver/main.swift
Outdated
| @@ -83,10 +83,18 @@ do { | |||
| // invocation for a multi-call binary. | |||
| let executable: URL = URL(fileURLWithPath: ProcessInfo.processInfo.arguments[0]) | |||
| let invocation: URL = URL(fileURLWithPath: CommandLine.arguments[0]) | |||
| let legacyExecutablePath: URL = | |||
| var legacyExecutablePath: URL = | |||
There was a problem hiding this comment.
Can you duplicate this code instead and guard it with a compiler version check please?
There was a problem hiding this comment.
Ok, gated behind 6.2 until we cherry-pick the fix to 6.1 branch.
`swift-driver` tries to invoke `swiftc-legacy-driver.` (trailing dot) on non-Windows platforms when legacy driver is requested since swiftlang#1746 This is because `URL.pathExtension` returns an empty string if the URL does not have an extension but `URL.appendPathExtension` appends a period before the extension even if given an empty string. Thus `url.deletingPathExtension().appendingPathExtension(url.pathExtension)` will not be equal to `url` if `url` does not have an extension.
kateinoigakukun
force-pushed
the
yt/fix-non-windows-legacy-driver
branch
from
107b39b to
46cc429
Compare
compnerd
approved these changes
Dec 12, 2024
|
@swift-ci please test |
|
@swift-ci please test macOS platform |
|
@swift-ci please test Windows platform |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
swift-drivertries to invokeswiftc-legacy-driver.(trailing dot) on non-Windows platforms when legacy driver is requested since #1746This is because
URL.pathExtensionreturns an empty string if the URL does not have an extension butURL.appendPathExtensionappends a period before the extension even if given an empty string. Thusurl.deletingPathExtension().appendingPathExtension(url.pathExtension)will not be equal tourlifurldoes not have an extension.