Skip to content

Commit 74a967b

Browse files
cjgillotcjgillot
committed
Support a few more rvalues.
1 parent 7ef555d commit 74a967b

28 files changed

Lines changed: 835 additions & 33 deletions

‎compiler/rustc_middle/src/ty/consts/int.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,11 @@ impl ScalarInt {
226226
}
227227
}
228228

229+
#[inline]
230+
pub fn try_from_target_usize(i: impl Into<u128>, tcx: TyCtxt<'_>) -> Option<Self> {
231+
Self::try_from_uint(i, tcx.data_layout.pointer_size)
232+
}
233+
229234
#[inline]
230235
pub fn assert_bits(self, target_size: Size) -> u128 {
231236
self.to_bits(target_size).unwrap_or_else(|size| {

‎compiler/rustc_mir_transform/src/dataflow_const_prop.rs‎

Lines changed: 50 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -193,47 +193,64 @@ impl<'tcx> ValueAnalysis<'tcx> for ConstAnalysis<'_, 'tcx> {
193193
rvalue: &Rvalue<'tcx>,
194194
state: &mut State<Self::Value>,
195195
) -> ValueOrPlace<Self::Value> {
196-
match rvalue {
197-
Rvalue::Cast(
198-
kind @ (CastKind::IntToInt
199-
| CastKind::FloatToInt
200-
| CastKind::FloatToFloat
201-
| CastKind::IntToFloat),
202-
operand,
203-
ty,
204-
) => match self.eval_operand(operand, state) {
205-
FlatSet::Elem(op) => match kind {
206-
CastKind::IntToInt | CastKind::IntToFloat => {
207-
self.ecx.int_to_int_or_float(&op, *ty)
208-
}
209-
CastKind::FloatToInt | CastKind::FloatToFloat => {
210-
self.ecx.float_to_float_or_int(&op, *ty)
211-
}
212-
_ => unreachable!(),
196+
let val = match rvalue {
197+
Rvalue::Cast(CastKind::IntToInt | CastKind::IntToFloat, operand, ty) => {
198+
match self.eval_operand(operand, state) {
199+
FlatSet::Elem(op) => self
200+
.ecx
201+
.int_to_int_or_float(&op, *ty)
202+
.map_or(FlatSet::Top, |result| self.wrap_immediate(result)),
203+
FlatSet::Bottom => FlatSet::Bottom,
204+
FlatSet::Top => FlatSet::Top,
213205
}
214-
.map(|result| ValueOrPlace::Value(self.wrap_immediate(result)))
215-
.unwrap_or(ValueOrPlace::TOP),
216-
_ => ValueOrPlace::TOP,
217-
},
206+
}
207+
Rvalue::Cast(CastKind::FloatToInt | CastKind::FloatToFloat, operand, ty) => {
208+
match self.eval_operand(operand, state) {
209+
FlatSet::Elem(op) => self
210+
.ecx
211+
.float_to_float_or_int(&op, *ty)
212+
.map_or(FlatSet::Top, |result| self.wrap_immediate(result)),
213+
FlatSet::Bottom => FlatSet::Bottom,
214+
FlatSet::Top => FlatSet::Top,
215+
}
216+
}
217+
Rvalue::Cast(CastKind::Transmute, operand, _) => {
218+
match self.eval_operand(operand, state) {
219+
FlatSet::Elem(op) => self.wrap_immediate(*op),
220+
FlatSet::Bottom => FlatSet::Bottom,
221+
FlatSet::Top => FlatSet::Top,
222+
}
223+
}
218224
Rvalue::BinaryOp(op, box (left, right)) => {
219225
// Overflows must be ignored here.
220226
let (val, _overflow) = self.binary_op(state, *op, left, right);
221-
ValueOrPlace::Value(val)
227+
val
222228
}
223229
Rvalue::UnaryOp(op, operand) => match self.eval_operand(operand, state) {
224-
FlatSet::Elem(value) => self
225-
.ecx
226-
.unary_op(*op, &value)
227-
.map(|val| ValueOrPlace::Value(self.wrap_immty(val)))
228-
.unwrap_or(ValueOrPlace::Value(FlatSet::Top)),
229-
FlatSet::Bottom => ValueOrPlace::Value(FlatSet::Bottom),
230-
FlatSet::Top => ValueOrPlace::Value(FlatSet::Top),
230+
FlatSet::Elem(value) => {
231+
self.ecx.unary_op(*op, &value).map_or(FlatSet::Top, |val| self.wrap_immty(val))
232+
}
233+
FlatSet::Bottom => FlatSet::Bottom,
234+
FlatSet::Top => FlatSet::Top,
231235
},
232-
Rvalue::Discriminant(place) => {
233-
ValueOrPlace::Value(state.get_discr(place.as_ref(), self.map()))
236+
Rvalue::NullaryOp(null_op, ty) => {
237+
let Ok(layout) = self.tcx.layout_of(self.param_env.and(*ty)) else {
238+
return ValueOrPlace::Value(FlatSet::Top);
239+
};
240+
let val = match null_op {
241+
NullOp::SizeOf if layout.is_sized() => layout.size.bytes(),
242+
NullOp::AlignOf if layout.is_sized() => layout.align.abi.bytes(),
243+
NullOp::OffsetOf(fields) => layout
244+
.offset_of_subfield(&self.ecx, fields.iter().map(|f| f.index()))
245+
.bytes(),
246+
_ => return ValueOrPlace::Value(FlatSet::Top),
247+
};
248+
ScalarInt::try_from_target_usize(val, self.tcx).map_or(FlatSet::Top, FlatSet::Elem)
234249
}
235-
_ => self.super_rvalue(rvalue, state),
236-
}
250+
Rvalue::Discriminant(place) => state.get_discr(place.as_ref(), self.map()),
251+
_ => return self.super_rvalue(rvalue, state),
252+
};
253+
ValueOrPlace::Value(val)
237254
}
238255

239256
fn handle_constant(

‎tests/mir-opt/dataflow-const-prop/offset_of.concrete.DataflowConstProp.panic-abort.diff‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
- // MIR for `concrete` before DataflowConstProp
2+
+ // MIR for `concrete` after DataflowConstProp
3+
4+
fn concrete() -> () {
5+
let mut _0: ();
6+
let _1: usize;
7+
let mut _2: usize;
8+
let mut _4: usize;
9+
let mut _6: usize;
10+
let mut _8: usize;
11+
scope 1 {
12+
debug x => _1;
13+
let _3: usize;
14+
scope 2 {
15+
debug y => _3;
16+
let _5: usize;
17+
scope 3 {
18+
debug z0 => _5;
19+
let _7: usize;
20+
scope 4 {
21+
debug z1 => _7;
22+
}
23+
}
24+
}
25+
}
26+
27+
bb0: {
28+
StorageLive(_1);
29+
StorageLive(_2);
30+
- _2 = OffsetOf(Alpha, [0]);
31+
- _1 = must_use::<usize>(move _2) -> [return: bb1, unwind unreachable];
32+
+ _2 = const 4_usize;
33+
+ _1 = must_use::<usize>(const 4_usize) -> [return: bb1, unwind unreachable];
34+
}
35+
36+
bb1: {
37+
StorageDead(_2);
38+
StorageLive(_3);
39+
StorageLive(_4);
40+
- _4 = OffsetOf(Alpha, [1]);
41+
- _3 = must_use::<usize>(move _4) -> [return: bb2, unwind unreachable];
42+
+ _4 = const 0_usize;
43+
+ _3 = must_use::<usize>(const 0_usize) -> [return: bb2, unwind unreachable];
44+
}
45+
46+
bb2: {
47+
StorageDead(_4);
48+
StorageLive(_5);
49+
StorageLive(_6);
50+
- _6 = OffsetOf(Alpha, [2, 0]);
51+
- _5 = must_use::<usize>(move _6) -> [return: bb3, unwind unreachable];
52+
+ _6 = const 2_usize;
53+
+ _5 = must_use::<usize>(const 2_usize) -> [return: bb3, unwind unreachable];
54+
}
55+
56+
bb3: {
57+
StorageDead(_6);
58+
StorageLive(_7);
59+
StorageLive(_8);
60+
- _8 = OffsetOf(Alpha, [2, 1]);
61+
- _7 = must_use::<usize>(move _8) -> [return: bb4, unwind unreachable];
62+
+ _8 = const 3_usize;
63+
+ _7 = must_use::<usize>(const 3_usize) -> [return: bb4, unwind unreachable];
64+
}
65+
66+
bb4: {
67+
StorageDead(_8);
68+
_0 = const ();
69+
StorageDead(_7);
70+
StorageDead(_5);
71+
StorageDead(_3);
72+
StorageDead(_1);
73+
return;
74+
}
75+
}
76+

‎tests/mir-opt/dataflow-const-prop/offset_of.concrete.DataflowConstProp.panic-unwind.diff‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
- // MIR for `concrete` before DataflowConstProp
2+
+ // MIR for `concrete` after DataflowConstProp
3+
4+
fn concrete() -> () {
5+
let mut _0: ();
6+
let _1: usize;
7+
let mut _2: usize;
8+
let mut _4: usize;
9+
let mut _6: usize;
10+
let mut _8: usize;
11+
scope 1 {
12+
debug x => _1;
13+
let _3: usize;
14+
scope 2 {
15+
debug y => _3;
16+
let _5: usize;
17+
scope 3 {
18+
debug z0 => _5;
19+
let _7: usize;
20+
scope 4 {
21+
debug z1 => _7;
22+
}
23+
}
24+
}
25+
}
26+
27+
bb0: {
28+
StorageLive(_1);
29+
StorageLive(_2);
30+
- _2 = OffsetOf(Alpha, [0]);
31+
- _1 = must_use::<usize>(move _2) -> [return: bb1, unwind continue];
32+
+ _2 = const 4_usize;
33+
+ _1 = must_use::<usize>(const 4_usize) -> [return: bb1, unwind continue];
34+
}
35+
36+
bb1: {
37+
StorageDead(_2);
38+
StorageLive(_3);
39+
StorageLive(_4);
40+
- _4 = OffsetOf(Alpha, [1]);
41+
- _3 = must_use::<usize>(move _4) -> [return: bb2, unwind continue];
42+
+ _4 = const 0_usize;
43+
+ _3 = must_use::<usize>(const 0_usize) -> [return: bb2, unwind continue];
44+
}
45+
46+
bb2: {
47+
StorageDead(_4);
48+
StorageLive(_5);
49+
StorageLive(_6);
50+
- _6 = OffsetOf(Alpha, [2, 0]);
51+
- _5 = must_use::<usize>(move _6) -> [return: bb3, unwind continue];
52+
+ _6 = const 2_usize;
53+
+ _5 = must_use::<usize>(const 2_usize) -> [return: bb3, unwind continue];
54+
}
55+
56+
bb3: {
57+
StorageDead(_6);
58+
StorageLive(_7);
59+
StorageLive(_8);
60+
- _8 = OffsetOf(Alpha, [2, 1]);
61+
- _7 = must_use::<usize>(move _8) -> [return: bb4, unwind continue];
62+
+ _8 = const 3_usize;
63+
+ _7 = must_use::<usize>(const 3_usize) -> [return: bb4, unwind continue];
64+
}
65+
66+
bb4: {
67+
StorageDead(_8);
68+
_0 = const ();
69+
StorageDead(_7);
70+
StorageDead(_5);
71+
StorageDead(_3);
72+
StorageDead(_1);
73+
return;
74+
}
75+
}
76+

‎tests/mir-opt/dataflow-const-prop/offset_of.generic.DataflowConstProp.panic-abort.diff‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
- // MIR for `generic` before DataflowConstProp
2+
+ // MIR for `generic` after DataflowConstProp
3+
4+
fn generic() -> () {
5+
let mut _0: ();
6+
let _1: usize;
7+
let mut _2: usize;
8+
let mut _4: usize;
9+
let mut _6: usize;
10+
let mut _8: usize;
11+
scope 1 {
12+
debug gx => _1;
13+
let _3: usize;
14+
scope 2 {
15+
debug gy => _3;
16+
let _5: usize;
17+
scope 3 {
18+
debug dx => _5;
19+
let _7: usize;
20+
scope 4 {
21+
debug dy => _7;
22+
}
23+
}
24+
}
25+
}
26+
27+
bb0: {
28+
StorageLive(_1);
29+
StorageLive(_2);
30+
_2 = OffsetOf(Gamma<T>, [0]);
31+
_1 = must_use::<usize>(move _2) -> [return: bb1, unwind unreachable];
32+
}
33+
34+
bb1: {
35+
StorageDead(_2);
36+
StorageLive(_3);
37+
StorageLive(_4);
38+
_4 = OffsetOf(Gamma<T>, [1]);
39+
_3 = must_use::<usize>(move _4) -> [return: bb2, unwind unreachable];
40+
}
41+
42+
bb2: {
43+
StorageDead(_4);
44+
StorageLive(_5);
45+
StorageLive(_6);
46+
- _6 = OffsetOf(Delta<T>, [1]);
47+
- _5 = must_use::<usize>(move _6) -> [return: bb3, unwind unreachable];
48+
+ _6 = const 0_usize;
49+
+ _5 = must_use::<usize>(const 0_usize) -> [return: bb3, unwind unreachable];
50+
}
51+
52+
bb3: {
53+
StorageDead(_6);
54+
StorageLive(_7);
55+
StorageLive(_8);
56+
- _8 = OffsetOf(Delta<T>, [2]);
57+
- _7 = must_use::<usize>(move _8) -> [return: bb4, unwind unreachable];
58+
+ _8 = const 2_usize;
59+
+ _7 = must_use::<usize>(const 2_usize) -> [return: bb4, unwind unreachable];
60+
}
61+
62+
bb4: {
63+
StorageDead(_8);
64+
_0 = const ();
65+
StorageDead(_7);
66+
StorageDead(_5);
67+
StorageDead(_3);
68+
StorageDead(_1);
69+
return;
70+
}
71+
}
72+

0 commit comments

Comments
 (0)