Skip to content

Commit cd549ae

Browse files
committed
sync (try_)instantiate_mir_and_normalize_erasing_regions implementation
try_instantiate_mir_and_normalize_erasing_regions was changed in dbc2cc8, but not instantiate_mir_and_normalize_erasing_regions
1 parent 8039906 commit cd549ae

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

compiler/rustc_middle/src/ty/instance.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -694,23 +694,25 @@ impl<'tcx> Instance<'tcx> {
694694
}
695695

696696
#[inline(always)]
697+
// Keep me in sync with try_instantiate_mir_and_normalize_erasing_regions
697698
pub fn instantiate_mir_and_normalize_erasing_regions<T>(
698699
&self,
699700
tcx: TyCtxt<'tcx>,
700701
param_env: ty::ParamEnv<'tcx>,
701702
v: EarlyBinder<T>,
702703
) -> T
703704
where
704-
T: TypeFoldable<TyCtxt<'tcx>> + Clone,
705+
T: TypeFoldable<TyCtxt<'tcx>>,
705706
{
706707
if let Some(args) = self.args_for_mir_body() {
707708
tcx.instantiate_and_normalize_erasing_regions(args, param_env, v)
708709
} else {
709-
tcx.normalize_erasing_regions(param_env, v.skip_binder())
710+
tcx.normalize_erasing_regions(param_env, v.instantiate_identity())
710711
}
711712
}
712713

713714
#[inline(always)]
715+
// Keep me in sync with instantiate_mir_and_normalize_erasing_regions
714716
pub fn try_instantiate_mir_and_normalize_erasing_regions<T>(
715717
&self,
716718
tcx: TyCtxt<'tcx>,

0 commit comments

Comments
 (0)