bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Factor out checks in layout check and add helper inherent_size.

Browse source
This commit is contained in:
Luqman Aden 2023-02-18 19:21:07 -08:00
parent f2d81defa1
commit 3b1e535f36
3 changed files with 63 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_abi/src/lib.rs
View file

@ -1273,7 +1273,7 @@ impl Abi {
matches!(*self, Abi::Scalar(_))
}
/// Returns the fixed alignment of this ABI, if any
/// Returns the fixed alignment of this ABI, if any is mandated.
pub fn inherent_align<C: HasDataLayout>(&self, cx: &C) -> Option<AbiAndPrefAlign> {
Some(match *self {
Abi::Scalar(s) => s.align(cx),
@ -1287,6 +1287,27 @@ impl Abi {
})
}
/// Returns the fixed size of this ABI, if any is mandated.
pub fn inherent_size<C: HasDataLayout>(&self, cx: &C) -> Option<Size> {
Some(match *self {
Abi::Scalar(s) => {
// No padding in scalars.
s.size(cx)
}
Abi::ScalarPair(s1, s2) => {
// May have some padding between the pair.
let field2_offset = s1.size(cx).align_to(s2.align(cx).abi);
(field2_offset + s2.size(cx)).align_to(self.inherent_align(cx)?.abi)
}
Abi::Vector { element, count } => {
// No padding in vectors, except possibly for trailing padding
// to make the size a multiple of align (e.g. for vectors of size 3).
(element.size(cx) * count).align_to(self.inherent_align(cx)?.abi)
}
Abi::Uninhabited | Abi::Aggregate { .. } => return None,
})
}
/// Discard valid range information and allow undef
pub fn to_union(&self) -> Self {
assert!(self.is_sized());