rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #97709 - compiler-errors:normalize-const-param-ty, r=oli-obk

Browse Source 
Normalize consts' tys when relating with `adt_const_params`

Fixes #97007
This commit is contained in:
Matthias Krüger
2022-06-13 21:35:53 +02:00
committed by GitHub
parent 083721a1a7 27af8e4585
commit e13eeedefc
2 changed files with 97 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_middle/src/ty/relate.rs
View File

@@ -579,10 +579,15 @@ pub fn super_relate_consts<'tcx, R: TypeRelation<'tcx>>(
debug!("{}.super_relate_consts(a = {:?}, b = {:?})", relation.tag(), a, b);
let tcx = relation.tcx();
// FIXME(oli-obk): once const generics can have generic types, this assertion
// will likely get triggered. Move to `normalize_erasing_regions` at that point.
let a_ty = tcx.erase_regions(a.ty());
let b_ty = tcx.erase_regions(b.ty());
let a_ty;
let b_ty;
if relation.tcx().features().adt_const_params {
a_ty = tcx.normalize_erasing_regions(relation.param_env(), a.ty());
b_ty = tcx.normalize_erasing_regions(relation.param_env(), b.ty());
} else {
a_ty = tcx.erase_regions(a.ty());
b_ty = tcx.erase_regions(b.ty());
}
if a_ty != b_ty {
relation.tcx().sess.delay_span_bug(
DUMMY_SP,