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

Browse Source
This commit is contained in:
Arnold Schwaighofer
2019-08-26 13:30:41 -07:00
parent 5c39026dc7 af0247e92c
commit 20efacf2d6
57 changed files with 705 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/FrontendTool/FrontendTool.cpp
View File

@@ -268,6 +268,8 @@ static bool emitLoadedModuleTraceIfNeeded(ModuleDecl *mainModule,
for (auto &module : ctxt.LoadedModules) {
ModuleDecl *loadedDecl = module.second;
assert(loadedDecl && "Expected loaded module to be non-null.");
if (loadedDecl == mainModule)
continue;
assert(!loadedDecl->getModuleFilename().empty()
&& "Don't know how to handle modules with empty names.");
pathToModuleDecl.insert(