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.

Sign up for GitHub

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

Jump to bottom

implied bounds: do not ICE on unconstrained region vars #115559

Merged
merged 1 commit into from
Sep 5, 2023
Merged

implied bounds: do not ICE on unconstrained region vars #115559

merged 1 commit into from
Sep 5, 2023

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Sep 5, 2023

fixes #112832

see tests/ui/implied-bounds/implied-bounds-unconstrained-2.rs for a minimal example showing why this is necessary.

r? types

cc @compiler-errors @aliemjay https://rust-lang.zulipchat.com/#narrow/stream/144729-t-types/topic/assoc.20type.20bound.20in.20super.20trait

@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. labels Sep 5, 2023
@aliemjay
Copy link
Member

aliemjay commented Sep 5, 2023 •
edited
Loading

this needs a new issue for how we break this invariant and a FIXME comment that refers to it.
you can r=me after that.

r? aliemjay

@rustbot
Copy link
Collaborator

rustbot commented Sep 5, 2023

Failed to set assignee to alimjay: invalid assignee

Note: Only org members, users with write permissions, or people who have commented on the PR may be assigned.

@rustbot rustbot assigned aliemjay and unassigned oli-obk Sep 5, 2023
@rust-lang rust-lang deleted a comment from rustbot Sep 5, 2023
@aliemjay
Copy link
Member

aliemjay commented Sep 5, 2023

this needs a new issue for how we break this invariant and a FIXME comment that refers to it.
you can r=me after that.

This is being discussed on zulip and I don't think it is worth it to hold back this PR

@bors r+ rollup=always

@bors
Copy link
Contributor

bors commented Sep 5, 2023

📌 Commit 98fa0c9 has been approved by aliemjay

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 Sep 5, 2023
@lcnr lcnr added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Sep 5, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 5, 2023
@Dylan-DPC
Rollup merge of rust-lang#115559 - lcnr:implied-bounds-unconstrained,…
dcc4b5c 
… r=aliemjay

implied bounds: do not ICE on unconstrained region vars

fixes rust-lang#112832

see tests/ui/implied-bounds/implied-bounds-unconstrained-2.rs for a minimal example showing why this is necessary.

r? types

cc `@compiler-errors` `@aliemjay` https://rust-lang.zulipchat.com/#narrow/stream/144729-t-types/topic/assoc.20type.20bound.20in.20super.20trait
@Dylan-DPC Dylan-DPC mentioned this pull request Sep 5, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Sep 5, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 5, 2023
@bors
Auto merge of rust-lang#115579 - matthiaskrgr:rollup-n4ijxl7, r=matth…
f91c53d 
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#114794 (clarify safety documentation of ptr::swap and ptr::copy)
 - rust-lang#115397 (Add support to return value in StableMIR interface and not crash due to compilation error)
 - rust-lang#115559 (implied bounds: do not ICE on unconstrained region vars)

Failed merges:

 - rust-lang#115532 (Implement SMIR generic parameter instantiation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8c04907 into rust-lang:master Sep 5, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 5, 2023
@rowanfr rowanfr mentioned this pull request Sep 6, 2023
Closed
@lcnr lcnr deleted the implied-bounds-unconstrained branch September 6, 2023 13:46
@apiraino
Copy link
Contributor

apiraino commented Sep 7, 2023

Beta and stable backports accepted as per compiler team on Zulip

@rustbot label +beta-accepted +stable-accepted

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Sep 7, 2023
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 9, 2023
@Mark-Simulacrum Mark-Simulacrum removed this from the 1.74.0 milestone Sep 9, 2023
@Mark-Simulacrum Mark-Simulacrum added this to the 1.73.0 milestone Sep 9, 2023
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Sep 9, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 9, 2023
@bors
Auto merge of rust-lang#115722 - Mark-Simulacrum:beta-backport, r=Mar…
ea99593 
…k-Simulacrum

[beta] backport

This PR backports:
- rust-lang#115559: implied bounds: do not ICE on unconstrained region vars
- rust-lang#115446: fix version for abi_thiscall to 1.73.0, which was forgotten to change when stabilized and (later) moved to beta
- rust-lang#115276: rustdoc: correctly deal with self ty params when eliding default object lifetimes

r? `@Mark-Simulacrum`
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.73.0, 1.72.1 Sep 12, 2023
@Mark-Simulacrum Mark-Simulacrum removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Sep 12, 2023
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Sep 12, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 12, 2023
@bors
Auto merge of rust-lang#115787 - Mark-Simulacrum:stable-next, r=Mark-…
9ff78eb 
…Simulacrum

[stable] 1.72.1 release

This backports:

*  Remove assert that checks type equality rust-lang#115215
*  implied bounds: do not ICE on unconstrained region vars rust-lang#115559
*  rustdoc: correctly deal with self ty params when eliding default object lifetimes rust-lang#115276
*  Stop emitting non-power-of-two vectors in (non-portable-SIMD) codegen rust-lang#115236
*  Normalize before checking if local is freeze in deduced_param_attrs rust-lang#114948

Some cherry-picks required merge conflict resolution, we'll see if I got it right based on CI (rustdoc fix and LLVM codegen test).

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 12, 2023
@bors
Auto merge of rust-lang#115787 - Mark-Simulacrum:stable-next, r=Mark-…
1644a1c 
…Simulacrum

[stable] 1.72.1 release

This backports:

