diff options
| author | bors <bors@rust-lang.org> | 2021-08-25 20:08:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-25 20:08:00 +0000 |
| commit | 0afc20860eb98a29d9bbeea80f2acc5be38c6bf3 (patch) | |
| tree | efaa6ae3d70c1f56bd4c9fb74a91e727743cbf02 /compiler/rustc_middle/src/ty/layout.rs | |
| parent | 7b0e554ee2c94e9b3865a8c2d24d720224512dec (diff) | |
| parent | 994a6bb667d8a0ae7bbc777f4d33994692dd7266 (diff) | |
Auto merge of #85499 - jackh726:assoc-type-norm-rebase, r=nikomatsakis
Normalize projections under binders Fixes #70243 Fixes #70120 Fixes #62529 Fixes #87219 Issues to followup on after (probably fixed, but no test added here): #76956 #56556 #79207 #85636 r? `@nikomatsakis`
Diffstat (limited to 'compiler/rustc_middle/src/ty/layout.rs')
| -rw-r--r-- | compiler/rustc_middle/src/ty/layout.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs index 0cbe57455a1..8f90c7a8845 100644 --- a/compiler/rustc_middle/src/ty/layout.rs +++ b/compiler/rustc_middle/src/ty/layout.rs @@ -2483,10 +2483,9 @@ impl<'tcx> ty::Instance<'tcx> { // `src/test/ui/polymorphization/normalized_sig_types.rs`), and codegen not keeping // track of a polymorphization `ParamEnv` to allow normalizing later. let mut sig = match *ty.kind() { - ty::FnDef(def_id, substs) if tcx.sess.opts.debugging_opts.polymorphize => tcx + ty::FnDef(def_id, substs) => tcx .normalize_erasing_regions(tcx.param_env(def_id), tcx.fn_sig(def_id)) .subst(tcx, substs), - ty::FnDef(def_id, substs) => tcx.fn_sig(def_id).subst(tcx, substs), _ => unreachable!(), }; |