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

[serialization] Include the module name in the serialized AST data.

Browse Source 
We don't currently use this for anything, but if we have the module name
available and easy to access in the bitstream, we can drop the wrapper
around the serialized AST that's put into the binary itself for use by LLDB.

Swift SVN r12921
This commit is contained in:
Jordan Rose
2014-01-24 18:42:06 +00:00
parent e54deeb3c5
commit af700a1912
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Serialization/ModuleFile.cpp
View File

@@ -28,6 +28,31 @@
using namespace swift;
using namespace swift::serialization;
static bool checkSignature(llvm::BitstreamCursor &cursor) {
for (unsigned char byte : SIGNATURE)
if (cursor.AtEndOfStream() || cursor.Read(8) != byte)
return false;
return true;
}
static bool enterTopLevelModuleBlock(llvm::BitstreamCursor &cursor) {
auto next = cursor.advance();
if (next.Kind != llvm::BitstreamEntry::SubBlock)
return false;
if (next.ID == llvm::bitc::BLOCKINFO_BLOCK_ID) {
if (cursor.ReadBlockInfoBlock())
return false;
return enterTopLevelModuleBlock(cursor);
}
if (next.ID != MODULE_BLOCK_ID)
return false;
cursor.EnterSubBlock(MODULE_BLOCK_ID);
return true;
}
static ModuleStatus
validateControlBlock(llvm::BitstreamCursor &cursor,
@@ -295,11 +320,9 @@ ModuleFile::ModuleFile(std::unique_ptr<llvm::MemoryBuffer> input)
llvm::BitstreamCursor cursor{InputReader};
for (unsigned char byte : SIGNATURE) {
if (cursor.AtEndOfStream() || cursor.Read(8) != byte) {
error();
return;
}
if (!checkSignature(cursor) || !enterTopLevelModuleBlock(cursor)) {
error();
return;
}
// Future-proofing: make sure we validate the control block before we try to
@@ -310,13 +333,6 @@ ModuleFile::ModuleFile(std::unique_ptr<llvm::MemoryBuffer> input)
auto topLevelEntry = cursor.advance();
while (topLevelEntry.Kind == llvm::BitstreamEntry::SubBlock) {
switch (topLevelEntry.ID) {
case llvm::bitc::BLOCKINFO_BLOCK_ID:
if (cursor.ReadBlockInfoBlock()) {
error();
return;
}
break;
case CONTROL_BLOCK_ID: {
cursor.EnterSubBlock(CONTROL_BLOCK_ID);