nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check module signature when the module has already been loaded

Browse Source 
We may need to verify the signature on subsequent imports as well, just
like we verify the size/modtime:
@import A;
@import B; // imports A
@import C; // imports A

llvm-svn: 221569
This commit is contained in:
Ben Langmuir
2014-11-08 00:34:30 +00:00
parent e531d27cd1
commit ed98258482
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
clang/lib/Serialization/ModuleManager.cpp
View File

@@ -132,21 +132,27 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type,
// Initialize the stream
New->StreamFile.init((const unsigned char *)New->Buffer->getBufferStart(),
(const unsigned char *)New->Buffer->getBufferEnd());
}
if (ExpectedSignature) {
New->Signature = ReadSignature(New->StreamFile);
if (New->Signature != ExpectedSignature) {
ErrorStr = New->Signature ? "signature mismatch"
: "could not read module signature";
if (ExpectedSignature) {
if (NewModule)
ModuleEntry->Signature = ReadSignature(ModuleEntry->StreamFile);
else
assert(ModuleEntry->Signature == ReadSignature(ModuleEntry->StreamFile));
if (ModuleEntry->Signature != ExpectedSignature) {
ErrorStr = ModuleEntry->Signature ? "signature mismatch"
: "could not read module signature";
if (NewModule) {
// Remove the module file immediately, since removeModules might try to
// invalidate the file cache for Entry, and that is not safe if this
// module is *itself* up to date, but has an out-of-date importer.
Modules.erase(Entry);
Chain.pop_back();
delete New;
return OutOfDate;
delete ModuleEntry;
}
return OutOfDate;
}
}