Fix ICE involving calling Instance.ty during const evaluation
Fixes #67639 `Instance.ty` assumes that we are in a fully monomorphic context (e.g. codegen), and can therefore use an empty `ParamEnv` when performing normalization. Howver, the MIR constant evaluator code ends up calling `Instance.ty` as a result of us attemptign to 'speculatively' const-evaluate generic functions during const propagation. As a result, we may end up with projections involving type parameters (e.g. <T as MyTrait>::Bar>) in the type we are trying to normalize. Normalization expects us to have proper predicates in the `ParamEnv` for such projections, and will ICE if we don't. This commit adds a new method `Instance.ty_env`, which takes a `ParamEnv` for use during normalization. The MIR const-evaluator code is changed to use this method, passing in the proper `ParamEnv` for the context at hand.
This commit is contained in:
parent
b69f6e65c0
commit
ee922d47f2
4 changed files with 64 additions and 2 deletions
|
|
@ -62,10 +62,38 @@ pub enum InstanceDef<'tcx> {
|
|||
}
|
||||
|
||||
impl<'tcx> Instance<'tcx> {
|
||||
/// Returns the `Ty` corresponding to this `Instance`,
|
||||
/// with generic substitutions applied and lifetimes erased.
|
||||
///
|
||||
/// This method can only be called when the 'substs' for this Instance
|
||||
/// are fully monomorphic (no `ty::Param`'s are present).
|
||||
/// This is usually the case (e.g. during codegen).
|
||||
/// However, during constant evaluation, we may want
|
||||
/// to try to resolve a `Instance` using generic parameters
|
||||
/// (e.g. when we are attempting to to do const-propagation).
|
||||
/// In this case, `Instace.ty_env` should be used to provide
|
||||
/// the `ParamEnv` for our generic context.
|
||||
pub fn ty(&self, tcx: TyCtxt<'tcx>) -> Ty<'tcx> {
|
||||
let ty = tcx.type_of(self.def.def_id());
|
||||
// There shouldn't be any params - if there are, then
|
||||
// Instance.ty_env should have been used to provide the proper
|
||||
// ParamEnv
|
||||
if self.substs.has_param_types() {
|
||||
panic!(
|
||||
"Instance.ty called for type {:?} with projections in substs: {:?}",
|
||||
ty, self.substs
|
||||
);
|
||||
}
|
||||
tcx.subst_and_normalize_erasing_regions(self.substs, ty::ParamEnv::reveal_all(), &ty)
|
||||
}
|
||||
|
||||
/// Like `Instance.ty`, but allows a `ParamEnv` to be specified for use during
|
||||
/// normalization. This method is only really useful during constant evaluation,
|
||||
/// where we are dealing with potentially generic types.
|
||||
pub fn ty_env(&self, tcx: TyCtxt<'tcx>, param_env: ty::ParamEnv<'tcx>) -> Ty<'tcx> {
|
||||
let ty = tcx.type_of(self.def.def_id());
|
||||
tcx.subst_and_normalize_erasing_regions(self.substs, param_env, &ty)
|
||||
}
|
||||
}
|
||||
|
||||
impl<'tcx> InstanceDef<'tcx> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue