ClangImporter: correct a duplicated path component #67723
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 computing the path for a non-architecture specific resource, we would append the architecture unconditionally if `-sdk` is used. This would result in the path being miscomputed with the architecture or the architecture duplicated if it was architecture specific. Found by inspection.
egorzhdan
approved these changes
Aug 4, 2023
|
@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.
When computing the path for a non-architecture specific resource, we would append the architecture unconditionally if
-sdkis used. This would result in the path being miscomputed with the architecture or the architecture duplicated if it was architecture specific.Found by inspection.
Explanation: Correct the location for resources relative to the SDK root
Scope: This fixes the Windows target's use of
CxxShimwhich is required for C++ interop which would not be found otherwise.Issue: #67715
Risk: This impacts only targets that use
-sdk(Darwin, Windows). However, this can be further refined to the location of resources that are SDK relative. Darwin places the toolchain resources entirely with the toolchain and not as SDK relative like Windows, which means that those paths should technically not be impacted, though the code path is shared.Testing: What specific testing has been done or needs to be done to further validate any impact of this change?
Reviewer: @hyp @egorzhdan