[swift-stdlib-tool] Fix finding sibling directories #41110
Merged
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
When used without passing `--source-libraries`, this tool fetches its current path and uses that to find the directories of the swift libraries near it. Since swiftlang#39216 it was searching the nearby directories recursively, and only for files, instead of just looking at 1 level, only for directories. Because of this it would never discover `path/to/lib/swift-5.0/...` because it was only looking for files. This fixes this issue with a new function, and renames the previous function to be more explicit for the other use case that does want that behavior.
|
I will submit a 5.6 cherry pick once this is reviewed, this is currently broken in Xcode 13.3 beta 1 which is how we discovered it |
|
@DougGregor since you're the 5.6 compiler release manager can you check this one out? I think we should cherry pick it to this release since it's a regression from 5.5 |
CodaFi
approved these changes
Feb 7, 2022
|
@swift-ci test |
keith
deleted the
ks/swift-stdlib-tool-fix-finding-sibling-directories
branch
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.
When used without passing
--source-libraries, this tool fetches itscurrent path and uses that to find the directories of the swift
libraries near it.
Since #39216 it was searching the
nearby directories recursively, and only for files, instead of just
looking at 1 level, only for directories. Because of this it would never
discover
path/to/lib/swift-5.0/...because it was only looking forfiles.
This fixes this issue with a new function, and renames the previous
function to be more explicit for the other use case that does want that
behavior.