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

[Frontend/Serialization] Narrow -swift-compiler-version to -interface-compiler-version

Browse Source 
It might be unexpected to future users that `-swift-compiler-version`
would produce a version aligned to .swiftinterface instead of one used
to build the .swiftmodule file. To avoid this possible confusion, let's
scope down the version to `-interface-compiler-version` flag and
`SWIFT_INTERFACE_COMPILER_VERSION` option in the module.
This commit is contained in:
Pavel Yaskevich
2024-10-28 11:19:14 -07:00
parent 83995f2ae0
commit 84a62fc170
18 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -214,8 +214,8 @@ static bool readOptionsBlock(llvm::BitstreamCursor &cursor,
case options_block::PUBLIC_MODULE_NAME:
extendedInfo.setPublicModuleName(blobData);
break;
case options_block::SWIFT_COMPILER_VERSION:
extendedInfo.setSwiftCompilerVersion(blobData);
case options_block::SWIFT_INTERFACE_COMPILER_VERSION:
extendedInfo.setSwiftInterfaceCompilerVersion(blobData);
break;
default:
// Unknown options record, possibly for use by a future version of the
@@ -1499,7 +1499,8 @@ ModuleFileSharedCore::ModuleFileSharedCore(
ModulePackageName = extInfo.getModulePackageName();
ModuleExportAsName = extInfo.getExportAsName();
PublicModuleName = extInfo.getPublicModuleName();
SwiftCompilerVersion = extInfo.getSwiftCompilerVersion();
SwiftInterfaceCompilerVersion =
extInfo.getSwiftInterfaceCompilerVersion();
hasValidControlBlock = true;
break;