averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not inherit search paths from loaded binary Swift module dependencies in Swift 6

Browse Source
This commit is contained in:
Artem Chikin
2023-09-21 08:44:37 -07:00
parent 9f61777eb0
commit cc3528900d
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFile.cpp
View File

@@ -271,8 +271,10 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc,
}
StringRef SDKPath = ctx.SearchPathOpts.getSDKPath();
if (SDKPath.empty() ||
!Core->ModuleInputBuffer->getBufferIdentifier().startswith(SDKPath)) {
// In Swift 6 mode, we do not inherit search paths from loaded non-SDK modules.
if (!ctx.LangOpts.isSwiftVersionAtLeast(6) &&
(SDKPath.empty() ||
!Core->ModuleInputBuffer->getBufferIdentifier().startswith(SDKPath))) {
for (const auto &searchPath : Core->SearchPaths) {
ctx.addSearchPath(
ctx.SearchPathOpts.SearchPathRemapper.remapPath(searchPath.Path),