*  Remove assert that checks type equality rust-lang#115215
*  implied bounds: do not ICE on unconstrained region vars rust-lang#115559
*  rustdoc: correctly deal with self ty params when eliding default object lifetimes rust-lang#115276
*  Stop emitting non-power-of-two vectors in (non-portable-SIMD) codegen rust-lang#115236
*  Normalize before checking if local is freeze in deduced_param_attrs rust-lang#114948

Some cherry-picks required merge conflict resolution, we'll see if I got it right based on CI (rustdoc fix and LLVM codegen test).

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
@bors
Auto merge of rust-lang#115787 - Mark-Simulacrum:stable-next, r=Mark-…
5cd9476 
…Simulacrum

[stable] 1.72.1 release

This backports:

*  Remove assert that checks type equality rust-lang#115215
*  implied bounds: do not ICE on unconstrained region vars rust-lang#115559
*  rustdoc: correctly deal with self ty params when eliding default object lifetimes rust-lang#115276
*  Stop emitting non-power-of-two vectors in (non-portable-SIMD) codegen rust-lang#115236
*  Normalize before checking if local is freeze in deduced_param_attrs rust-lang#114948

Some cherry-picks required merge conflict resolution, we'll see if I got it right based on CI (rustdoc fix and LLVM codegen test).

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
@bors
Auto merge of rust-lang#115787 - Mark-Simulacrum:stable-next, r=Mark-…
b42ba8b 
…Simulacrum

[stable] 1.72.1 release

This backports:

*  Remove assert that checks type equality rust-lang#115215
*  implied bounds: do not ICE on unconstrained region vars rust-lang#115559
*  rustdoc: correctly deal with self ty params when eliding default object lifetimes rust-lang#115276
*  Stop emitting non-power-of-two vectors in (non-portable-SIMD) codegen rust-lang#115236
*  Normalize before checking if local is freeze in deduced_param_attrs rust-lang#114948

Some cherry-picks required merge conflict resolution, we'll see if I got it right based on CI (rustdoc fix and LLVM codegen test).

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
@bors
Auto merge of rust-lang#115787 - Mark-Simulacrum:stable-next, r=Mark-…
66e0643 
…Simulacrum

[stable] 1.72.1 release

This backports:

*  Remove assert that checks type equality rust-lang#115215
*  implied bounds: do not ICE on unconstrained region vars rust-lang#115559
*  rustdoc: correctly deal with self ty params when eliding default object lifetimes rust-lang#115276
*  Stop emitting non-power-of-two vectors in (non-portable-SIMD) codegen rust-lang#115236
*  Normalize before checking if local is freeze in deduced_param_attrs rust-lang#114948

Some cherry-picks required merge conflict resolution, we'll see if I got it right based on CI (rustdoc fix and LLVM codegen test).

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
@bors
Auto merge of rust-lang#115787 - Mark-Simulacrum:stable-next, r=Mark-…
322909b 
…Simulacrum

[stable] 1.72.1 release

This backports:

*  Remove assert that checks type equality rust-lang#115215
*  implied bounds: do not ICE on unconstrained region vars rust-lang#115559
*  rustdoc: correctly deal with self ty params when eliding default object lifetimes rust-lang#115276
*  Stop emitting non-power-of-two vectors in (non-portable-SIMD) codegen rust-lang#115236
*  Normalize before checking if local is freeze in deduced_param_attrs rust-lang#114948

Some cherry-picks required merge conflict resolution, we'll see if I got it right based on CI (rustdoc fix and LLVM codegen test).

r? `@Mark-Simulacrum`
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2023
@bors
Auto merge of rust-lang#115787 - Mark-Simulacrum:stable-next, r=Mark-…
d5c2e9c 
…Simulacrum

[stable] 1.72.1 release

This backports:

*  Remove assert that checks type equality rust-lang#115215
*  implied bounds: do not ICE on unconstrained region vars rust-lang#115559
*  rustdoc: correctly deal with self ty params when eliding default object lifetimes rust-lang#115276
*  Stop emitting non-power-of-two vectors in (non-portable-SIMD) codegen rust-lang#115236
*  Normalize before checking if local is freeze in deduced_param_attrs rust-lang#114948

Some cherry-picks required merge conflict resolution, we'll see if I got it right based on CI (rustdoc fix and LLVM codegen test).

r? `@Mark-Simulacrum`
@mmastrac mmastrac mentioned this pull request Sep 19, 2023
Merged
mmastrac added a commit to denoland/deno that referenced this pull request Sep 20, 2023
@mmastrac
chore: bump Rust to 1.72.1 and cargo update (#20572)
2a1781a 
> 1.72.1 resolves a few regressions introduced in 1.72.0:

> - [Partially revert codegen change, improving
codegen](rust-lang/rust#115236)
> - [rustdoc: Fix self ty params in objects with
lifetimes](rust-lang/rust#115276)
> - [Fix regression in compile
times](rust-lang/rust#114948)
> - Resolve some ICEs in the compiler:
>   - [#115215](rust-lang/rust#115215)
>   - [#115559](rust-lang/rust#115559)
@spastorino spastorino mentioned this pull request Dec 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aliemjay aliemjay

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. stable-accepted Accepted for backporting to the compiler in the stable channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.72.1
Development

Successfully merging this pull request may close these issues.

ICE: assertion failed: !ty.needs_infer()
7 participants
@lcnr @aliemjay @rustbot @bors @apiraino @oli-obk @Mark-Simulacrum