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

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

Browse Source 
Make module trace emission more robust.
This commit is contained in:
Varun Gandhi
2019-10-15 20:45:04 -07:00
committed by GitHub
parent 7efaad6706 903add2c3f
commit 68a68cb564
13 changed files with 286 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Frontend/ModuleInterfaceLoader.cpp
View File

@@ -990,6 +990,7 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
AccessPathElem ModuleID, StringRef DirPath, StringRef ModuleFilename,
StringRef ModuleDocFilename,
StringRef ModuleSourceInfoFilename,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer) {
@@ -1036,6 +1037,8 @@ std::error_code ModuleInterfaceLoader::findModuleFilesInDirectory(
if (ModuleBuffer) {
*ModuleBuffer = std::move(*ModuleBufferOrErr);
if (ModuleInterfacePath)
*ModuleInterfacePath = InPath;
}
// Open .swiftsourceinfo file if it's present.
SerializedModuleLoaderBase::openModuleSourceInfoFileIfPresent(ModuleID,