diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2023-09-07 17:20:51 +0000 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2023-09-11 16:29:41 +0000 |
| commit | 1d6a32c920d03f34facf6af3b3aea75ce8c48d4b (patch) | |
| tree | 18519cc6ecd6bafc5136c9098f0e4b8c679bf9dd | |
| parent | b851e554ddf64d4889d305ee4d8972028bc86b90 (diff) | |
| download | rust-1d6a32c920d03f34facf6af3b3aea75ce8c48d4b.tar.gz rust-1d6a32c920d03f34facf6af3b3aea75ce8c48d4b.zip | |
Interpret Immediate::Uninit as Bottom.
| -rw-r--r-- | compiler/rustc_mir_transform/src/dataflow_const_prop.rs | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/compiler/rustc_mir_transform/src/dataflow_const_prop.rs b/compiler/rustc_mir_transform/src/dataflow_const_prop.rs index fc8eccb2705..a67bc53d2b4 100644 --- a/compiler/rustc_mir_transform/src/dataflow_const_prop.rs +++ b/compiler/rustc_mir_transform/src/dataflow_const_prop.rs @@ -270,9 +270,10 @@ impl<'tcx> ValueAnalysis<'tcx> for ConstAnalysis<'_, 'tcx> { 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 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> { &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 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> { 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 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> { 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> { |