Skip to content

Commit

Permalink
Unrolled build for rust-lang#130989
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rust-timer authored Oct 16, 2024
2 parents 7342830 + c773098 commit 9e4e1e1
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 10 deletions.
11 changes: 11 additions & 0 deletions compiler/rustc_mir_transform/src/validate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,17 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
&self,
pred: impl Upcast<TyCtxt<'tcx>, ty::Predicate<'tcx>>,
) -> bool {
let pred: ty::Predicate<'tcx> = pred.upcast(self.tcx);

// 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.
if pred.has_opaque_types() {
return true;
}

let infcx = self.tcx.infer_ctxt().build();
let ocx = ObligationCtxt::new(&infcx);
ocx.register_obligation(Obligation::new(
Expand Down
10 changes: 0 additions & 10 deletions tests/crashes/130921.rs

This file was deleted.

12 changes: 12 additions & 0 deletions tests/ui/impl-trait/unsize-cast-validation-rpit.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//@ check-pass
//@ compile-flags: -Zvalidate-mir

fn hello() -> &'static [impl Sized; 0] {
if false {
let x = hello();
let _: &[i32] = x;
}
&[]
}

fn main() {}

0 comments on commit 9e4e1e1

Please sign in to comment.