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 pull request #75589 from swiftlang/egorzhdan/linux-libcxx-interop

Browse Source 
[cxx-interop] Allow compiling with libc++ on Linux
This commit is contained in:
Egor Zhdan
2024-08-09 13:42:29 +01:00
committed by GitHub
parent a1eed1fab1 059f0f97d1
commit bfe72b4be9
31 changed files with 348 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -198,6 +198,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;
@@ -1461,6 +1466,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;