Skip to content

Commit ba2f14e

Browse files
committed
Fixed premature assertions that caused -Z randomize-layout to fail on alloc
1 parent 6364179 commit ba2f14e

File tree

1 file changed

+3
-2
lines changed
  • compiler/rustc_codegen_ssa/src

1 file changed

+3
-2
lines changed

compiler/rustc_codegen_ssa/src/base.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,12 @@ pub fn unsize_ptr<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
216216
let mut result = None;
217217
for i in 0..src_layout.fields.count() {
218218
let src_f = src_layout.field(bx.cx(), i);
219-
assert_eq!(src_layout.fields.offset(i).bytes(), 0);
220-
assert_eq!(dst_layout.fields.offset(i).bytes(), 0);
221219
if src_f.is_zst() {
222220
continue;
223221
}
222+
223+
assert_eq!(src_layout.fields.offset(i).bytes(), 0);
224+
assert_eq!(dst_layout.fields.offset(i).bytes(), 0);
224225
assert_eq!(src_layout.size, src_f.size);
225226

226227
let dst_f = dst_layout.field(bx.cx(), i);

0 commit comments

Comments
 (0)