diff options
| author | Ralf Jung <post@ralfj.de> | 2024-05-01 15:57:33 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-05-01 15:57:33 +0200 |
| commit | 65d74785d7b43de0bae1e7687efbddbb4b170f91 (patch) | |
| tree | 4ad746a6aa3ee2b105a906036ee73a6b925d1066 | |
| parent | 20aa2d81e36036073a9acf418c7d413cb4b22fa6 (diff) | |
| download | rust-65d74785d7b43de0bae1e7687efbddbb4b170f91.tar.gz rust-65d74785d7b43de0bae1e7687efbddbb4b170f91.zip | |
Align: add bytes_usize and bits_usize
| -rw-r--r-- | compiler/rustc_abi/src/lib.rs | 10 | ||||
| -rw-r--r-- | compiler/rustc_transmute/src/layout/tree.rs | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/compiler/rustc_abi/src/lib.rs b/compiler/rustc_abi/src/lib.rs index a46148242d5..6a2943da4a3 100644 --- a/compiler/rustc_abi/src/lib.rs +++ b/compiler/rustc_abi/src/lib.rs @@ -743,10 +743,20 @@ impl Align { } #[inline] + pub fn bytes_usize(self) -> usize { + self.bytes().try_into().unwrap() + } + + #[inline] pub fn bits(self) -> u64 { self.bytes() * 8 } + #[inline] + pub fn bits_usize(self) -> usize { + self.bits().try_into().unwrap() + } + /// Computes the best alignment possible for the given offset /// (the largest power of two that the offset is a multiple of). /// diff --git a/compiler/rustc_transmute/src/layout/tree.rs b/compiler/rustc_transmute/src/layout/tree.rs index edd3227210b..604b68d2cd4 100644 --- a/compiler/rustc_transmute/src/layout/tree.rs +++ b/compiler/rustc_transmute/src/layout/tree.rs @@ -266,7 +266,7 @@ pub(crate) mod rustc { ty::Ref(lifetime, ty, mutability) => { let ty_and_layout = cx.layout_of(*ty)?; - let align = ty_and_layout.align.abi.bytes() as usize; + let align = ty_and_layout.align.abi.bytes_usize(); let size = ty_and_layout.size.bytes_usize(); Ok(Tree::Ref(Ref { lifetime: *lifetime, |