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

const prop nonsense eliminated

Browse source
This commit is contained in:
Oli Scherer 2024-01-05 17:31:38 +00:00
parent 6ecb2aa580
commit 1f398abcb6
6 changed files with 32 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View file

@ -403,7 +403,12 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
operand,
&mut |elem, op| match elem {
TrackElem::Field(idx) => self.ecx.project_field(op, idx.as_usize()).ok(),
TrackElem::Variant(idx) => self.ecx.project_downcast(op, idx).ok(),
TrackElem::Variant(idx) => {
if op.layout.for_variant(&self.ecx, idx).abi.is_uninhabited() {
return None;
}
self.ecx.project_downcast(op, idx).ok()
}
TrackElem::Discriminant => {
let variant = self.ecx.read_discriminant(op).ok()?;
let discr_value =