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
2024-05-17 11:36:37 -07:00
parent ae20b891ce fac06ab12f
commit 97775b94ad
8 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -355,6 +355,9 @@ static ValidationInfo validateControlBlock(
case control_block::ALLOWABLE_CLIENT_NAME:
result.allowableClients.push_back(blobData);
break;
case control_block::SDK_VERSION:
result.sdkVersion = blobData;
break;
case control_block::SDK_NAME: {
result.sdkName = blobData;
@@ -691,6 +694,7 @@ void ModuleFileSharedCore::outputDiagnosticInfo(llvm::raw_ostream &os) const {
<< "', builder version '" << MiscVersion
<< "', built from "
<< (Bits.IsBuiltFromInterface? "swiftinterface": "source")
<< " against SDK " << SDKVersion
<< ", " << (resilient? "resilient": "non-resilient");
if (Bits.AllowNonResilientAccess)
os << ", built with -experimental-allow-non-resilient-access";
@@ -1454,6 +1458,7 @@ ModuleFileSharedCore::ModuleFileSharedCore(
Bits.AllowNonResilientAccess = extInfo.allowNonResilientAccess();
Bits.SerializePackageEnabled = extInfo.serializePackageEnabled();
MiscVersion = info.miscVersion;
SDKVersion = info.sdkVersion;
ModuleABIName = extInfo.getModuleABIName();
ModulePackageName = extInfo.getModulePackageName();
ModuleExportAsName = extInfo.getExportAsName();