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 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-04-30 20:37:34 -07:00
parent 8b5ba43ce4 ea526c6383
commit 9b6f01b6d9
25 changed files with 211 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -819,12 +819,13 @@ void swift::serialization::diagnoseSerializedASTLoadFailure(
}
case serialization::Status::CircularDependency: {
auto circularDependencyIter =
llvm::find_if(loadedModuleFile->getDependencies(),
[](const ModuleFile::Dependency &next) {
return next.isLoaded() &&
!next.Import.second->hasResolvedImports();
});
auto circularDependencyIter = llvm::find_if(
loadedModuleFile->getDependencies(),
[](const ModuleFile::Dependency &next) {
return next.isLoaded() &&
!(next.Import.hasValue() &&
next.Import->importedModule->hasResolvedImports());
});
assert(circularDependencyIter !=
loadedModuleFile->getDependencies().end() &&
"circular dependency reported, but no module with unresolved "
@@ -1088,7 +1089,7 @@ void SerializedASTFile::collectLinkLibrariesFromImports(
File.getImportedModules(Imports, ImportFilter);
for (auto Import : Imports)
Import.second->collectLinkLibraries(callback);
Import.importedModule->collectLinkLibraries(callback);
}
void SerializedASTFile::collectLinkLibraries(