bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix failure to detect a too-big-type after adding padding

Browse source
This commit is contained in:
Ralf Jung 2023-10-27 13:19:24 +02:00
parent 707d8c3f1b
commit 2ef5897a89
4 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_abi/src/layout.rs
View file

@ -539,6 +539,7 @@ pub trait LayoutCalculator {
// Align the maximum variant size to the largest alignment.
size = size.align_to(align.abi);
// FIXME(oli-obk): deduplicate and harden these checks
if size.bytes() >= dl.obj_size_bound() {
return None;
}
@ -1103,6 +1104,10 @@ fn univariant<
inverse_memory_index.into_iter().map(|it| it.index() as u32).collect()
};
let size = min_size.align_to(align.abi);
// FIXME(oli-obk): deduplicate and harden these checks
if size.bytes() >= dl.obj_size_bound() {
return None;
}
let mut layout_of_single_non_zst_field = None;
let mut abi = Abi::Aggregate { sized };
// Try to make this a Scalar/ScalarPair.

3
compiler/rustc_ty_utils/src/layout_sanity_check.rs
View file

@ -19,6 +19,9 @@ pub(super) fn sanity_check_layout<'tcx>(
if layout.size.bytes() % layout.align.abi.bytes() != 0 {
bug!("size is not a multiple of align, in the following layout:\n{layout:#?}");
}
if layout.size.bytes() >= cx.tcx.data_layout.obj_size_bound() {
bug!("size is too large, in the following layout:\n{layout:#?}");
}
if !cfg!(debug_assertions) {
// Stop here, the rest is kind of expensive.