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

Extend SerializedModuleLoader to load modules from a bitstream.

Browse Source 
Add tools/lldb-moduleimport-test, which simulates LLDB importing modules
from the __apple_ast section in Mach-O files and use it to regression-test
the new API.

Swift SVN r7709
This commit is contained in:
Adrian Prantl
2013-08-29 00:57:05 +00:00
parent 6d34a127ee
commit 31c926660f
8 changed files with 255 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -116,10 +116,8 @@ static Module *makeTU(ASTContext &ctx, AccessPathElem moduleID,
return TU;
}
Module *SerializedModuleLoader::loadModule(SourceLoc importLoc,
Module::AccessPathTy path) {
// FIXME: Swift submodules?
if (path.size() > 1)
return nullptr;
@@ -127,14 +125,31 @@ Module *SerializedModuleLoader::loadModule(SourceLoc importLoc,
auto moduleID = path[0];
llvm::OwningPtr<llvm::MemoryBuffer> inputFile;
if (llvm::error_code err = findModule(Ctx, moduleID, inputFile)) {
if (err.value() != llvm::errc::no_such_file_or_directory) {
Ctx.Diags.diagnose(moduleID.second, diag::sema_opening_import,
moduleID.first.str(), err.message());
// First see if we find it in the registered bitstreams.
if (!Bitstreams.empty()) {
// FIXME: Right now this works only with fully-qualified absolute
// pathnames, which is incidentally what LLDB uses. Fix this to
// support suffix matching and a search path.
llvm::SmallString<256> spath;
for (auto el : path)
llvm::sys::path::append(spath, el.first.str());
auto bs = Bitstreams.find(spath.str());
if (bs != Bitstreams.end())
inputFile.reset(bs->second.take());
}
// Otherwise look on disk.
if (!inputFile)
if (llvm::error_code err = findModule(Ctx, moduleID, inputFile)) {
if (err.value() != llvm::errc::no_such_file_or_directory) {
Ctx.Diags.diagnose(moduleID.second, diag::sema_opening_import,
moduleID.first.str(), err.message());
}
return nullptr;
}
return nullptr;
}
assert(inputFile);
std::string DebugModuleName = inputFile->getBufferIdentifier();