nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustc_transmute: fix big-endian discriminants

Browse Source
This commit is contained in:
Josh Stone 2022-09-20 13:03:43 -07:00
parent cd8cc91045
commit a72666ed56
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/rustc_transmute/src/layout/tree.rs
View File

@ -404,7 +404,7 @@ pub(crate) mod rustc {
.unwrap(); .unwrap();
trace!(?discr_layout, "computed discriminant layout"); trace!(?discr_layout, "computed discriminant layout");
variant_layout = variant_layout.extend(discr_layout).unwrap().0; variant_layout = variant_layout.extend(discr_layout).unwrap().0;
tree = tree.then(Self::from_disr(discr, tcx, layout_summary.discriminant_size)); tree = tree.then(Self::from_discr(discr, tcx, layout_summary.discriminant_size));
} }
// Next come fields. // Next come fields.
@ -444,11 +444,21 @@ pub(crate) mod rustc {
Ok(tree) Ok(tree)
} }
pub fn from_disr(discr: Discr<'tcx>, tcx: TyCtxt<'tcx>, size: usize) -> Self { pub fn from_discr(discr: Discr<'tcx>, tcx: TyCtxt<'tcx>, size: usize) -> Self {
// FIXME(@jswrenn): I'm certain this is missing needed endian nuance. use rustc_target::abi::Endian;
let bytes = discr.val.to_ne_bytes();
let bytes = &bytes[..size]; let bytes: [u8; 16];
Self::Seq(bytes.into_iter().copied().map(|b| Self::from_bits(b)).collect()) let bytes = match tcx.data_layout.endian {
Endian::Little => {
bytes = discr.val.to_le_bytes();
&bytes[..size]
}
Endian::Big => {
bytes = discr.val.to_be_bytes();
&bytes[bytes.len() - size..]
}
};
Self::Seq(bytes.iter().map(|&b| Self::from_bits(b)).collect())
} }
} }