bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fixed premature assertions that caused -Z randomize-layout to fail on alloc

Browse source
This commit is contained in:
Chase Wilson 2022-06-04 12:33:01 -05:00
parent 6364179540
commit ba2f14e065
No known key found for this signature in database
GPG key ID: 65D05E5367092801
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_codegen_ssa/src/base.rs
View file

@ -216,11 +216,12 @@ pub fn unsize_ptr<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
let mut result = None; let mut result = None;
for i in 0..src_layout.fields.count() { for i in 0..src_layout.fields.count() {
let src_f = src_layout.field(bx.cx(), i); let src_f = src_layout.field(bx.cx(), i);
assert_eq!(src_layout.fields.offset(i).bytes(), 0);
assert_eq!(dst_layout.fields.offset(i).bytes(), 0);
if src_f.is_zst() { if src_f.is_zst() {
continue; continue;
} }
assert_eq!(src_layout.fields.offset(i).bytes(), 0);
assert_eq!(dst_layout.fields.offset(i).bytes(), 0);
assert_eq!(src_layout.size, src_f.size); assert_eq!(src_layout.size, src_f.size);
let dst_f = dst_layout.field(bx.cx(), i); let dst_f = dst_layout.field(bx.cx(), i);