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

rustc_layout_scalar_valid_range can be applied to scalar pairs and affects teh first scalar

Browse source
This commit is contained in:
Oli Scherer 2022-11-03 08:17:08 +00:00
parent 2b8963a94c
commit c3eb8f2778
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_const_eval/src/interpret/validity.rs
View file

@ -785,15 +785,7 @@ impl<'rt, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
} }
} }
Abi::ScalarPair(a_layout, b_layout) => { Abi::ScalarPair(a_layout, b_layout) => {
// There is no `rustc_layout_scalar_valid_range_start` for pairs, so if !a_layout.is_uninit_valid() && !b_layout.is_uninit_valid() {
// we would validate these things as we descend into the fields,
// but that can miss bugs in layout computation. Layout computation
// is subtle due to enums having ScalarPair layout, where one field
// is the discriminant.
if cfg!(debug_assertions)
&& !a_layout.is_uninit_valid()
&& !b_layout.is_uninit_valid()
{
// We can only proceed if *both* scalars need to be initialized. // We can only proceed if *both* scalars need to be initialized.
// FIXME: find a way to also check ScalarPair when one side can be uninit but // FIXME: find a way to also check ScalarPair when one side can be uninit but
// the other must be init. // the other must be init.