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

Merge pull request #41476 from ahoppen/pr/store-path-in-modulesearchpath

Browse Source 
[Serialization] Store the path inside ModuleSearchPath as a string, not a StringRef
This commit is contained in:
Alex Hoppen
2022-02-22 16:57:33 +01:00
committed by GitHub
parent 496da9dda9 bffd3ca608
commit 57f05d6651
3 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -608,10 +608,10 @@ SerializedModuleLoaderBase::findModule(ImportPath::Element moduleID,
InterestingFilenames, Ctx.SourceMgr.getFileSystem().get(),
Ctx.LangOpts.Target.isOSDarwin());
for (const auto &searchPath : searchPaths) {
currPath = searchPath->Path;
isSystemModule = searchPath->IsSystem;
currPath = searchPath->getPath();
isSystemModule = searchPath->isSystem();
switch (searchPath->Kind) {
switch (searchPath->getKind()) {
case ModuleSearchPathKind::Import:
case ModuleSearchPathKind::RuntimeLibrary: {
isFramework = false;
@@ -621,7 +621,7 @@ SerializedModuleLoaderBase::findModule(ImportPath::Element moduleID,
// This was not always true on non-Apple platforms, and in order to
// ease the transition, check both layouts.
bool checkTargetSpecificModule = true;
if (searchPath->Kind != ModuleSearchPathKind::RuntimeLibrary ||
if (searchPath->getKind() != ModuleSearchPathKind::RuntimeLibrary ||
!Ctx.LangOpts.Target.isOSDarwin()) {
auto modulePath = currPath;
llvm::sys::path::append(modulePath, genericModuleFileName);