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 manual-rebranch-merge

Browse Source 
Conflicts:
  - `lib/Serialization/ModuleFormat.h` bumped version to account for
    differences between main and rebranch.
This commit is contained in:
Ben Barham
2024-08-09 15:22:39 -07:00
parent 1d19e19a73 c3e067bb34
commit 467e528200
162 changed files with 1420 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -199,6 +199,11 @@ static bool readOptionsBlock(llvm::BitstreamCursor &cursor,
case options_block::HAS_CXX_INTEROPERABILITY_ENABLED:
extendedInfo.setHasCxxInteroperability(true);
break;
case options_block::CXX_STDLIB_KIND:
unsigned rawKind;
options_block::CXXStdlibKindLayout::readRecord(scratch, rawKind);
extendedInfo.setCXXStdlibKind(static_cast<CXXStdlibKind>(rawKind));
break;
case options_block::ALLOW_NON_RESILIENT_ACCESS:
extendedInfo.setAllowNonResilientAccess(true);
break;
@@ -1462,6 +1467,7 @@ ModuleFileSharedCore::ModuleFileSharedCore(
extInfo.isAllowModuleWithCompilerErrorsEnabled();
Bits.IsConcurrencyChecked = extInfo.isConcurrencyChecked();
Bits.HasCxxInteroperability = extInfo.hasCxxInteroperability();
Bits.CXXStdlibKind = static_cast<uint8_t>(extInfo.getCXXStdlibKind());
Bits.AllowNonResilientAccess = extInfo.allowNonResilientAccess();
Bits.SerializePackageEnabled = extInfo.serializePackageEnabled();
MiscVersion = info.miscVersion;