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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-08-16 17:13:42 -07:00
parent 82e47db473 eed2462680
commit 4211b1bf1a
41 changed files with 598 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/Serialization.cpp
View File

@@ -816,6 +816,7 @@ void Serializer::writeBlockInfoBlock() {
BLOCK_RECORD(options_block, RESILIENCE_STRATEGY);
BLOCK_RECORD(options_block, IS_ALLOW_MODULE_WITH_COMPILER_ERRORS_ENABLED);
BLOCK_RECORD(options_block, MODULE_ABI_NAME);
BLOCK_RECORD(options_block, IS_CONCURRENCY_CHECKED);
BLOCK(INPUT_BLOCK);
BLOCK_RECORD(input_block, IMPORTED_MODULE);
@@ -1030,6 +1031,11 @@ void Serializer::writeHeader(const SerializationOptions &options) {
ABIName.emit(ScratchRecord, M->getABIName().str());
}
if (M->isConcurrencyChecked()) {
options_block::IsConcurrencyCheckedLayout IsConcurrencyChecked(Out);
IsConcurrencyChecked.emit(ScratchRecord);
}
if (options.SerializeOptionsForDebugging) {
options_block::SDKPathLayout SDKPath(Out);
options_block::XCCLayout XCC(Out);