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

Comment parsing: allow parsing comments with invalid source locations -- these

Browse Source 
come from serialized modules


Swift SVN r15104
This commit is contained in:
Dmitri Hrybenko
2014-03-15 14:58:29 +00:00
parent 9583261228
commit c1d96e579e
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -47,17 +47,15 @@ openModuleFiles(StringRef DirName, StringRef ModuleFilename,
StringRef(Scratch.data(), Scratch.size()), ModuleBuffer))
return Err;
if (!ModuleDocFilename.empty()) {
// Try to open the module documentation file. If it does not exist, ignore
// the error. However, pass though all other errors.
Scratch.clear();
llvm::sys::path::append(Scratch, DirName, ModuleDocFilename);
auto Err = llvm::MemoryBuffer::getFile(
StringRef(Scratch.data(), Scratch.size()), ModuleDocBuffer);
if (Err && Err.value() != llvm::errc::no_such_file_or_directory) {
ModuleBuffer.reset(nullptr);
return Err;
}
// Try to open the module documentation file. If it does not exist, ignore
// the error. However, pass though all other errors.
Scratch.clear();
llvm::sys::path::append(Scratch, DirName, ModuleDocFilename);
auto Err = llvm::MemoryBuffer::getFile(
StringRef(Scratch.data(), Scratch.size()), ModuleDocBuffer);
if (Err && Err.value() != llvm::errc::no_such_file_or_directory) {
ModuleBuffer.reset(nullptr);
return Err;
}
return llvm::error_code();
}
@@ -117,10 +115,9 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
}
// Search the runtime import path.
// FIXME: Disable doc imports for now...they cause crashes.
isFramework = false;
return openModuleFiles(ctx.SearchPathOpts.RuntimeLibraryImportPath,
moduleFilename.str(), {},
moduleFilename.str(), moduleDocFilename.str(),
moduleBuffer, moduleDocBuffer, scratch);
}