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

Revert "[serialization] Reject loading a module with the wrong case."

Browse Source 
This reverts commit r22818, which caused
to fail.

Swift SVN r22822
This commit is contained in:
Dave Abrahams
2014-10-18 01:02:20 +00:00
parent 7fa402868d
commit 7eb173e487
8 changed files with 7 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -191,7 +191,6 @@ FileUnit *SerializedModuleLoader::loadAST(
return nullptr;
case ModuleStatus::MissingDependency:
case ModuleStatus::MissingShadowedModule:
case ModuleStatus::NameMismatch:
llvm_unreachable("dependencies haven't been loaded yet");
}
@@ -208,24 +207,12 @@ FileUnit *SerializedModuleLoader::loadAST(
// We failed to bring the module file into the AST.
M.removeFile(*fileUnit);
assert(loadedModuleFile->getStatus() == ModuleStatus::NameMismatch ||
loadedModuleFile->getStatus() == ModuleStatus::MissingDependency ||
assert(loadedModuleFile->getStatus() == ModuleStatus::MissingDependency ||
loadedModuleFile->getStatus() == ModuleStatus::MissingShadowedModule);
if (!diagLoc)
return nullptr;
if (loadedModuleFile->getStatus() == ModuleStatus::NameMismatch) {
// FIXME: This doesn't handle a non-debugger REPL, which should also treat
// this as a non-fatal error.
auto diagKind = diag::serialization_name_mismatch;
if (Ctx.LangOpts.DebuggerSupport)
diagKind = diag::serialization_name_mismatch_repl;
Ctx.Diags.diagnose(*diagLoc, diagKind,
loadedModuleFile->getModuleName(), M.Name);
return nullptr;
}
if (loadedModuleFile->getStatus() == ModuleStatus::MissingShadowedModule) {
Ctx.Diags.diagnose(*diagLoc, diag::serialization_missing_shadowed_module,
M.Name);