bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #111082 - saethlin:box-assertkind, r=saethlin

Browse source 
Box AssertKind

r? `@nnethercote` this feels like your kind of thing

I want to add a new variant to `AssertKind` that needs 3 operands, and that ends up breaking a bunch of size assertions. So... what if we go the opposite direction first; shrinking `AssertKind` by boxing it?
This commit is contained in:
bors 2023-05-02 14:02:29 +00:00
commit 9d795a6e6e
10 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_mir_transform/src/check_alignment.rs
View file

@ -224,10 +224,10 @@ fn insert_alignment_check<'tcx>(
cond: Operand::Copy(is_ok),
expected: true,
target: new_block,
msg: AssertKind::MisalignedPointerDereference {
msg: Box::new(AssertKind::MisalignedPointerDereference {
required: Operand::Copy(alignment),
found: Operand::Copy(addr),
},
}),
unwind: UnwindAction::Terminate,
},
});

2
compiler/rustc_mir_transform/src/generator.rs
View file

@ -1150,7 +1150,7 @@ fn insert_panic_block<'tcx>(
literal: ConstantKind::from_bool(tcx, false),
})),
expected: true,
msg: message,
msg: Box::new(message),
target: assert_block,
unwind: UnwindAction::Continue,
};