mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #116340 - lcnr:early-binder-skip_binder, r=compiler-errors

Browse Source 
`skip_binder` to `instantiate_identity`
This commit is contained in:
Matthias Krüger 2023-10-02 16:23:54 +02:00 committed by GitHub
commit cfe9e13627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_middle/src/ty/instance.rs
View File

@ -617,12 +617,17 @@ impl<'tcx> Instance<'tcx> {
v: EarlyBinder<T>, v: EarlyBinder<T>,
) -> Result<T, NormalizationError<'tcx>> ) -> Result<T, NormalizationError<'tcx>>
where where
T: TypeFoldable<TyCtxt<'tcx>> + Clone, T: TypeFoldable<TyCtxt<'tcx>>,
{ {
if let Some(args) = self.args_for_mir_body() { if let Some(args) = self.args_for_mir_body() {
tcx.try_instantiate_and_normalize_erasing_regions(args, param_env, v) tcx.try_instantiate_and_normalize_erasing_regions(args, param_env, v)
} else { } else {
tcx.try_normalize_erasing_regions(param_env, v.skip_binder()) // We're using `instantiate_identity` as e.g.
// `FnPtrShim` is separately generated for every
// instantiation of the `FnDef`, so the MIR body
// is already instantiated. Any generic parameters it
// contains are generic parameters from the caller.
tcx.try_normalize_erasing_regions(param_env, v.instantiate_identity())
} }
} }