[SourceKit] Check if the realpath of a module is inside the SDK to decide if it's system #77120
+31
−2
Conversation
This file contains 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
ahoppen
requested review from
bnbarham,
rintaro,
hamishknight,
hborla,
slavapestov and
xedin
as code owners
ahoppen
added a commit
to ahoppen/sourcekit-lsp
that referenced
this pull request
Oct 19, 2024
The underlying issue was fixed by swiftlang/swift#77120 Fixes swiftlang#1770 Fixes swiftlang#1771 rdar://138210224 rdar://138210215
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test |
…cide if it's system On Windows, we run into the following situation when running SourceKit-LSP tests: - The SDK is located at `S:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\Windows.sdk` with `S:` being a substitution drive - We find `Swift.swiftmodule` at `S:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\Windows.sdk\usr\lib\swift\windows\Swift.swiftmodule` - Now, to check if `Swift.swiftmodule` is a system module, we take the realpath of the SDK, which resolves the substitution drive an results in something like `C:\Users\alex\src\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\Windows.sdk` - Since we don’t take the realpath of `Swift.swiftmodule`, we will assume that it’s not in the SDK, because the SDK’s path is on `C:` while `Swift.swiftmodule` lives on `S:` To fix this, we also need to check if a module’s real path is inside the SDK. Fixes swiftlang/sourcekit-lsp#1770 rdar://138210224
|
@swift-ci Please smoke 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.
On Windows, we run into the following situation when running SourceKit-LSP tests:
S:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\Windows.sdkwithS:being a substitution driveSwift.swiftmoduleatS:\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\Windows.sdk\usr\lib\swift\windows\Swift.swiftmoduleSwift.swiftmoduleis a system module, we take the realpath of the SDK, which resolves the substitution drive an results in something likeC:\Users\alex\src\Program Files\Swift\Platforms\Windows.platform\Developer\SDKs\Windows.sdkSwift.swiftmodule, we will assume that it’s not in the SDK, because the SDK’s path is onC:whileSwift.swiftmodulelives onS:To fix this, we also need to check if a module’s real path is inside the SDK.
Fixes swiftlang/sourcekit-lsp#1770
rdar://138210224