bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

bug! with a better error message for failing Instance::resolve

Browse source
This commit is contained in:
Michael Goulet 2022-12-11 19:46:58 +00:00
parent d137783642
commit bc293ed53e
4 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_middle/src/ty/instance.rs
View file

@ -385,6 +385,21 @@ impl<'tcx> Instance<'tcx> {
)
}
pub fn expect_resolve(
tcx: TyCtxt<'tcx>,
param_env: ty::ParamEnv<'tcx>,
def_id: DefId,
substs: SubstsRef<'tcx>,
) -> Instance<'tcx> {
match ty::Instance::resolve(tcx, param_env, def_id, substs) {
Ok(Some(instance)) => instance,
_ => bug!(
"failed to resolve instance for {}",
tcx.def_path_str_with_substs(def_id, substs)
),
}
}
// This should be kept up to date with `resolve`.
pub fn resolve_opt_const_arg(
tcx: TyCtxt<'tcx>,
@ -525,7 +540,7 @@ impl<'tcx> Instance<'tcx> {
pub fn resolve_drop_in_place(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> ty::Instance<'tcx> {
let def_id = tcx.require_lang_item(LangItem::DropInPlace, None);
let substs = tcx.intern_substs(&[ty.into()]);
Instance::resolve(tcx, ty::ParamEnv::reveal_all(), def_id, substs).unwrap().unwrap()
Instance::expect_resolve(tcx, ty::ParamEnv::reveal_all(), def_id, substs)
}
#[instrument(level = "debug", skip(tcx), ret)]