Add {ignore,needs}-{rustc,std}-debug-assertions directive support
#131913
+119
−43
Conversation
This file contains 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
rustbot
added
A-compiletest
| @@ -1,6 +1,7 @@ | |||
| //@ compile-flags: -O -C no-prepopulate-passes | |||
| //@ only-x86_64 (to not worry about usize differing) | |||
| //@ ignore-debug: precondition checks make mem::replace not a candidate for MIR inlining | |||
There was a problem hiding this comment.
Just to check: we have some lint or w/e that will fail CI if someone adds a test with ignore-debug as we merge this PR?
There was a problem hiding this comment.
compiletest (currently) has an allowlist of known directives, I've removed ignore-debug from that so compiletest will error if someone writes ignore-debug (should be in the first commit) which will fail locally and in CI. (This is current stopgap solution before fixing how directives are handled)
There was a problem hiding this comment.
It will fail looking like (I know it's not super user friendly)
Testing stage1 compiletest suite=ui mode=ui (x86_64-pc-windows-msvc)
error: detected unknown compiletest test directive `only-debug` in X:\repos\rust\tests\ui\print_type_sizes\niche-filling.rs:13
errors encountered during EarlyProps parsing: X:\repos\rust\tests\ui\print_type_sizes\niche-filling.rs
thread 'main' panicked at src\tools\compiletest\src\header.rs:68:13:
errors encountered during EarlyProps parsing
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
jieyouxu
commented
Oct 20, 2024
| "ignore-debug", | ||
| "ignore-debug-assertions-rustc", |
jieyouxu
force-pushed
the
only_debug_assertions
branch
from
30e1d8a
to
2653a4a
Compare
|
This PR modifies If appropriate, please update |
|
Accompanying rustc-dev-guide PR: rust-lang/rustc-dev-guide#2101 |
jieyouxu
changed the title
{ignore,needs}-debug-assertions-{rustc,std} directive support{ignore,needs}-{rustc,std}-debug-assertions directive support
jieyouxu
added
S-waiting-on-author
jieyouxu
commented
Oct 20, 2024
Comment on lines
-1112
to
+1122
| debug_assertions: Option<bool> = "debug-assertions", | ||
| rustc_debug_assertions: Option<bool> = "debug-assertions", | ||
| randomize_layout: Option<bool> = "randomize-layout", | ||
| debug_assertions_std: Option<bool> = "debug-assertions-std", | ||
| std_debug_assertions: Option<bool> = "debug-assertions-std", |
There was a problem hiding this comment.
I did not change the config.toml user-facing toml name.
jieyouxu
force-pushed
the
only_debug_assertions
branch
from
2653a4a
to
014191d
Compare
Changes since last review
|
|
@rustbot ready |
rustbot
added
S-waiting-on-review
This comment was marked as resolved.
This comment was marked as resolved.
jieyouxu
added
S-waiting-on-author
jieyouxu
force-pushed
the
only_debug_assertions
branch
from
014191d
to
c46a1ca
Compare
This comment has been minimized.
This comment has been minimized.
jieyouxu
force-pushed
the
only_debug_assertions
branch
from
c46a1ca
to
2021e10
Compare
|
Rebased and split compiletest/bootstrap changes into two commits, but no functional changes. @rustbot ready |
rustbot
added
S-waiting-on-review
This comment was marked as resolved.
This comment was marked as resolved.
…ive support And retire the old `only-debug` directive which was ambiguous and only for std debug assertions.
And rename local variables and field names in bootstrap from
`debug_assertions{,_std}` -> `{rustc,std}-debug-assertions` to avoid
confusion where applicable.
jieyouxu
force-pushed
the
only_debug_assertions
branch
from
2021e10
to
0d5cc8e
Compare
|
Rebased, no changes. |
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.
Add
{ignore,needs}-{rustc,std}-debug-assertionscompiletest directives and retire the old{ignore,only}-debugdirectives. The old{ignore,only}-debugdirectives were ambiguous because you could have std built with debug assertions but rustc not built with debug assertions or vice versa. If we want to support the use case of controlling test run based on if rustc was built with debug assertions, then having{ignore,only}-debugwill be very confusing.cc @matthiaskrgr
Closes #123987.
r? bootstrap (or compiler tbh)