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-main-merge

Browse Source 
Conflicts:
  - `lib/Driver/ToolChains.cpp` conflicting with the `addAllArgs` rename
    for multiple options
This commit is contained in:
Ben Barham
2024-09-16 13:53:18 -07:00
parent 0358c9eab7 0bd4e4e921
commit a7b50f357f
487 changed files with 8947 additions and 6026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -210,6 +210,9 @@ static bool readOptionsBlock(llvm::BitstreamCursor &cursor,
case options_block::SERIALIZE_PACKAGE_ENABLED:
extendedInfo.setSerializePackageEnabled(true);
break;
case options_block::PUBLIC_MODULE_NAME:
extendedInfo.setPublicModuleName(blobData);
break;
default:
// Unknown options record, possibly for use by a future version of the
// module format.
@@ -1475,6 +1478,7 @@ ModuleFileSharedCore::ModuleFileSharedCore(
ModuleABIName = extInfo.getModuleABIName();
ModulePackageName = extInfo.getModulePackageName();
ModuleExportAsName = extInfo.getExportAsName();
PublicModuleName = extInfo.getPublicModuleName();
hasValidControlBlock = true;
break;