test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes by durin42 · Pull Request #159607 · rust-lang/rust

durin42 · 2026-07-20T14:55:04Z

LLVM 24 updates (in llvm/llvm-project@bff9c544bd87) the diagnostic string for the RISC-V GPR register class in MC. As a result, invalid register operand references (such as x16..=x31 on riscv32e targets) now emit "register must be a GPR" instead of "invalid operand for instruction".

To keep the test passing on both LLVM <=23 and LLVM >=24, split the target revisions into versioned pairs (e.g. riscv32e_llvm23 and riscv32e_llvm24) gated by max-llvm-major-version: 23 and min-llvm-version: 24, respectively, with corresponding stderr references. This is admittedly a bit aggressive - I'm also fine if we want to just set a max-llvm-major-version and ignore it or preemptively bump it for 24 and set the min version instead of this complexity.

rustbot · 2026-07-20T14:55:09Z

r? @mati865

rustbot has assigned @mati865.
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

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 74 candidates
Random selection from 18 candidates

nikic · 2026-07-20T15:11:58Z

This is in LLVM 24, not LLVM 23.

durin42 · 2026-07-20T15:26:17Z

This is in LLVM 24, not LLVM 23.

Whoops, thanks! I hadn't noticed upstream had bumped.

TimNN · 2026-07-20T17:58:40Z

As an alternative fix, we could also normalize the old error message to the new one, I believe, with a custom replacement pattern: https://rustc-dev-guide.rust-lang.org/tests/ui.html#normalization

mati865 · 2026-07-21T20:02:53Z

@rustbot reroll

TaKO8Ki · 2026-07-21T20:22:51Z

r? wg-llvm

nikic · 2026-07-21T20:30:12Z

-//@ [riscv32emc] compile-flags: --target=riscv32emc-unknown-none-elf
+//@ [riscv32e_llvm23] needs-llvm-components: riscv
+//@ [riscv32e_llvm23] compile-flags: --target=riscv32e-unknown-none-elf
+//@ [riscv32e_llvm23] max-llvm-major-version: 22


Still referencing the wrong versions in max-llvm-major-version/min-llvm-version?

View changes since the review

nikic · 2026-07-22T08:08:00Z

@bors squash description

rust-bors · 2026-07-22T08:08:03Z

Unknown argument "description". Did you mean to use @bors squash [msg|message="<commit-msg>"|description]? Run @bors help or go to https://bors.rust-lang.org/help to see available commands.

nikic · 2026-07-22T08:08:37Z

@bors squash msg=description

…ring for the RISC-V GPR register class in MC. As a result, invalid register operand references (such as x16..=x31 on riscv32e targets) now emit "register must be a GPR" instead of "invalid operand for instruction". To keep the test passing on both LLVM <=23 and LLVM >=24, split the target revisions into versioned pairs (e.g. riscv32e_llvm23 and riscv32e_llvm24) gated by `max-llvm-major-version: 23` and `min-llvm-version: 24`, respectively, with corresponding stderr references. This is admittedly a bit aggressive - I'm also fine if we want to just set a max-llvm-major-version and ignore it or preemptively bump it for 24 and set the min version instead of this complexity.

rust-bors · 2026-07-22T08:09:00Z

🔨 4 commits were squashed into 2f5a71d.

nikic · 2026-07-22T08:09:43Z

@bors r+

rust-bors · 2026-07-22T08:09:46Z

📌 Commit 2f5a71d has been approved by nikic

It is now in the queue for this repository.

…, r=nikic test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes LLVM 24 updates (in llvm/llvm-project@bff9c544bd87) the diagnostic string for the RISC-V GPR register class in MC. As a result, invalid register operand references (such as x16..=x31 on riscv32e targets) now emit "register must be a GPR" instead of "invalid operand for instruction". To keep the test passing on both LLVM <=23 and LLVM >=24, split the target revisions into versioned pairs (e.g. riscv32e_llvm23 and riscv32e_llvm24) gated by `max-llvm-major-version: 23` and `min-llvm-version: 24`, respectively, with corresponding stderr references. This is admittedly a bit aggressive - I'm also fine if we want to just set a max-llvm-major-version and ignore it or preemptively bump it for 24 and set the min version instead of this complexity.

…uwer Rollup of 8 pull requests Successful merges: - #159712 (Subtree sync for rustc_codegen_cranelift) - #155697 (Stabilize c-variadic function definitions) - #159285 (Simplify `apply_effects_in_range`) - #159607 (test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes) - #159659 (Move `Limit` out of `rustc_hir`) - #159451 (Remove config cloning in compiletest) - #159646 (Increase depth for float infer var fallback hack) - #159705 (bootstrap: Prefer `cfg!(not(test))` when skipping code paths during unit tests)

…, r=nikic test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes LLVM 24 updates (in llvm/llvm-project@bff9c544bd87) the diagnostic string for the RISC-V GPR register class in MC. As a result, invalid register operand references (such as x16..=x31 on riscv32e targets) now emit "register must be a GPR" instead of "invalid operand for instruction". To keep the test passing on both LLVM <=23 and LLVM >=24, split the target revisions into versioned pairs (e.g. riscv32e_llvm23 and riscv32e_llvm24) gated by `max-llvm-major-version: 23` and `min-llvm-version: 24`, respectively, with corresponding stderr references. This is admittedly a bit aggressive - I'm also fine if we want to just set a max-llvm-major-version and ignore it or preemptively bump it for 24 and set the min version instead of this complexity.

