Skip to content

Do not ICE when failing to fulfill known obligations due to normalization #92943

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

Closed
wants to merge 1 commit into from
Closed

Do not ICE when failing to fulfill known obligations due to normalization #92943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions compiler/rustc_trait_selection/src/traits/codegen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,7 @@ where
// In principle, we only need to do this so long as `result`
// contains unbound type parameters. It could be a slight
// optimization to stop iterating early.
let errors = fulfill_cx.select_all_or_error(infcx);
if !errors.is_empty() {
infcx.tcx.sess.delay_span_bug(
rustc_span::DUMMY_SP,
&format!("Encountered errors `{:?}` resolving bounds after type-checking", errors),
);
}
fulfill_cx.select_all_or_error(infcx);

let result = infcx.resolve_vars_if_possible(result);
infcx.tcx.erase_regions(result)
Expand Down
35 changes: 35 additions & 0 deletions src/test/mir-opt/inline/dyn-trait.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#![crate_type = "lib"]

use std::fmt::Debug;

pub trait Cache {
type V: Debug;

fn store_nocache(&self);
}

pub trait Query {
type V;
type C: Cache<V = Self::V>;

fn cache<T>(s: &T) -> &Self::C;
}

// EMIT_MIR dyn_trait.mk_cycle.Inline.diff
#[inline(always)]
pub fn mk_cycle<V: Debug>(c: &dyn Cache<V = V>) {
c.store_nocache()
}

// EMIT_MIR dyn_trait.try_execute_query.Inline.diff
#[inline(always)]
pub fn try_execute_query<C: Cache>(c: &C) {
mk_cycle(c)
}

// EMIT_MIR dyn_trait.get_query.Inline.diff
#[inline(always)]
pub fn get_query<Q: Query, T>(t: &T) {
let c = Q::cache(t);
try_execute_query(c)
}
62 changes: 62 additions & 0 deletions src/test/mir-opt/inline/dyn_trait.get_query.Inline.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
- // MIR for `get_query` before Inline
+ // MIR for `get_query` after Inline

fn get_query(_1: &T) -> () {
debug t => _1; // in scope 0 at $DIR/dyn-trait.rs:32:31: 32:32
let mut _0: (); // return place in scope 0 at $DIR/dyn-trait.rs:32:38: 32:38
let _2: &<Q as Query>::C; // in scope 0 at $DIR/dyn-trait.rs:33:9: 33:10
let mut _3: &T; // in scope 0 at $DIR/dyn-trait.rs:33:22: 33:23
let mut _4: &<Q as Query>::C; // in scope 0 at $DIR/dyn-trait.rs:34:23: 34:24
scope 1 {
debug c => _2; // in scope 1 at $DIR/dyn-trait.rs:33:9: 33:10
+ scope 2 (inlined try_execute_query::<<Q as Query>::C>) { // at $DIR/dyn-trait.rs:34:5: 34:25
+ debug c => _4; // in scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ let mut _5: &dyn Cache<V = <Q as Query>::V>; // in scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ let mut _6: &<Q as Query>::C; // in scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ scope 3 (inlined mk_cycle::<<Q as Query>::V>) { // at $DIR/dyn-trait.rs:34:5: 34:25
+ debug c => _5; // in scope 3 at $DIR/dyn-trait.rs:34:5: 34:25
+ let mut _7: &dyn Cache<V = <Q as Query>::V>; // in scope 3 at $DIR/dyn-trait.rs:34:5: 34:25
+ }
+ }
}

bb0: {
StorageLive(_2); // scope 0 at $DIR/dyn-trait.rs:33:9: 33:10
StorageLive(_3); // scope 0 at $DIR/dyn-trait.rs:33:22: 33:23
_3 = &(*_1); // scope 0 at $DIR/dyn-trait.rs:33:22: 33:23
_2 = <Q as Query>::cache::<T>(move _3) -> bb1; // scope 0 at $DIR/dyn-trait.rs:33:13: 33:24
// mir::Constant
// + span: $DIR/dyn-trait.rs:33:13: 33:21
// + user_ty: UserType(0)
// + literal: Const { ty: for<'r> fn(&'r T) -> &'r <Q as Query>::C {<Q as Query>::cache::<T>}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_3); // scope 0 at $DIR/dyn-trait.rs:33:23: 33:24
StorageLive(_4); // scope 1 at $DIR/dyn-trait.rs:34:23: 34:24
_4 = &(*_2); // scope 1 at $DIR/dyn-trait.rs:34:23: 34:24
- _0 = try_execute_query::<<Q as Query>::C>(move _4) -> bb2; // scope 1 at $DIR/dyn-trait.rs:34:5: 34:25
+ StorageLive(_5); // scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ StorageLive(_6); // scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ _6 = _4; // scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ _5 = move _6 as &dyn Cache<V = <Q as Query>::V> (Pointer(Unsize)); // scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ StorageDead(_6); // scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
+ StorageLive(_7); // scope 3 at $DIR/dyn-trait.rs:34:5: 34:25
+ _7 = _5; // scope 3 at $DIR/dyn-trait.rs:34:5: 34:25
+ _0 = <dyn Cache<V = <Q as Query>::V> as Cache>::store_nocache(move _7) -> bb2; // scope 3 at $DIR/dyn-trait.rs:34:5: 34:25
// mir::Constant
- // + span: $DIR/dyn-trait.rs:34:5: 34:22
- // + literal: Const { ty: for<'r> fn(&'r <Q as Query>::C) {try_execute_query::<<Q as Query>::C>}, val: Value(Scalar(<ZST>)) }
+ // + span: $DIR/dyn-trait.rs:34:5: 34:25
+ // + literal: Const { ty: for<'r> fn(&'r dyn Cache<V = <Q as Query>::V>) {<dyn Cache<V = <Q as Query>::V> as Cache>::store_nocache}, val: Value(Scalar(<ZST>)) }
}

