Skip to content

Commit 45cd83d

Browse files
authored
Merge pull request #62488 from adrian-prantl/relax-tagged-check
Don't require a strict revision match in LLDB for tagged compilers.
2 parents 6cd1302 + 006ac8f commit 45cd83d

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

lib/Serialization/ModuleFileSharedCore.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,11 +360,9 @@ static ValidationInfo validateControlBlock(
360360
static const char* forcedDebugRevision =
361361
::getenv("SWIFT_DEBUG_FORCE_SWIFTMODULE_REVISION");
362362

363-
bool isCompilerTagged = forcedDebugRevision ||
364-
version::isCurrentCompilerTagged();
365-
366363
StringRef moduleRevision = blobData;
367-
if (isCompilerTagged) {
364+
if (forcedDebugRevision ||
365+
(requiresRevisionMatch && version::isCurrentCompilerTagged())) {
368366
StringRef compilerRevision = forcedDebugRevision ?
369367
forcedDebugRevision : version::getCurrentCompilerTag();
370368
if (moduleRevision != compilerRevision) {

0 commit comments

Comments
 (0)