Merge pull request #27635 from varungandhi-apple/vg-robustify-module-trace-emission

Make module trace emission more robust.
This commit is contained in:
Varun Gandhi
2019-10-15 20:45:04 -07:00
committed by GitHub
13 changed files with 286 additions and 86 deletions

View File

@@ -931,8 +931,8 @@ bool CompilerInstance::parsePartialModulesAndLibraryFiles(
// Parse all the partial modules first.
for (auto &PM : PartialModules) {
assert(PM.ModuleBuffer);
if (!SML->loadAST(*MainModule, SourceLoc(), std::move(PM.ModuleBuffer),
std::move(PM.ModuleDocBuffer),
if (!SML->loadAST(*MainModule, SourceLoc(), /*moduleInterfacePath*/"",
std::move(PM.ModuleBuffer), std::move(PM.ModuleDocBuffer),
std::move(PM.ModuleSourceInfoBuffer), /*isFramework*/false,
/*treatAsPartialModule*/true))
hadLoadError = true;