…uwer Rollup of 12 pull requests Successful merges: - #159712 (Subtree sync for rustc_codegen_cranelift) - #155697 (Stabilize c-variadic function definitions) - #159285 (Simplify `apply_effects_in_range`) - #159596 (unify the AST repr of type const and const RHS) - #159607 (test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes) - #159659 (Move `Limit` out of `rustc_hir`) - #159707 (fix error when a dangling ref in a ManuallyDrop is used in a pattern) - #158479 (Reject static item as direct const generic arg) - #158738 (next_trait_solver: Recover from GCE const exprs) - #159451 (Remove config cloning in compiletest) - #159646 (Increase depth for float infer var fallback hack) - #159705 (bootstrap: Prefer `cfg!(not(test))` when skipping code paths during unit tests)

…uwer Rollup of 11 pull requests Successful merges: - #159712 (Subtree sync for rustc_codegen_cranelift) - #155697 (Stabilize c-variadic function definitions) - #159285 (Simplify `apply_effects_in_range`) - #159596 (unify the AST repr of type const and const RHS) - #159607 (test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes) - #159659 (Move `Limit` out of `rustc_hir`) - #159707 (fix error when a dangling ref in a ManuallyDrop is used in a pattern) - #158738 (next_trait_solver: Recover from GCE const exprs) - #159451 (Remove config cloning in compiletest) - #159646 (Increase depth for float infer var fallback hack) - #159705 (bootstrap: Prefer `cfg!(not(test))` when skipping code paths during unit tests)

Rollup merge of #159607 - durin42:llvm-23-riscv32e-error-msg, r=nikic test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes LLVM 24 updates (in llvm/llvm-project@bff9c544bd87) the diagnostic string for the RISC-V GPR register class in MC. As a result, invalid register operand references (such as x16..=x31 on riscv32e targets) now emit "register must be a GPR" instead of "invalid operand for instruction". To keep the test passing on both LLVM <=23 and LLVM >=24, split the target revisions into versioned pairs (e.g. riscv32e_llvm23 and riscv32e_llvm24) gated by `max-llvm-major-version: 23` and `min-llvm-version: 24`, respectively, with corresponding stderr references. This is admittedly a bit aggressive - I'm also fine if we want to just set a max-llvm-major-version and ignore it or preemptively bump it for 24 and set the min version instead of this complexity.

…uwer Rollup of 11 pull requests Successful merges: - rust-lang/rust#159712 (Subtree sync for rustc_codegen_cranelift) - rust-lang/rust#155697 (Stabilize c-variadic function definitions) - rust-lang/rust#159285 (Simplify `apply_effects_in_range`) - rust-lang/rust#159596 (unify the AST repr of type const and const RHS) - rust-lang/rust#159607 (test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes) - rust-lang/rust#159659 (Move `Limit` out of `rustc_hir`) - rust-lang/rust#159707 (fix error when a dangling ref in a ManuallyDrop is used in a pattern) - rust-lang/rust#158738 (next_trait_solver: Recover from GCE const exprs) - rust-lang/rust#159451 (Remove config cloning in compiletest) - rust-lang/rust#159646 (Increase depth for float infer var fallback hack) - rust-lang/rust#159705 (bootstrap: Prefer `cfg!(not(test))` when skipping code paths during unit tests)

rustbot assigned mati865 Jul 20, 2026

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 20, 2026

rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Jul 20, 2026

This comment has been minimized.

Sign in to view

durin42 force-pushed the llvm-23-riscv32e-error-msg branch from fd6c050 to 3560100 Compare July 20, 2026 15:15

This comment has been minimized.

Sign in to view

durin42 force-pushed the llvm-23-riscv32e-error-msg branch from 158ce79 to 6b61b48 Compare July 20, 2026 15:37

This comment has been minimized.

Sign in to view

rustbot assigned TaKO8Ki and unassigned mati865 Jul 21, 2026

rustbot assigned nikic and unassigned TaKO8Ki Jul 21, 2026

nikic reviewed Jul 21, 2026

View reviewed changes

nikic changed the title ~~test: update riscv32e-registers.rs for LLVM 23 MC diagnostic changes~~ test: update riscv32e-registers.rs for LLVM 24 MC diagnostic changes Jul 22, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot force-pushed the llvm-23-riscv32e-error-msg branch from 70dcc5f to 2f5a71d Compare July 22, 2026 08:09

rust-bors Bot 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 22, 2026

JonathanBrouwer mentioned this pull request Jul 22, 2026

Rollup of 4 pull requests #159709

Closed

JonathanBrouwer mentioned this pull request Jul 22, 2026

Rollup of 8 pull requests #159715

Closed

JonathanBrouwer mentioned this pull request Jul 22, 2026

Rollup of 12 pull requests #159723

Closed

JonathanBrouwer mentioned this pull request Jul 22, 2026

Rollup of 11 pull requests #159728

Merged

rust-bors Bot merged commit fa3a58e into rust-lang:main Jul 22, 2026
13 checks passed

rustbot added this to the 1.99.0 milestone Jul 22, 2026

Uh oh!

Uh oh!

Conversation

durin42 commented Jul 20, 2026 • edited by nikic Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 20, 2026

Uh oh!

This comment has been minimized.

nikic commented Jul 20, 2026

Uh oh!

durin42 commented Jul 20, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

TimNN commented Jul 20, 2026

Uh oh!

mati865 commented Jul 21, 2026

Uh oh!

TaKO8Ki commented Jul 21, 2026

Uh oh!

nikic Jul 21, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nikic commented Jul 22, 2026

Uh oh!

rust-bors Bot commented Jul 22, 2026

Uh oh!

nikic commented Jul 22, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Jul 22, 2026

Uh oh!

nikic commented Jul 22, 2026

Uh oh!

rust-bors Bot commented Jul 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

durin42 commented Jul 20, 2026 •

edited by nikic

Loading

nikic Jul 21, 2026 •

edited by rustbot

Loading