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 remote-tracking branch 'apple/master' into master-rebranch

Browse Source
This commit is contained in:
Xi Ge
2020-09-02 18:36:37 -07:00
parent ac6dffdf41 ed5edb89f5
commit e107182f1a
74 changed files with 1040 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -991,10 +991,8 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
Ctx.addLoadedModule(M);
SWIFT_DEFER { M->setHasResolvedImports(); };
StringRef moduleInterfacePathStr =
Ctx.AllocateCopy(moduleInterfacePath.str());
auto *file =
loadAST(*M, moduleID.Loc, moduleInterfacePathStr,
loadAST(*M, moduleID.Loc, moduleInterfacePath,
std::move(moduleInputBuffer), std::move(moduleDocInputBuffer),
std::move(moduleSourceInfoInputBuffer), isFramework);
if (file) {