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
2022-12-19 23:54:19 -08:00
parent 993a04d0b3 7323d32ea4
commit 50fff10c87
14 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -163,6 +163,9 @@ static bool readOptionsBlock(llvm::BitstreamCursor &cursor,
case options_block::IS_CONCURRENCY_CHECKED:
extendedInfo.setIsConcurrencyChecked(true);
break;
case options_block::MODULE_PACKAGE_NAME:
extendedInfo.setModulePackageName(blobData);
break;
default:
// Unknown options record, possibly for use by a future version of the
// module format.
@@ -1346,6 +1349,7 @@ ModuleFileSharedCore::ModuleFileSharedCore(
Bits.IsConcurrencyChecked = extInfo.isConcurrencyChecked();
MiscVersion = info.miscVersion;
ModuleABIName = extInfo.getModuleABIName();
ModulePackageName = extInfo.getModulePackageName();
hasValidControlBlock = true;
break;