Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 3 pull requests #116346

Merged
merged 9 commits into from
Oct 2, 2023
Merged

Rollup of 3 pull requests #116346

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
86ecfdd
Minor comment and whitespace tweaks.
nnethercote Sep 29, 2023
ddb7422
Rename two parsing closures.
nnethercote Sep 29, 2023
2369adc
Remove unnecessary `pub`s.
nnethercote Sep 29, 2023
17e3793
Name some local variables more consistently.
nnethercote Oct 1, 2023
f2ecf7c
Correct misleading std::fmt::Binary example
Colonial-Dev Oct 2, 2023
dbc2cc8
`skip_binder` to `instantiate_identity`
lcnr Oct 2, 2023
e51a2aa
Rollup merge of #116313 - nnethercote:rustc_abi, r=the8472
matthiaskrgr Oct 2, 2023
b3853cc
Rollup merge of #116326 - Colonial-Dev:issue-116165-fix, r=joshtriplett
matthiaskrgr Oct 2, 2023
cfe9e13
Rollup merge of #116340 - lcnr:early-binder-skip_binder, r=compiler-e…
matthiaskrgr Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions compiler/rustc_middle/src/ty/instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,12 +617,17 @@ impl<'tcx> Instance<'tcx> {
v: EarlyBinder<T>,
) -> Result<T, NormalizationError<'tcx>>
where
T: TypeFoldable<TyCtxt<'tcx>> + Clone,
T: TypeFoldable<TyCtxt<'tcx>>,
{
if let Some(args) = self.args_for_mir_body() {
tcx.try_instantiate_and_normalize_erasing_regions(args, param_env, v)
} 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())
}
}

Expand Down