small_data_threshold.rs: Adapt to LLVM head changes#130267
small_data_threshold.rs: Adapt to LLVM head changes#130267bors merged 1 commit intorust-lang:masterfrom
Conversation
|
@rustbot author |
| // sections so the U/V/W/X tests are skipped on Hexagon and M68K | ||
|
|
||
| //@ RISCV: .section .sdata, | ||
| //@ RISCV: .section .sdata |
There was a problem hiding this comment.
The current (expected) output looks like
.section .sdata,"aw",@progbits
The new LLVM output appears to include the variable name as part of the section name, e.g. .sdata.U for variable U.
For now (dealing with both current and future LLVM behaviour) this change makes sense, but once the new LLVM is part of the regular build (when will that likely be?) we should update the test to match the full section names, something like
//@ RISCV: .section .sdata.U,
(and the other similar match lines).
That's better than was possible with the old LLVM version, as it ensures that we're matching against the .sdata section specifically for the variable U.
There was a problem hiding this comment.
when will that likely be?
In about half a year.
We could use .section .sdata{{(\.U)?}}, here, but not sure it's really better than just dropping the comma.
|
@bors r+ rollup |
|
📋 Looks like this PR is still in progress, ignoring approval. Hint: Remove WIP from this PR's title when it is ready for review. |
|
@bors r+ rollup |
Rollup of 4 pull requests Successful merges: - rust-lang#130053 (fix doc comments for Peekable::next_if(_eq)) - rust-lang#130267 (small_data_threshold.rs: Adapt to LLVM head changes) - rust-lang#130311 ((fix) conflicting negative impl marker) - rust-lang#130334 (Fix `SDKROOT` ignore on macOS) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#130267 - TimNN:patch-2, r=nikic small_data_threshold.rs: Adapt to LLVM head changes When compiled against LLVM head, `small_data_threshold.rs` [fails with](https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/31051#0191e508-f11d-437b-a4a0-5e18247debc9): ``` /.../small_data_threshold.rs:61:12: error: RISCV: expected string not found in input -- | //@ RISCV: .section .sdata, | ^ | /.../small_data_threshold.s:1:1: note: scanning from here | .text | ^ | /.../small_data_threshold.s:6:2: note: possible intended match here | .section .sdata.U,"aw",`@progbits` | ^ ``` I don't know how exactly the current output looks like, or if there was a specific reason for including the trailing comma on the first line. I only saw a failure for RISCV, but it seemed sensible to adjust MIPS as well. CI passes with this patch applied: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/31053 `@rustbot` label: +llvm-main cc `@paulmenage`
When compiled against LLVM head,
small_data_threshold.rsfails with:I don't know how exactly the current output looks like, or if there was a specific reason for including the trailing comma on the first line.
I only saw a failure for RISCV, but it seemed sensible to adjust MIPS as well.
CI passes with this patch applied: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/31053
@rustbot label: +llvm-main
cc @paulmenage