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

[Serialization] Fix reporting a dependency cycle with a missing clang module

Browse Source 
rdar://problem/57364033
This commit is contained in:
Alexis Laferrière
2019-12-16 15:55:05 -08:00
parent 8b45b5a118
commit c2c36d0769
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -747,7 +747,8 @@ void swift::serialization::diagnoseSerializedASTLoadFailure(
auto circularDependencyIter =
llvm::find_if(loadedModuleFile->getDependencies(),
[](const ModuleFile::Dependency &next) {
return !next.Import.second->hasResolvedImports();
return next.isLoaded() &&
!next.Import.second->hasResolvedImports();
});
assert(circularDependencyIter !=
loadedModuleFile->getDependencies().end() &&