small_data_threshold.rs: Adapt to LLVM head changes #130267
Merged
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
S-waiting-on-review
|
@rustbot author |
rustbot
added
S-waiting-on-author
rustbot
added
S-waiting-on-review
paulmenage
reviewed
Sep 12, 2024
| @@ -58,7 +58,7 @@ static mut Z: u64 = 0; | |||
| // Currently, only MIPS and RISCV successfully put any objects in the small data | |||
| // 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. |
nikic
changed the title
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2024
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
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 14, 2024
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`
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.
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