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

Don't blow up when an adapter's underlying module is missing.

Browse Source 
Instead, emit a specific error, along with the same "SDK is missing" note
from the last commit.

Swift SVN r12416
This commit is contained in:
Jordan Rose
2014-01-16 20:08:09 +00:00
parent a5c2fedc1b
commit 5f9c652ff9
6 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -118,6 +118,7 @@ SerializedModuleLoader::loadAST(Module &M, Optional<SourceLoc> diagLoc,
Ctx.Diags.diagnose(*diagLoc, diag::serialization_malformed_module);
return nullptr;
case ModuleStatus::MissingDependency:
case ModuleStatus::MissingShadowedModule:
llvm_unreachable("dependencies haven't been loaded yet");
}
@@ -133,25 +134,42 @@ SerializedModuleLoader::loadAST(Module &M, Optional<SourceLoc> diagLoc,
// We failed to bring the module file into the AST.
M.removeFile(*fileUnit);
assert(loadedModuleFile->getStatus() == ModuleStatus::MissingDependency);
assert(loadedModuleFile->getStatus() == ModuleStatus::MissingDependency ||
loadedModuleFile->getStatus() == ModuleStatus::MissingShadowedModule);
if (!diagLoc)
return nullptr;
if (loadedModuleFile->getStatus() == ModuleStatus::MissingShadowedModule) {
Ctx.Diags.diagnose(*diagLoc, diag::serialization_missing_shadowed_module,
M.Name);
if (Ctx.SearchPathOpts.SDKPath.empty())
Ctx.Diags.diagnose(SourceLoc(), diag::sema_no_import_no_sdk);
return nullptr;
}
// Figure out /which/ dependencies are missing.
SmallVector<ModuleFile::Dependency, 4> missing;
// FIXME: Dependencies should be de-duplicated at serialization time, not now.
llvm::StringMap<bool> duplicates;
llvm::SmallVector<ModuleFile::Dependency, 4> missing;
std::copy_if(loadedModuleFile->getDependencies().begin(),
loadedModuleFile->getDependencies().end(),
std::back_inserter(missing),
[](const ModuleFile::Dependency &dependency) {
return !dependency.isLoaded();
[&duplicates](const ModuleFile::Dependency &dependency) -> bool {
if (dependency.isLoaded())
return false;
bool &seen = duplicates[dependency.RawAccessPath];
if (seen)
return false;
seen = true;
return true;
});
// FIXME: only show module part of RawAccessPath
assert(!missing.empty() && "unknown missing dependency?");
if (missing.size() == 1) {
Ctx.Diags.diagnose(*diagLoc, diag::serialization_missing_single_dependency,
missing.front().RawAccessPath);
missing.begin()->RawAccessPath);
} else {
llvm::SmallString<64> missingNames;
missingNames += '\'';
@@ -166,6 +184,9 @@ SerializedModuleLoader::loadAST(Module &M, Optional<SourceLoc> diagLoc,
missingNames);
}
if (Ctx.SearchPathOpts.SDKPath.empty())
Ctx.Diags.diagnose(SourceLoc(), diag::sema_no_import_no_sdk);
return nullptr;
}