Merge compiletest directives to do with llvm versions - #160637
Open
WaffleLapkin wants to merge 5 commits into
Open
WaffleLapkin wants to merge 5 commits into
WaffleLapkin wants to merge 5 commits into
Conversation
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu Some changes occurred in coverage tests. cc @Zalathar
|
rustbot
added
A-compiletest
Collaborator
|
|
rustbot
added
F-explicit_tail_calls
WaffleLapkin
commented
Aug 6, 2026
| assert_eq!(extract_llvm_version("9.0.1-rust-1.43.0-dev"), Version::new(9, 0, 1)); | ||
| assert_eq!(extract_llvm_version("9.3.1-rust-1.43.0-dev"), Version::new(9, 3, 1)); | ||
| assert_eq!(extract_llvm_version("10.0.0-rust"), Version::new(10, 0, 0)); | ||
| // assert_eq!(extract_llvm_version("4.5.6git"), Version::new(4, 5, 6)); |
Member
Author
There was a problem hiding this comment.
Is this an actual version string that llvm outputs? In that case I'll have to (partially?) revert the change to extract_llvm_version...
Member
There was a problem hiding this comment.
I don't think so, this was probably just trying to hedge against trailing random things
Member
There was a problem hiding this comment.
Unfortunately I take that back, I believe for certain LLVM builds, the version string can actually be NNN.N.Ngit, e.g. llvm/llvm-project#71742, in particular if the LLVM build isn't from rc/release tags?
This comment has been minimized.
This comment has been minimized.
WaffleLapkin
force-pushed
the
llvm-version-less-than-three
branch
from
August 6, 2026 13:27
cfd0ca7 to
968a931
Compare
jieyouxu
reviewed
Aug 9, 2026
Comment on lines
+220
to
+228
| - `llvm-version: cmp` — ignore if the LLVM version doesn't match the comparator; examples of comparators that can be used: | ||
| - `=22` — ignored if the LLVM major version does not match the given value | ||
| - `>=22` — ignored if the LLVM major version is less than the given value | ||
| - `<=22` — ignored if the LLVM major version is higher than the given major version | ||
| - `>=22, <=23` — ignored if the LLVM major version is outside the given range | ||
| - all of the above can specify minor and patch version too, `=22.1`, `<=22.1`, `>=22.1` | ||
| - for a full list see [`semver` crate documentation](https://docs.rs/semver/latest/semver/struct.Comparator.html) | ||
| - `system-llvm-version: cmp` — ignored if using a system LLVM and its version does not match the comparator; see above for examples of comparators | ||
| - `ignore-llvm-version: cmp` — ignored if LLVM version **matches** the comparator; see above for examples of comparators |
Member
There was a problem hiding this comment.
Discussion (not necessarily for this PR, but): hm, right now, //@ edition uses the range literal format (e.g. 2015..2021. I think > et al. are entirely reasonable for //@ llvm-version or //@ system-llvm-version, just that edition would be a different syntax.
I almost wonder if we should just, change //@ edition to use >/</<=/>=? For edition, at the time it was added, there was just a need for a syntax, not necessarily married to ../..=.
| assert_eq!(extract_llvm_version("9.0.1-rust-1.43.0-dev"), Version::new(9, 0, 1)); | ||
| assert_eq!(extract_llvm_version("9.3.1-rust-1.43.0-dev"), Version::new(9, 3, 1)); | ||
| assert_eq!(extract_llvm_version("10.0.0-rust"), Version::new(10, 0, 0)); | ||
| // assert_eq!(extract_llvm_version("4.5.6git"), Version::new(4, 5, 6)); |
Member
There was a problem hiding this comment.
Unfortunately I take that back, I believe for certain LLVM builds, the version string can actually be NNN.N.Ngit, e.g. llvm/llvm-project#71742, in particular if the LLVM build isn't from rc/release tags?
Comment on lines
345
to
346
| let config: Config = cfg().llvm_version("10.6.2").build(); | ||
| assert!(!check_ignore(&config, "//@ exact-llvm-major-version: 10")); |
Member
There was a problem hiding this comment.
Question: wait, does this test case actually still pass...?
Member
|
(The overall change def makes sense to me though) |
rustbot
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
Instead of having separate directives for major versions and whatnot, just use the semver version requirement.
…vm-version` If we don't want them to combine we should explicitly disallow them...
WaffleLapkin
force-pushed
the
llvm-version-less-than-three
branch
from
September 30, 2026 13:35
968a931 to
27f9259
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
☔ The latest upstream changes (presumably #163680) made this pull request unmergeable. Please resolve the merge conflicts by rebasing. |
This branch has not been deployed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
I got confused by
min-llvm-versionandmax-llvm-major-versionbeing different not only inmin/max(-major).... So I decided to refactor everything to just use semver version requirements (
//@ llvm-version: <=22, etc). IMO this is much nicer.r? @jieyouxu