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

[ModuleInterface] Add FILE_DEPENDENCY record to INPUT_BLOCK.

Browse Source
This commit is contained in:
Graydon Hoare
2018-10-30 17:01:17 -07:00
parent 47c1aa7f81
commit 9fceeb410e
5 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Serialization/ModuleFile.cpp
View File

@@ -232,6 +232,35 @@ validateControlBlock(llvm::BitstreamCursor &cursor,
return result;
}
static bool
validateInputBlock(llvm::BitstreamCursor &cursor,
SmallVectorImpl<uint64_t> &scratch,
SmallVectorImpl<StringRef> &dependencies) {
while (!cursor.AtEndOfStream()) {
auto entry = cursor.advance();
if (entry.Kind == llvm::BitstreamEntry::EndBlock)
break;
if (entry.Kind == llvm::BitstreamEntry::Error)
return true;
scratch.clear();
StringRef blobData;
unsigned kind = cursor.readRecord(entry.ID, scratch, &blobData);
switch (kind) {
case input_block::FILE_DEPENDENCY:
dependencies.push_back(blobData);
break;
default:
// Unknown metadata record, possibly for use by a future version of the
// module format.
break;
}
}
return false;
}
bool serialization::isSerializedAST(StringRef data) {
StringRef signatureStr(reinterpret_cast<const char *>(SWIFTMODULE_SIGNATURE),
llvm::array_lengthof(SWIFTMODULE_SIGNATURE));
@@ -240,7 +269,8 @@ bool serialization::isSerializedAST(StringRef data) {
ValidationInfo serialization::validateSerializedAST(
StringRef data,
ExtendedValidationInfo *extendedInfo) {
ExtendedValidationInfo *extendedInfo,
SmallVectorImpl<StringRef> *dependencies) {
ValidationInfo result;
// Check 32-bit alignment.
@@ -270,6 +300,13 @@ ValidationInfo serialization::validateSerializedAST(
extendedInfo);
if (result.status == Status::Malformed)
return result;
} else if (dependencies &&
topLevelEntry.ID == INPUT_BLOCK_ID) {
cursor.EnterSubBlock(INPUT_BLOCK_ID);
if (validateInputBlock(cursor, scratch, *dependencies)) {
result.status = Status::Malformed;
return result;
}
} else {
if (cursor.SkipBlock()) {
result.status = Status::Malformed;