averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[serialization] Print the path to a too-new, too-old, or malformed module file.

Browse Source 
<rdar://problem/16680615>

Swift SVN r16637
This commit is contained in:
Jordan Rose
2014-04-22 01:51:19 +00:00
parent fbf0a1529c
commit 4a36db7835
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -132,9 +132,15 @@ FileUnit *SerializedModuleLoader::loadAST(
bool isFramework) {
assert(moduleInputBuffer);
const char *moduleBufferID = moduleInputBuffer->getBufferIdentifier();
const char *moduleDocBufferID = nullptr;
if (moduleDocInputBuffer)
moduleDocBufferID = moduleDocInputBuffer->getBufferIdentifier();
if (moduleInputBuffer->getBufferSize() % 4 != 0) {
if (diagLoc)
Ctx.Diags.diagnose(*diagLoc, diag::serialization_malformed_module);
Ctx.Diags.diagnose(*diagLoc, diag::serialization_malformed_module,
moduleBufferID);
return nullptr;
}
@@ -148,15 +154,24 @@ FileUnit *SerializedModuleLoader::loadAST(
break;
case ModuleStatus::FormatTooNew:
if (diagLoc)
Ctx.Diags.diagnose(*diagLoc, diag::serialization_module_too_new);
Ctx.Diags.diagnose(*diagLoc, diag::serialization_module_too_new,
moduleBufferID);
return nullptr;
case ModuleStatus::FormatTooOld:
if (diagLoc)
Ctx.Diags.diagnose(*diagLoc, diag::serialization_module_too_old);
Ctx.Diags.diagnose(*diagLoc, diag::serialization_module_too_old,
moduleBufferID);
return nullptr;
case ModuleStatus::Malformed:
if (diagLoc)
Ctx.Diags.diagnose(*diagLoc, diag::serialization_malformed_module);
Ctx.Diags.diagnose(*diagLoc, diag::serialization_malformed_module,
moduleBufferID);
return nullptr;
case ModuleStatus::MalformedDocumentation:
assert(moduleDocBufferID);
if (diagLoc)
Ctx.Diags.diagnose(*diagLoc, diag::serialization_malformed_module,
moduleDocBufferID ? moduleDocBufferID : "");
return nullptr;
case ModuleStatus::MissingDependency:
case ModuleStatus::MissingShadowedModule: