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
2022-12-09 17:33:36 -08:00
parent fcdbbfe6d8 45cd83d73e
commit b6ccc365d8
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Serialization/ModuleFileSharedCore.cpp
View File

@@ -360,11 +360,9 @@ static ValidationInfo validateControlBlock(
static const char* forcedDebugRevision =
::getenv("SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION");
bool isCompilerTagged = forcedDebugRevision ||
version::isCurrentCompilerTagged();
StringRef moduleRevision = blobData;
if (isCompilerTagged) {
if (forcedDebugRevision ||
(requiresRevisionMatch && version::isCurrentCompilerTagged())) {
StringRef compilerRevision = forcedDebugRevision ?
forcedDebugRevision : version::getCurrentCompilerTag();
if (moduleRevision != compilerRevision) {