Skip to content

bootstrap: validate rust.codegen-backends & target.<triple>.codegen-backends #142212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 3, 2025
Merged

bootstrap: validate rust.codegen-backends & target.<triple>.codegen-backends #142212

merged 1 commit into from
Jul 3, 2025
+29 −36

Conversation

GrigorenkoPV
Copy link
Contributor

@GrigorenkoPV GrigorenkoPV commented Jun 8, 2025 •
edited by rustbot
Loading

As per #142184 (comment).

Closes #142184.

@rustbot
Copy link
Collaborator

rustbot commented Jun 8, 2025

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 8, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 8, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

workingjubilee
workingjubilee reviewed Jun 9, 2025
View reviewed changes
src/bootstrap/src/core/config/toml/rust.rs Outdated
Comment on lines 403 to 406
if !VALID_CODEGEN_BACKENDS.contains(&&**backend) {
let section = section();
panic!(
"Invalid value '{backend}' for '{section}.codegen-backends'. Permitted values: {VALID_CODEGEN_BACKENDS:?}."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mh, I remember a PR deliberately introduce the fallthrough to the previous else if this condition fails to obtain? it was about using an out-of-tree codegen backend, I believe.

cc @FractalFir @WaffleLapkin

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect the intent was to panic for codegen backend names starting with rustc_codegen_, while only warning for unknown backends. As written before this PR however it would only panic/warn when the name starts with rustc_codegen_ and don't check the name otherwise however.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not very familiar with this part of the compiler, but, to be honest, I don't see why we should panic on an unknown backend. If I am understanding things correctly, then this will warn people about unknown codegen backends anyway.

My backend in particular does not strictly need this to function(I can override the backend using RUSTFLAGS), but I still think a warning may be better than an outright error here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The panic is for when we know for sure that the backend is specified wrong. Backends should never be specified with the rustc_codegen_ prefix. That is already implicitly added, so you would end up with a path like compiler/rustc_codegen_rustc_codegen_foo if you specified rustc_codegen_foo. Do note that we already panic on other invalid config options.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with everything above, I think. Panic on rustc_codegen_ prefix makes sense, but checking for known values (llvm/cranelift/gcc) is annoying for out-of-tree backends like my employer's.

@workingjubilee workingjubilee changed the title bootstrap: validate rust.codegen-backends & targer.<triple>.codegen-backends bootstrap: validate rust.codegen-backends & target.<triple>.codegen-backends Jun 9, 2025
@GrigorenkoPV
Copy link
Contributor Author

r? bootstrap

@rustbot rustbot assigned Kobzol and unassigned albertlarsan68 Jul 1, 2025
Kobzol
Kobzol reviewed Jul 2, 2025
View reviewed changes
Copy link
Member

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left two nits, otherwise LGTM.

@Kobzol
Copy link
Member

Kobzol commented Jul 2, 2025

Thanks!

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 2, 2025

📌 Commit 2ab641d has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 2, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 2, 2025
Merged
bors added a commit that referenced this pull request Jul 2, 2025
@bors
Auto merge of #143338 - matthiaskrgr:rollup-ykaxh04, r=<try>
3207ab5 
Rollup of 11 pull requests

Successful merges:

 - #131923 (Derive `Copy` and `Hash` for `IntErrorKind`)
 - #138340 (Remove some unsized tuple impls now that we don't support unsizing tuples anymore)
 - #141219 (Change `{Box,Arc,Rc,Weak}::into_raw` to only work with `A = Global`)
 - #142212 (bootstrap: validate `rust.codegen-backends` & `target.<triple>.codegen-backends`)
 - #142237 (Detect more cases of unused_parens around types)
 - #142964 (Attribute rework: a parser for single attributes without arguments)
 - #143070 (Rewrite `macro_rules!` parser to not use the MBE engine itself)
 - #143235 (Assemble const bounds via normal item bounds in old solver too)
 - #143261 (Feed `explicit_predicates_of` instead of `predicates_of`)
 - #143276 (loop match: handle opaque patterns)
 - #143306 (Add `track_caller` attributes to trace origin of Clippy lints)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: x86_64-gnu
try-job: dist-i586-gnu-i586-i686-musl
try-job: test-various
bors added a commit that referenced this pull request Jul 2, 2025
@bors
Auto merge of #143338 - matthiaskrgr:rollup-ykaxh04, r=matthiaskrgr
25face9 
Rollup of 11 pull requests

Successful merges:

 - #131923 (Derive `Copy` and `Hash` for `IntErrorKind`)
 - #138340 (Remove some unsized tuple impls now that we don't support unsizing tuples anymore)
 - #141219 (Change `{Box,Arc,Rc,Weak}::into_raw` to only work with `A = Global`)
 - #142212 (bootstrap: validate `rust.codegen-backends` & `target.<triple>.codegen-backends`)
 - #142237 (Detect more cases of unused_parens around types)
 - #142964 (Attribute rework: a parser for single attributes without arguments)
 - #143070 (Rewrite `macro_rules!` parser to not use the MBE engine itself)
 - #143235 (Assemble const bounds via normal item bounds in old solver too)
 - #143261 (Feed `explicit_predicates_of` instead of `predicates_of`)
 - #143276 (loop match: handle opaque patterns)
 - #143306 (Add `track_caller` attributes to trace origin of Clippy lints)

r? `@ghost`
`@rustbot` modify labels: rollup

try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: x86_64-gnu
try-job: dist-i586-gnu-i586-i686-musl
try-job: test-various
@bors bors merged commit d50240b into rust-lang:master Jul 3, 2025
10 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 3, 2025
rust-timer added a commit that referenced this pull request Jul 3, 2025
@rust-timer
Unrolled build for #142212
7135352 
Rollup merge of #142212 - GrigorenkoPV:codegens, r=Kobzol

bootstrap: validate `rust.codegen-backends` & `target.<triple>.codegen-backends`

As per #142184 (comment).

Closes #142184.
@GrigorenkoPV GrigorenkoPV deleted the codegens branch July 3, 2025 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

@bjorn3 bjorn3 bjorn3 left review comments

@WaffleLapkin WaffleLapkin WaffleLapkin left review comments

@workingjubilee workingjubilee workingjubilee left review comments

@FractalFir FractalFir FractalFir left review comments

Assignees

@Kobzol Kobzol

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.90.0
Development

Successfully merging this pull request may close these issues.

Bootstrap ignores unknown values for codegen-backends
9 participants
@GrigorenkoPV @rustbot @Kobzol @bors @bjorn3 @WaffleLapkin @workingjubilee @FractalFir @albertlarsan68