mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #129505 - RalfJung:imm-ty-offset, r=davidtwco

Browse Source 
interpret: ImmTy: tighten sanity checks in offset logic

Also make some debug assertions into assertions. (Will need to be perf'd.)
This commit is contained in:
Matthias Krüger 2024-08-24 22:14:15 +02:00 committed by GitHub
commit 9e1f6281ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/rustc_const_eval/src/interpret/operand.rs
View File

@ -319,6 +319,7 @@ impl<'tcx, Prov: Provenance> ImmTy<'tcx, Prov> {
// some fieldless enum variants can have non-zero size but still `Aggregate` ABI... try // some fieldless enum variants can have non-zero size but still `Aggregate` ABI... try
// to detect those here and also give them no data // to detect those here and also give them no data
_ if matches!(layout.abi, Abi::Aggregate { .. }) _ if matches!(layout.abi, Abi::Aggregate { .. })
&& matches!(layout.variants, abi::Variants::Single { .. })
&& matches!(&layout.fields, abi::FieldsShape::Arbitrary { offsets, .. } if offsets.len() == 0) => && matches!(&layout.fields, abi::FieldsShape::Arbitrary { offsets, .. } if offsets.len() == 0) =>
{ {
Immediate::Uninit Immediate::Uninit
@ -328,8 +329,9 @@ impl<'tcx, Prov: Provenance> ImmTy<'tcx, Prov> {
assert_eq!(offset.bytes(), 0); assert_eq!(offset.bytes(), 0);
assert!( assert!(
match (self.layout.abi, layout.abi) { match (self.layout.abi, layout.abi) {
(Abi::Scalar(..), Abi::Scalar(..)) => true, (Abi::Scalar(l), Abi::Scalar(r)) => l.size(cx) == r.size(cx),
(Abi::ScalarPair(..), Abi::ScalarPair(..)) => true, (Abi::ScalarPair(l1, l2), Abi::ScalarPair(r1, r2)) =>
l1.size(cx) == r1.size(cx) && l2.size(cx) == r2.size(cx),
_ => false, _ => false,
}, },
"cannot project into {} immediate with equally-sized field {}\nouter ABI: {:#?}\nfield ABI: {:#?}", "cannot project into {} immediate with equally-sized field {}\nouter ABI: {:#?}\nfield ABI: {:#?}",
@ -344,16 +346,23 @@ impl<'tcx, Prov: Provenance> ImmTy<'tcx, Prov> {
(Immediate::ScalarPair(a_val, b_val), Abi::ScalarPair(a, b)) => { (Immediate::ScalarPair(a_val, b_val), Abi::ScalarPair(a, b)) => {
assert_matches!(layout.abi, Abi::Scalar(..)); assert_matches!(layout.abi, Abi::Scalar(..));
Immediate::from(if offset.bytes() == 0 { Immediate::from(if offset.bytes() == 0 {
debug_assert_eq!(layout.size, a.size(cx)); // It is "okay" to transmute from `usize` to a pointer (GVN relies on that).
// So only compare the size.
assert_eq!(layout.size, a.size(cx));
a_val a_val
} else { } else {
debug_assert_eq!(offset, a.size(cx).align_to(b.align(cx).abi)); assert_eq!(offset, a.size(cx).align_to(b.align(cx).abi));
debug_assert_eq!(layout.size, b.size(cx)); assert_eq!(layout.size, b.size(cx));
b_val b_val
}) })
} }
// everything else is a bug // everything else is a bug
_ => bug!("invalid field access on immediate {}, layout {:#?}", self, self.layout), _ => bug!(
"invalid field access on immediate {} at offset {}, original layout {:#?}",
self,
offset.bytes(),
self.layout
),
}; };
ImmTy::from_immediate(inner_val, layout) ImmTy::from_immediate(inner_val, layout)