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] Don't repeat the record code after the layout declaration.

Browse Source 
Also, add some static_asserts to diagnose misuse of BCRecordLayout.

No functionality change.

Swift SVN r5132
This commit is contained in:
Jordan Rose
2013-05-09 22:58:05 +00:00
parent 30068c662a
commit 566e9c9ced
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/Serialization.cpp
View File

@@ -109,7 +109,7 @@ void Serializer::writeHeader() {
BCBlockRAII restoreBlock(Out, CONTROL_BLOCK_ID, 3);
BCRecordLayout<
BCLiteral<METADATA>, // ID
METADATA, // ID
BCFixed<16>, // Module format major version
BCFixed<16>, // Module format minor version
BCBlob // misc. version information
@@ -122,7 +122,7 @@ void Serializer::writeHeader() {
# define EXTRA_VERSION_STRING PACKAGE_STRING
#endif
Metadata.emit(ScratchRecord,
METADATA, VERSION_MAJOR, VERSION_MINOR, EXTRA_VERSION_STRING);
VERSION_MAJOR, VERSION_MINOR, EXTRA_VERSION_STRING);
#undef EXTRA_VERSION_STRING
}
}
@@ -132,7 +132,7 @@ void Serializer::writeInputFiles(llvm::SourceMgr &sourceMgr,
BCBlockRAII restoreBlock(Out, INPUT_BLOCK_ID, 3);
BCRecordLayout<
BCLiteral<SOURCE_FILE>, // ID
SOURCE_FILE,
BCBlob // path
> SourceFile(Out);
@@ -146,7 +146,7 @@ void Serializer::writeInputFiles(llvm::SourceMgr &sourceMgr,
if (err)
continue;
SourceFile.emit(ScratchRecord, SOURCE_FILE, path);
SourceFile.emit(ScratchRecord, path);
}
}