[Serialization] Don't fail the precise tag check if only the last digit doesn't match #63639
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rename the env var to SWIFT_IGNORE_SWIFTMODULE_REVISION as it's recommended for use outside of testing.
…ag check Weaken the precise tag check at loading swiftmodule to accept binary modules build by a compiler with a tag where only the last digit is different. We assume that the other digit in the version should ensure compiler and stdlib compatibility. If the last digit doesn't match, still raise a remark. rdar://105158258
xymus
requested review from
artemcm,
hborla,
slavapestov and
xedin
as code owners
xymus
requested review from
bnbarham and
nkcsgexi
and removed request for
xedin,
slavapestov,
artemcm and
hborla
|
@swift-ci Please smoke test |
xymus
changed the title
artemcm
approved these changes
Feb 13, 2023
|
@swift-ci Please smoke test Linux |
nkcsgexi
approved these changes
Feb 14, 2023
bnbarham
approved these changes
Feb 14, 2023
| if (moduleRevision != compilerRevision) { | ||
| result.status = Status::RevisionIncompatible; | ||
| // The module versions are mismatching, record it and diagnose later. | ||
| result.problematicRevision = moduleRevision; |
There was a problem hiding this comment.
Could go with mismatchedRevision, but problematic is okay too
There was a problem hiding this comment.
I was working in diagnostics at the same time where we do use the generic problematic but here mismatched would be more precise. I'll try to update it next time I work in this code.
Comment on lines
91
to
+94
| version::Version compatibilityVersion = {}; | ||
| llvm::VersionTuple userModuleVersion; | ||
| StringRef sdkName = {}; | ||
| StringRef problematicRevision = {}; |
There was a problem hiding this comment.
All the {} aren't actually needed here - they'd already all be default initialized (like VersionTuple).
|
@swift-ci Please smoke test macos |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Weaken the precise tag check at loading swiftmodules to accept binary modules build by a compiler with a tag where only the last digit is different. This relies on the assumption that the other digits in the version should ensure compiler and stdlib compatibility. If the last digit doesn't match, raise a remark.
The new
getCurrentCompilerSerializationTagcan be used to add vendor-specific information in the tag.The precise tag check can be disabled with the env var
SWIFT_IGNORE_SWIFTMODULE_REVISION.rdar://105158258