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

Don't check unsize goal in MIR validation when opaques remain #130989

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Don't check unsize goal in MIR validation when opaques remain #130989

merged 1 commit into from
Oct 16, 2024
+23 −10

Conversation

compiler-errors
Copy link
Member

Similarly to mir_assign_valid_types, let's just skip when there are opaques. Fixes #130921.

@rustbot
Copy link
Collaborator

rustbot commented Sep 28, 2024

r? @wesleywiser

rustbot has assigned @wesleywiser.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented Sep 28, 2024

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@compiler-errors
Copy link
Member Author

It has been two weeks, so I'm gonna re-roll

r? compiler

@rustbot rustbot assigned estebank and unassigned wesleywiser Oct 9, 2024
estebank
estebank reviewed Oct 9, 2024
View reviewed changes
compiler/rustc_mir_transform/src/validate.rs
Comment on lines +600 to +604
// We sometimes have to use `defining_opaque_types` for predicates
// to succeed here and figuring out how exactly that should work
// is annoying. It is harmless enough to just not validate anything
// in that case. We still check this after analysis as all opaque
// types have been revealed at this point.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we not enforce this in some way?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't enforce it anyways for mir_assign_valid_types, so I don't see any reason to do so. I also don't think it would be easy to do.

estebank
estebank reviewed Oct 9, 2024
View reviewed changes
compiler/rustc_mir_transform/src/validate.rs
Comment on lines +605 to +607
if pred.has_opaque_types() {
return true;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm slightly concerned because we use predicate_must_hold_modulo_regions in several places that don't necessarily have additional later checks. Are there negative tests where we can cause compilation failures even when triggering this code-path?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember that this is just validation I added, and we validate MIR after opaques are revealed. I'm not totally certain if I understand the concern here.

@estebank
Copy link
Contributor

estebank commented Oct 9, 2024

r=me, with answers to the above, one way or another.

@compiler-errors
Copy link
Member Author

This is a fix for validation that I just added, so I'm not too worried that the check is now relaxed, since fully validating pre-revealed opaque MIR is not really possible to do.

@bors r=estebank rollup

@bors
Copy link
Contributor

bors commented Oct 10, 2024

📌 Commit 4af6137 has been approved by estebank

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 10, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 10, 2024
@matthiaskrgr
Rollup merge of rust-lang#130989 - compiler-errors:unsize-opaque, r=e…
1696043 
…stebank

Don't check unsize goal in MIR validation when opaques remain

Similarly to `mir_assign_valid_types`, let's just skip when there are opaques. Fixes rust-lang#130921.
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 10, 2024
Closed
@matthiaskrgr
Copy link
Member

needs a git rm tests/crashes/130921.rs I think
#131500 (comment)

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Oct 10, 2024
@workingjubilee
Rollup merge of rust-lang#130989 - compiler-errors:unsize-opaque, r=e…
4f4fb02 
…stebank

Don't check unsize goal in MIR validation when opaques remain

Similarly to `mir_assign_valid_types`, let's just skip when there are opaques. Fixes rust-lang#130921.
@workingjubilee workingjubilee mentioned this pull request Oct 10, 2024
Closed
@matthiaskrgr
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 10, 2024
@compiler-errors
Copy link
Member Author

@bors r=estebank

@bors
Copy link
Contributor

bors commented Oct 16, 2024

📌 Commit c773098 has been approved by estebank

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 16, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 16, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 16, 2024
@matthiaskrgr
Rollup merge of rust-lang#130989 - compiler-errors:unsize-opaque, r=e…
2acc7ec 
…stebank

Don't check unsize goal in MIR validation when opaques remain

Similarly to `mir_assign_valid_types`, let's just skip when there are opaques. Fixes rust-lang#130921.
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 16, 2024
Closed
Urgau added a commit to Urgau/rust that referenced this pull request Oct 16, 2024
@Urgau
Rollup merge of rust-lang#130989 - compiler-errors:unsize-opaque, r=e…
894558f 
…stebank

Don't check unsize goal in MIR validation when opaques remain

Similarly to `mir_assign_valid_types`, let's just skip when there are opaques. Fixes rust-lang#130921.
@Urgau Urgau mentioned this pull request Oct 16, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
@bors
Auto merge of rust-lang#131785 - Urgau:rollup-v431zf4, r=Urgau
a73daed 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#129181 (Pass end position of span through inline ASM cookie)
 - rust-lang#130989 (Don't check unsize goal in MIR validation when opaques remain)
 - rust-lang#131657 (Rustfmt `for<'a> async` correctly)
 - rust-lang#131691 (Delay ambiguous intra-doc link resolution after `Cache` has been populated)
 - rust-lang#131730 (Refactor some `core::fmt` macros)
 - rust-lang#131751 (Rename `can_coerce` to `may_coerce`, and then structurally resolve correctly in the probe)
 - rust-lang#131753 (Unify `secondary_span` and `swap_secondary_and_primary` args in `note_type_err`)
 - rust-lang#131776 (Emscripten: Xfail backtrace ui tests)
 - rust-lang#131777 (Fix trivially_copy_pass_by_ref in stable_mir)
 - rust-lang#131778 (Fix needless_lifetimes in stable_mir)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 16, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
@bors
Auto merge of rust-lang#131797 - matthiaskrgr:rollup-lzpze2k, r=matth…
798fb83 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#130989 (Don't check unsize goal in MIR validation when opaques remain)
 - rust-lang#131657 (Rustfmt `for<'a> async` correctly)
 - rust-lang#131691 (Delay ambiguous intra-doc link resolution after `Cache` has been populated)
 - rust-lang#131730 (Refactor some `core::fmt` macros)
 - rust-lang#131751 (Rename `can_coerce` to `may_coerce`, and then structurally resolve correctly in the probe)
 - rust-lang#131753 (Unify `secondary_span` and `swap_secondary_and_primary` args in `note_type_err`)
 - rust-lang#131776 (Emscripten: Xfail backtrace ui tests)
 - rust-lang#131777 (Fix trivially_copy_pass_by_ref in stable_mir)
 - rust-lang#131778 (Fix needless_lifetimes in stable_mir)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b6a085a into rust-lang:master Oct 16, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
@rust-timer
Unrolled build for rust-lang#130989
9e4e1e1 
Rollup merge of rust-lang#130989 - compiler-errors:unsize-opaque, r=estebank

Don't check unsize goal in MIR validation when opaques remain

Similarly to `mir_assign_valid_types`, let's just skip when there are opaques. Fixes rust-lang#130921.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estebank estebank estebank left review comments

@fmease fmease fmease left review comments

Assignees

@estebank estebank

Labels
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
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.

ICE: broken mir: Unsize coercion, but &Foo<[impl Sized; 2]> isn't coercible to &Foo<[i32]>
7 participants
@compiler-errors @rustbot @estebank @bors @matthiaskrgr @fmease @wesleywiser