diff options
| author | klensy <klensy@users.noreply.github.com> | 2024-03-07 17:33:08 +0300 |
|---|---|---|
| committer | klensy <klensy@users.noreply.github.com> | 2024-03-07 17:33:08 +0300 |
| commit | cd549aeffd59abc7711328acd5a733224544c8c0 (patch) | |
| tree | 821e7275a971f85942fd657e23b84923bb9b30a7 | |
| parent | 80399064afa4a2cd153f30d02c25f7ea0383ed65 (diff) | |
| download | rust-cd549aeffd59abc7711328acd5a733224544c8c0.tar.gz rust-cd549aeffd59abc7711328acd5a733224544c8c0.zip | |
sync (try_)instantiate_mir_and_normalize_erasing_regions implementation
try_instantiate_mir_and_normalize_erasing_regions was changed in https://github.com/rust-lang/rust/commit/dbc2cc8717dd8c8006595d9e9c91ad472109165a, but not instantiate_mir_and_normalize_erasing_regions
| -rw-r--r-- | compiler/rustc_middle/src/ty/instance.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/ty/instance.rs b/compiler/rustc_middle/src/ty/instance.rs index 260d0885089..9fc8d418f5b 100644 --- a/compiler/rustc_middle/src/ty/instance.rs +++ b/compiler/rustc_middle/src/ty/instance.rs @@ -694,6 +694,7 @@ impl<'tcx> Instance<'tcx> { } #[inline(always)] + // Keep me in sync with try_instantiate_mir_and_normalize_erasing_regions pub fn instantiate_mir_and_normalize_erasing_regions<T>( &self, tcx: TyCtxt<'tcx>, @@ -701,16 +702,17 @@ impl<'tcx> Instance<'tcx> { v: EarlyBinder<T>, ) -> T where - T: TypeFoldable<TyCtxt<'tcx>> + Clone, + T: TypeFoldable<TyCtxt<'tcx>>, { if let Some(args) = self.args_for_mir_body() { tcx.instantiate_and_normalize_erasing_regions(args, param_env, v) } else { - tcx.normalize_erasing_regions(param_env, v.skip_binder()) + tcx.normalize_erasing_regions(param_env, v.instantiate_identity()) } } #[inline(always)] + // Keep me in sync with instantiate_mir_and_normalize_erasing_regions pub fn try_instantiate_mir_and_normalize_erasing_regions<T>( &self, tcx: TyCtxt<'tcx>, |
