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

Rollup merge of #92242 - compiler-errors:layout-modulo-regions, r=matthewjasper

Browse Source 
Erase regions before calculating layout for packed field capture

Self-explanatory. We just erase region inferencing because we don't need that for layout computation... Q: layouts are always equal modulo regions, right?

Fixes #92240
This commit is contained in:
Matthias Krüger 2022-02-11 07:48:02 +01:00 committed by GitHub
commit 664255b168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/rustc_typeck/src/check/upvar.rs
View File

@ -1648,7 +1648,8 @@ fn restrict_repr_packed_field_ref_capture<'tcx>(
match p.kind { match p.kind {
ProjectionKind::Field(..) => match ty.kind() { ProjectionKind::Field(..) => match ty.kind() {
ty::Adt(def, _) if def.repr.packed() => { ty::Adt(def, _) if def.repr.packed() => {
match tcx.layout_of(param_env.and(p.ty)) { // We erase regions here because they cannot be hashed
match tcx.layout_of(param_env.and(tcx.erase_regions(p.ty))) {
Ok(layout) if layout.align.abi.bytes() == 1 => { Ok(layout) if layout.align.abi.bytes() == 1 => {
// if the alignment is 1, the type can't be further // if the alignment is 1, the type can't be further
// disaligned. // disaligned.