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

Manually merge remote-tracking branch 'upstream/master' into merge-in-master

Browse Source
This commit is contained in:
Nathan Hawes
2020-07-27 09:25:01 -07:00
parent 8af162626a 8a45c9c62f
commit b0a2230860
124 changed files with 2978 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -411,7 +411,7 @@ llvm::ErrorOr<ModuleDependencies> SerializedModuleLoaderBase::scanModuleFile(
if (dotPos != std::string::npos)
moduleName = moduleName.slice(0, dotPos);
dependencies.addModuleDependency(moduleName, addedModuleNames);
dependencies.addModuleDependency(moduleName, &addedModuleNames);
}
return std::move(dependencies);