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 @@ impl<'tcx> ValueAnalysis<'tcx> for ConstAnalysis<'_, 'tcx> {
val val
} }
Rvalue::UnaryOp(op, operand) => match self.eval_operand(operand, state) { Rvalue::UnaryOp(op, operand) => match self.eval_operand(operand, state) {
FlatSet::Elem(value) => { FlatSet::Elem(value) => self
self.ecx.unary_op(*op, &value).map_or(FlatSet::Top, |val| self.wrap_immty(val)) .ecx
} .unary_op(*op, &value)
.map_or(FlatSet::Top, |val| self.wrap_immediate(*val)),
FlatSet::Bottom => FlatSet::Bottom, FlatSet::Bottom => FlatSet::Bottom,
FlatSet::Top => FlatSet::Top, FlatSet::Top => FlatSet::Top,
}, },
@ -420,9 +421,9 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
&mut |place, op| { &mut |place, op| {
if let Ok(imm) = self.ecx.read_immediate_raw(op) if let Ok(imm) = self.ecx.read_immediate_raw(op)
&& let Some(imm) = imm.right() && 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 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
FlatSet::Top => FlatSet::Top, FlatSet::Top => FlatSet::Top,
FlatSet::Elem(scalar) => { FlatSet::Elem(scalar) => {
let ty = op.ty(self.local_decls, self.tcx); let ty = op.ty(self.local_decls, self.tcx);
self.tcx self.tcx.layout_of(self.param_env.and(ty)).map_or(FlatSet::Top, |layout| {
.layout_of(self.param_env.and(ty)) FlatSet::Elem(ImmTy::from_scalar(scalar.into(), layout))
.map(|layout| FlatSet::Elem(ImmTy::from_scalar(scalar.into(), layout))) })
.unwrap_or(FlatSet::Top)
} }
FlatSet::Bottom => FlatSet::Bottom, FlatSet::Bottom => FlatSet::Bottom,
} }
@ -514,13 +514,10 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
fn wrap_immediate(&self, imm: Immediate) -> FlatSet<Scalar> { fn wrap_immediate(&self, imm: Immediate) -> FlatSet<Scalar> {
match imm { match imm {
Immediate::Scalar(scalar) => FlatSet::Elem(scalar), Immediate::Scalar(scalar) => FlatSet::Elem(scalar),
Immediate::Uninit => FlatSet::Bottom,
_ => FlatSet::Top, _ => FlatSet::Top,
} }
} }
fn wrap_immty(&self, val: ImmTy<'tcx>) -> FlatSet<Scalar> {
self.wrap_immediate(*val)
}
} }
struct CollectAndPatch<'tcx, 'locals> { struct CollectAndPatch<'tcx, 'locals> {