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

Interpret Immediate::Uninit as Bottom.

Browse Source
This commit is contained in:
Camille GILLOT 2023-09-07 17:20:51 +00:00
parent b851e554dd
commit 1d6a32c920
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/rustc_mir_transform/src/dataflow_const_prop.rs
View File

@ -270,9 +270,10 @@ fn handle_rvalue(
val
}
Rvalue::UnaryOp(op, operand) => match self.eval_operand(operand, state) {
FlatSet::Elem(value) => {
self.ecx.unary_op(*op, &value).map_or(FlatSet::Top, |val| self.wrap_immty(val))
}
FlatSet::Elem(value) => self
.ecx
.unary_op(*op, &value)
.map_or(FlatSet::Top, |val| self.wrap_immediate(*val)),
FlatSet::Bottom => FlatSet::Bottom,
FlatSet::Top => FlatSet::Top,
},
@ -420,9 +421,9 @@ fn assign_constant(
&mut |place, op| {
if let Ok(imm) = self.ecx.read_immediate_raw(op)
&& let Some(imm) = imm.right()
&& let Immediate::Scalar(scalar) = *imm
{
state.insert_value_idx(place, FlatSet::Elem(scalar), &self.map);
let elem = self.wrap_immediate(*imm);
state.insert_value_idx(place, elem, &self.map);
}
},
);
@ -492,10 +493,9 @@ fn eval_operand(
FlatSet::Top => FlatSet::Top,
FlatSet::Elem(scalar) => {
let ty = op.ty(self.local_decls, self.tcx);
self.tcx
.layout_of(self.param_env.and(ty))
.map(|layout| FlatSet::Elem(ImmTy::from_scalar(scalar.into(), layout)))
.unwrap_or(FlatSet::Top)
self.tcx.layout_of(self.param_env.and(ty)).map_or(FlatSet::Top, |layout| {
FlatSet::Elem(ImmTy::from_scalar(scalar.into(), layout))
})
}
FlatSet::Bottom => FlatSet::Bottom,
}
@ -514,13 +514,10 @@ fn eval_discriminant(&self, enum_ty: Ty<'tcx>, variant_index: VariantIdx) -> Opt
fn wrap_immediate(&self, imm: Immediate) -> FlatSet<Scalar> {
match imm {
Immediate::Scalar(scalar) => FlatSet::Elem(scalar),
Immediate::Uninit => FlatSet::Bottom,
_ => FlatSet::Top,
}
}
fn wrap_immty(&self, val: ImmTy<'tcx>) -> FlatSet<Scalar> {
self.wrap_immediate(*val)
}
}
struct CollectAndPatch<'tcx, 'locals> {