[4.2] [sourcekit] Pass -resource-dir when parsing driver arguments #16548
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
... instead of overriding it after the driver is done. This improves the fidelity of anything that looks at the resource directory inside the driver or frontend argument parsing. In particular, it fixes an issue where sourcekit requests would fail if they included the -sanitize= option because the driver would fail to find the runtime libraries. Even though this should be *more correct* for all uses, in the interests of understanding all possible immediate effects of this change, I manually audited all the code that looks at the resource directory in between when it is parsed as and argument and when createCompilerInvocation returns. I claim that the only changes are: 1. The sanitizer library check that we wanted to change 2. The DWARFDebugFlags, which are for IRGen so don't affect SourceKit 3. The Migrator data paths, which also don't affect SourceKit For now, I put the -resource-dir option at the end of the arguments so that it overrides any existing option, which mimics how it behaved before. We might want to move it to the beginning so that we honour a user-provided resource directory, but that should be a separate change. rdar://40147839
|
@swift-ci please test |
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.
Cherry-pick #16547 to swift-4.2
... instead of overriding it after the driver is done. This improves
the fidelity of anything that looks at the resource directory inside the
driver or frontend argument parsing. In particular, it fixes an issue
where sourcekit requests would fail if they included the -sanitize=
option because the driver would fail to find the runtime libraries.
Even though this should be more correct for all uses, in the
interests of understanding all possible immediate effects of this
change, I manually audited all the code that looks at the resource
directory in between when it is parsed as and argument and when
createCompilerInvocation returns. I claim that the only changes are:
For now, I put the -resource-dir option at the end of the arguments so
that it overrides any existing option, which mimics how it behaved
before. We might want to move it to the beginning so that we honour a
user-provided resource directory, but that should be a separate change.
rdar://40147839