Skip to content
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.

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

llvm: Tolerate propagated range metadata #131798

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Conversation

maurer
Copy link
Contributor

@maurer maurer commented Oct 16, 2024

llvm/llvm-project#91101 propagates range information across inlining, resulting in more metadata in this test. Tolerate the range metadata if it appears.

@rustbot: label +llvm-main

r? @durin42

Please wait a moment before approving, putting the llvm-main tag on it to make sure it fixes the integration test.

llvm/llvm-project#91101 propagates range information across inlining,
resulting in more metadata in this test. Tolerate the range metadata if
it appears.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 16, 2024
@maurer
Copy link
Contributor Author

maurer commented Oct 16, 2024

@rustbot label: +llvm-main

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Oct 16, 2024
@maurer
Copy link
Contributor Author

maurer commented Oct 16, 2024

Integration test looks good, feel free to review/approve.

@durin42
Copy link
Contributor

durin42 commented Oct 16, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 16, 2024

📌 Commit 0e73095 has been approved by durin42

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 Oct 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#128391 (Change orphan hint from "only" to "any uncovered type inside...")
 - rust-lang#131583 (Setting up indirect access to external data for loongarch64-linux-{musl,ohos})
 - rust-lang#131595 (rustdoc-JSON: Rename "object safe" to "dyn compatible")
 - rust-lang#131748 (cleanup canonical queries)
 - rust-lang#131798 (llvm: Tolerate propagated range metadata)
 - rust-lang#131815 (compiler: use `is_none_or` where it is clearly better)
 - rust-lang#131822 (extract `expr_assign_expected_bool_error`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7ad2f60 into rust-lang:master Oct 17, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2024
Rollup merge of rust-lang#131798 - maurer:range-inlining, r=durin42

llvm: Tolerate propagated range metadata

llvm/llvm-project#91101 propagates range information across inlining, resulting in more metadata in this test. Tolerate the range metadata if it appears.

``@rustbot:`` label +llvm-main

r? ``@durin42``

Please wait a moment before approving, putting the llvm-main tag on it to make sure it fixes the integration test.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants