Skip to content

[6.2] Use native root check on Windows #2288

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

Open
wants to merge 2 commits into
base: release/6.2
Choose a base branch
from
+15 −11
Open

[6.2] Use native root check on Windows #2288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529cd78
Use native root check on Windows
bnbarham Sep 8, 2025
53215eb
Standardize file paths when attempting to find toolchains
bnbarham Sep 11, 2025
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
20 changes: 12 additions & 8 deletions Sources/SwiftExtensions/URLExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@

package import Foundation

#if os(Windows)
import WinSDK
#endif

enum FilePathError: Error, CustomStringConvertible {
case noFileSystemRepresentation(URL)
case noFileURL(URL)
Expand Down Expand Up @@ -83,14 +87,14 @@ extension URL {
}

package var isRoot: Bool {
#if os(Windows)
// FIXME: We should call into Windows' native check to check if this path is a root once https://github.com/swiftlang/swift-foundation/issues/976 is fixed.
return self.pathComponents.count <= 1
#else
// On Linux, we may end up with an string for the path due to https://github.com/swiftlang/swift-foundation/issues/980
// TODO: Remove the check for "" once https://github.com/swiftlang/swift-foundation/issues/980 is fixed.
return self.path == "/" || self.path == ""
#endif
get throws {
let checkPath = try filePath
#if os(Windows)
return checkPath.withCString(encodedAs: UTF16.self, PathCchIsRoot)
#else
return checkPath == "/"
#endif
}
}

/// Returns true if the path of `self` starts with the path in `other`.
Expand Down
4 changes: 2 additions & 2 deletions Sources/ToolchainRegistry/Toolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ public final class Toolchain: Sendable {
func containingXCToolchain(
_ path: URL
) -> (XCToolchainPlist, URL)? {
var path = path
while !path.isRoot {
var path = path.standardizedFileURL
while !((try? path.isRoot) ?? true) {
if path.pathExtension == "xctoolchain" {
if let infoPlist = orLog("Loading information from xctoolchain", { try XCToolchainPlist(fromDirectory: path) }) {
return (infoPlist, path)
Expand Down
2 changes: 1 addition & 1 deletion Tests/ToolchainRegistryTests/ToolchainRegistryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ final class ToolchainRegistryTests: XCTestCase {

try ProcessEnv.setVar(
"SOURCEKIT_PATH_FOR_TEST",
value: ["/bogus", binPath.filePath, "/bogus2"].joined(separator: separator)
value: ["/bogus/../parent", "/bogus", binPath.filePath, "/bogus2"].joined(separator: separator)
)
defer { try! ProcessEnv.setVar("SOURCEKIT_PATH_FOR_TEST", value: "") }

Expand Down