Skip to content

Restore pred_known_to_hold_modulo_regions #123578

New issue

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

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Conversation

lqd
Copy link
Member

@lqd lqd commented Apr 6, 2024

As requested by @lcnr in #123275 (comment) this PR restores pred_known_to_hold_modulo_regions to fix that "unexpected unsized tail" beta regression.

This also adds the reduced repro from #123275 (comment) as a sub-optimal test is better than no test at all, and it'll also cover #108721. It still ICEs on master, even though https://github.com/phlip9/rustc-warp-ice doesn't on nightly anymore, since #122493.

Fixes #123275.

r? @compiler-errors but feel free to close if you'd rather have a better test instead
cc @wesleywiser who had signed up to do the revert

Will need a backport if we go with this PR: @rustbot label +beta-nominated

@rustbot 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. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Apr 6, 2024
@compiler-errors
Copy link
Member

This is good enough.

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 8, 2024

📌 Commit 68b4257 has been approved by compiler-errors

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

Rollup of 9 pull requests

Successful merges:

 - rust-lang#122781 (Fix argument ABI for overaligned structs on ppc64le)
 - rust-lang#123367 (Safe Transmute: Compute transmutability from `rustc_target::abi::Layout`)
 - rust-lang#123518 (Fix `ByMove` coroutine-closure shim (for 2021 precise closure capturing behavior))
 - rust-lang#123547 (bootstrap: remove unused pub fns)
 - rust-lang#123564 (Don't emit divide-by-zero panic paths in `StepBy::len`)
 - rust-lang#123578 (Restore `pred_known_to_hold_modulo_regions`)
 - rust-lang#123591 (Remove unnecessary cast from `LLVMRustGetInstrProfIncrementIntrinsic`)
 - rust-lang#123632 (parser: reduce visibility of unnecessary public `UnmatchedDelim`)
 - rust-lang#123635 (CFI: Fix ICE in KCFI non-associated function pointers)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 984767e into rust-lang:master Apr 8, 2024
@rustbot rustbot added this to the 1.79.0 milestone Apr 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 8, 2024
Rollup merge of rust-lang#123578 - lqd:regression-123275, r=compiler-errors

Restore `pred_known_to_hold_modulo_regions`

As requested by `@lcnr` in rust-lang#123275 (comment) this PR restores `pred_known_to_hold_modulo_regions` to fix that "unexpected unsized tail" beta regression.

This also adds the reduced repro from rust-lang#123275 (comment) as a sub-optimal test is better than no test at all, and it'll also cover rust-lang#108721. It still ICEs on master, even though https://github.com/phlip9/rustc-warp-ice doesn't on nightly anymore, since rust-lang#122493.

Fixes rust-lang#123275.

r? `@compiler-errors` but feel free to close if you'd rather have a better test instead
cc `@wesleywiser` who had signed up to do the revert

Will need a backport if we go with this PR: `@rustbot` label +beta-nominated
@lqd lqd deleted the regression-123275 branch April 8, 2024 23:13
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 11, 2024
@cuviper cuviper mentioned this pull request Apr 11, 2024
@cuviper cuviper modified the milestones: 1.79.0, 1.78.0 Apr 11, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 11, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
[beta] backports

- fix attribute validation on associated items in traits rust-lang#121545
- Only inspect user-written predicates for privacy concerns rust-lang#123377
- Check def id before calling `match_projection_projections` rust-lang#123471
- Restore `pred_known_to_hold_modulo_regions` rust-lang#123578
- Beta revert "Use OS thread name by default" rust-lang#123533

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
[beta] backports

- fix attribute validation on associated items in traits rust-lang#121545
- Only inspect user-written predicates for privacy concerns rust-lang#123377
- Check def id before calling `match_projection_projections` rust-lang#123471
- Restore `pred_known_to_hold_modulo_regions` rust-lang#123578
- Beta revert "Use OS thread name by default" rust-lang#123533

r? cuviper
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

regression: unexpected unsized tail ICE
6 participants