bb2: {
+ StorageDead(_7); // scope 3 at $DIR/dyn-trait.rs:34:5: 34:25
+ StorageDead(_5); // scope 2 at $DIR/dyn-trait.rs:34:5: 34:25
StorageDead(_4); // scope 1 at $DIR/dyn-trait.rs:34:24: 34:25
StorageDead(_2); // scope 0 at $DIR/dyn-trait.rs:35:1: 35:2
return; // scope 0 at $DIR/dyn-trait.rs:35:2: 35:2
}
}

23 changes: 23 additions & 0 deletions src/test/mir-opt/inline/dyn_trait.mk_cycle.Inline.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
- // MIR for `mk_cycle` before Inline
+ // MIR for `mk_cycle` after Inline

fn mk_cycle(_1: &dyn Cache<V = V>) -> () {
debug c => _1; // in scope 0 at $DIR/dyn-trait.rs:20:27: 20:28
let mut _0: (); // return place in scope 0 at $DIR/dyn-trait.rs:20:49: 20:49
let mut _2: &dyn Cache<V = V>; // in scope 0 at $DIR/dyn-trait.rs:21:5: 21:22

bb0: {
StorageLive(_2); // scope 0 at $DIR/dyn-trait.rs:21:5: 21:22
_2 = &(*_1); // scope 0 at $DIR/dyn-trait.rs:21:5: 21:22
_0 = <dyn Cache<V = V> as Cache>::store_nocache(move _2) -> bb1; // scope 0 at $DIR/dyn-trait.rs:21:5: 21:22
// mir::Constant
// + span: $DIR/dyn-trait.rs:21:7: 21:20
// + literal: Const { ty: for<'r> fn(&'r dyn Cache<V = V>) {<dyn Cache<V = V> as Cache>::store_nocache}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_2); // scope 0 at $DIR/dyn-trait.rs:21:21: 21:22
return; // scope 0 at $DIR/dyn-trait.rs:22:2: 22:2
}
}

37 changes: 37 additions & 0 deletions src/test/mir-opt/inline/dyn_trait.try_execute_query.Inline.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
- // MIR for `try_execute_query` before Inline
+ // MIR for `try_execute_query` after Inline

fn try_execute_query(_1: &C) -> () {
debug c => _1; // in scope 0 at $DIR/dyn-trait.rs:26:36: 26:37
let mut _0: (); // return place in scope 0 at $DIR/dyn-trait.rs:26:43: 26:43
let mut _2: &dyn Cache<V = <C as Cache>::V>; // in scope 0 at $DIR/dyn-trait.rs:27:14: 27:15
let mut _3: &C; // in scope 0 at $DIR/dyn-trait.rs:27:14: 27:15
+ scope 1 (inlined mk_cycle::<<C as Cache>::V>) { // at $DIR/dyn-trait.rs:27:5: 27:16
+ debug c => _2; // in scope 1 at $DIR/dyn-trait.rs:27:5: 27:16
+ let mut _4: &dyn Cache<V = <C as Cache>::V>; // in scope 1 at $DIR/dyn-trait.rs:27:5: 27:16
+ }

bb0: {
StorageLive(_2); // scope 0 at $DIR/dyn-trait.rs:27:14: 27:15
StorageLive(_3); // scope 0 at $DIR/dyn-trait.rs:27:14: 27:15
_3 = &(*_1); // scope 0 at $DIR/dyn-trait.rs:27:14: 27:15
_2 = move _3 as &dyn Cache<V = <C as Cache>::V> (Pointer(Unsize)); // scope 0 at $DIR/dyn-trait.rs:27:14: 27:15
StorageDead(_3); // scope 0 at $DIR/dyn-trait.rs:27:14: 27:15
- _0 = mk_cycle::<<C as Cache>::V>(move _2) -> bb1; // scope 0 at $DIR/dyn-trait.rs:27:5: 27:16
+ StorageLive(_4); // scope 1 at $DIR/dyn-trait.rs:27:5: 27:16
+ _4 = _2; // scope 1 at $DIR/dyn-trait.rs:27:5: 27:16
+ _0 = <dyn Cache<V = <C as Cache>::V> as Cache>::store_nocache(move _4) -> bb1; // scope 1 at $DIR/dyn-trait.rs:27:5: 27:16
// mir::Constant
- // + span: $DIR/dyn-trait.rs:27:5: 27:13
- // + literal: Const { ty: for<'r> fn(&'r (dyn Cache<V = <C as Cache>::V> + 'r)) {mk_cycle::<<C as Cache>::V>}, val: Value(Scalar(<ZST>)) }
+ // + span: $DIR/dyn-trait.rs:27:5: 27:16
+ // + literal: Const { ty: for<'r> fn(&'r dyn Cache<V = <C as Cache>::V>) {<dyn Cache<V = <C as Cache>::V> as Cache>::store_nocache}, val: Value(Scalar(<ZST>)) }
}

bb1: {
+ StorageDead(_4); // scope 1 at $DIR/dyn-trait.rs:27:5: 27:16
StorageDead(_2); // scope 0 at $DIR/dyn-trait.rs:27:15: 27:16
return; // scope 0 at $DIR/dyn-trait.rs:28:2: 28:2
}
}