[clang] Fix ASTUnit working directory handling #7028
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
bnbarham
approved these changes
Jun 26, 2023
bnbarham
left a comment
bnbarham
left a comment
There was a problem hiding this comment.
Thanks for tracking this down @hamishknight!
benlangmuir
reviewed
Jun 26, 2023
benlangmuir
left a comment
benlangmuir
left a comment
There was a problem hiding this comment.
These changes should go upstream to llvm.org
Author
Yup, that's the plan, we're cherry-picking downstream first as we want to get this into 5.9 fairly soon |
|
@swift-ci please test Windows platform |
benlangmuir
approved these changes
Jun 26, 2023
Use `createPhysicalFileSystem` instead of `getRealFileSystem` to avoid affecting the process' current working directory, and set it at the top of `ASTUnit::LoadFromCommandLine` such that the driver used for argument parsing and the ASTUnit share the same VFS. This ensures that '-working-directory' correctly sets the VFS working directory in addition to the FileManager working directory.
Ensure we preserve the FileSystemOptions set on the FileManager when re-creating it (as `ASTUnit::Reparse` will clear the currently set FileManager). rdar://110697657
hamishknight
force-pushed
the
time-and-place
branch
from
b5a5e21 to
b32a174
Compare
Author
|
@swift-ci please test |
hamishknight
changed the title
Author
|
@swift-ci please test macOS |
Author
|
Upstream patch: https://reviews.llvm.org/D154134 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fix a couple of issues with the handling of the current working directory in ASTUnit:
createPhysicalFileSysteminstead ofgetRealFileSystemto avoid affecting the process' current working directory, and set it at the top ofASTUnit::LoadFromCommandLinesuch that the driver used for argument parsing and the ASTUnit share the same VFS. This ensures that '-working-directory' correctly sets the VFS working directory in addition to the FileManager working directory.ASTUnit::Reparsewill clear the currently set FileManager).rdar://110697657