Rollup merge of #99607 - RalfJung:vtable-check, r=eddyb

RalfJung · web-flow · commit 25de227b434d · 2022-07-22T17:26:10.000-04:00
interpret: fix vtable check debug assertion Fixes #99605 Thanks to `@eddyb` for suggesting the fix!
diff --git a/compiler/rustc_const_eval/src/interpret/terminator.rs b/compiler/rustc_const_eval/src/interpret/terminator.rs
@@ -589,13 +589,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                         ty::ExistentialTraitRef::erase_self_ty(tcx, virtual_trait_ref);
                     let concrete_trait_ref = existential_trait_ref.with_self_ty(tcx, dyn_ty);
 
-                    let concrete_method = Instance::resolve(
+                    let concrete_method = Instance::resolve_for_vtable(
                         tcx,
                         self.param_env,
                         def_id,
                         instance.substs.rebase_onto(tcx, trait_def_id, concrete_trait_ref.substs),
                     )
-                    .unwrap()
                     .unwrap();
                     assert_eq!(fn_inst, concrete_method);
                 }

Original file line number	Diff line number	Diff line change
`@@ -589,13 +589,12 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {`
`589`	`589`	`ty::ExistentialTraitRef::erase_self_ty(tcx, virtual_trait_ref);`
`590`	`590`	`let concrete_trait_ref = existential_trait_ref.with_self_ty(tcx, dyn_ty);`
`591`	`591`
`592`		`- let concrete_method = Instance::resolve(`
	`592`	`+ let concrete_method = Instance::resolve_for_vtable(`
`593`	`593`	`tcx,`
`594`	`594`	`self.param_env,`
`595`	`595`	`def_id,`
`596`	`596`	`instance.substs.rebase_onto(tcx, trait_def_id, concrete_trait_ref.substs),`
`597`	`597`	`)`
`598`		`- .unwrap()`
`599`	`598`	`.unwrap();`
`600`	`599`	`assert_eq!(fn_inst, concrete_method);`
`601`	`600`	`}`