Merge remote-tracking branch 'origin/main' into rebranch

This commit is contained in:
swift-ci
2023-01-27 21:35:06 -08:00
17 changed files with 165 additions and 3 deletions

View File

@@ -166,6 +166,9 @@ static bool readOptionsBlock(llvm::BitstreamCursor &cursor,
case options_block::MODULE_PACKAGE_NAME:
extendedInfo.setModulePackageName(blobData);
break;
case options_block::MODULE_EXPORT_AS_NAME:
extendedInfo.setExportAsName(blobData);
break;
default:
// Unknown options record, possibly for use by a future version of the
// module format.
@@ -1350,6 +1353,7 @@ ModuleFileSharedCore::ModuleFileSharedCore(
MiscVersion = info.miscVersion;
ModuleABIName = extInfo.getModuleABIName();
ModulePackageName = extInfo.getModulePackageName();
ModuleExportAsName = extInfo.getExportAsName();
hasValidControlBlock = true;
break;