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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-06-16 21:38:08 -07:00
parent 559178f949 2b9fd78b91
commit 20ba5d3171
13 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -960,7 +960,7 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
auto M = ModuleDecl::create(moduleID.Item, Ctx);
M->setIsSystemModule(isSystemModule);
Ctx.LoadedModules[moduleID.Item] = M;
Ctx.addLoadedModule(M);
SWIFT_DEFER { M->setHasResolvedImports(); };
StringRef moduleInterfacePathStr =
@@ -1011,7 +1011,7 @@ MemoryBufferSerializedModuleLoader::loadModule(SourceLoc importLoc,
return nullptr;
M->addFile(*file);
Ctx.LoadedModules[moduleID.Item] = M;
Ctx.addLoadedModule(M);
return M;
}