Skip to content

Commit 55c9f08

Browse files
hbinahbina
committed
Changed the name of UninitMask to InitMask to avoid confusion.
Also updated all the related tests.
1 parent eab1237 commit 55c9f08

File tree

11 files changed

+40
-40
lines changed

11 files changed

+40
-40
lines changed

‎src/librustc_middle/mir/interpret/allocation.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct Allocation<Tag = (), Extra = ()> {
2727
/// at the given offset.
2828
relocations: Relocations<Tag>,
2929
/// Denotes which part of this allocation is initialized.
30-
uninit_mask: UninitMask,
30+
uninit_mask: InitMask,
3131
/// The size of the allocation. Currently, must always equal `bytes.len()`.
3232
pub size: Size,
3333
/// The alignment of the allocation to detect unaligned reads.
@@ -94,7 +94,7 @@ impl<Tag> Allocation<Tag> {
9494
Self {
9595
bytes,
9696
relocations: Relocations::new(),
97-
uninit_mask: UninitMask::new(size, true),
97+
uninit_mask: InitMask::new(size, true),
9898
size,
9999
align,
100100
mutability: Mutability::Not,
@@ -110,7 +110,7 @@ impl<Tag> Allocation<Tag> {
110110
Allocation {
111111
bytes: vec![0; size.bytes_usize()],
112112
relocations: Relocations::new(),
113-
uninit_mask: UninitMask::new(size, false),
113+
uninit_mask: InitMask::new(size, false),
114114
size,
115115
align,
116116
mutability: Mutability::Mut,
@@ -163,7 +163,7 @@ impl<Tag, Extra> Allocation<Tag, Extra> {
163163
}
164164

165165
/// Returns the uninit mask.
166-
pub fn uninit_mask(&self) -> &UninitMask {
166+
pub fn uninit_mask(&self) -> &InitMask {
167167
&self.uninit_mask
168168
}
169169

@@ -744,16 +744,16 @@ type Block = u64;
744744
/// is initialized. If it is `false` the byte is uninitialized.
745745
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, RustcEncodable, RustcDecodable)]
746746
#[derive(HashStable)]
747-
pub struct UninitMask {
747+
pub struct InitMask {
748748
blocks: Vec<Block>,
749749
len: Size,
750750
}
751751

752-
impl UninitMask {
752+
impl InitMask {
753753
pub const BLOCK_SIZE: u64 = 64;
754754

755755
pub fn new(size: Size, state: bool) -> Self {
756-
let mut m = UninitMask { blocks: vec![], len: Size::ZERO };
756+
let mut m = InitMask { blocks: vec![], len: Size::ZERO };
757757
m.grow(size, state);
758758
m
759759
}
@@ -872,7 +872,7 @@ impl UninitMask {
872872
#[inline]
873873
fn bit_index(bits: Size) -> (usize, usize) {
874874
let bits = bits.bytes();
875-
let a = bits / UninitMask::BLOCK_SIZE;
876-
let b = bits % UninitMask::BLOCK_SIZE;
875+
let a = bits / InitMask::BLOCK_SIZE;
876+
let b = bits % InitMask::BLOCK_SIZE;
877877
(usize::try_from(a).unwrap(), usize::try_from(b).unwrap())
878878
}

‎src/librustc_middle/mir/interpret/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ pub use self::error::{
124124

125125
pub use self::value::{get_slice_bytes, ConstValue, RawConst, Scalar, ScalarMaybeUninit};
126126

127-
pub use self::allocation::{Allocation, AllocationExtra, Relocations, UninitMask};
127+
pub use self::allocation::{Allocation, AllocationExtra, Relocations, InitMask};
128128

129129
pub use self::pointer::{CheckInAllocMsg, Pointer, PointerArithmetic};
130130

‎src/test/mir-opt/const_prop/control-flow-simplification/rustc.hello.ConstProp.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
// + literal: Const { ty: fn(&str) -> ! {std::rt::begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
5252
// ty::Const
5353
// + ty: &str
54-
// + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 })
54+
// + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 })
5555
// mir::Constant
5656
// + span: $SRC_DIR/libstd/macros.rs:LL:COL
57-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
57+
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
5858
}
5959
}
6060

‎src/test/mir-opt/inline/inline-into-box-place/32bit/rustc.main.Inline.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
- // + ty: fn() -> std::vec::Vec<u32> {std::vec::Vec::<u32>::new}
2525
- // + val: Value(Scalar(<ZST>))
2626
+ // + ty: alloc::raw_vec::RawVec<u32>
27-
+ // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } })
27+
+ // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } })
2828
// mir::Constant
2929
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
3030
- // + user_ty: UserType(1)
@@ -41,7 +41,7 @@
4141
- _0 = const (); // bb2[2]: scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2
4242
+ // + span: $SRC_DIR/liballoc/vec.rs:LL:COL
4343
+ // + user_ty: UserType(0)
44-
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
44+
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
4545
+ ((*_4).1: usize) = const 0usize; // bb0[5]: scope 2 at $SRC_DIR/liballoc/vec.rs:LL:COL
4646
// ty::Const
4747
+ // + ty: usize

‎src/test/mir-opt/inline/inline-into-box-place/64bit/rustc.main.Inline.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
- // + ty: fn() -> std::vec::Vec<u32> {std::vec::Vec::<u32>::new}
2525
- // + val: Value(Scalar(<ZST>))
2626
+ // + ty: alloc::raw_vec::RawVec<u32>
27-
+ // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } })
27+
+ // + val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } })
2828
// mir::Constant
2929
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
3030
- // + user_ty: UserType(1)
@@ -41,7 +41,7 @@
4141
- _0 = const (); // bb2[2]: scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2
4242
+ // + span: $SRC_DIR/liballoc/vec.rs:LL:COL
4343
+ // + user_ty: UserType(0)
44-
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
44+
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
4545
+ ((*_4).1: usize) = const 0usize; // bb0[5]: scope 2 at $SRC_DIR/liballoc/vec.rs:LL:COL
4646
// ty::Const
4747
+ // + ty: usize

‎src/test/mir-opt/no-drop-for-inactive-variant/rustc.unwrap.SimplifyCfg-elaborate-drops.after.mir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ fn unwrap(_1: std::option::Option<T>) -> T {
3232
// + literal: Const { ty: fn(&str) -> ! {std::rt::begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
3333
// ty::Const
3434
// + ty: &str
35-
// + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 })
35+
// + val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 })
3636
// mir::Constant
3737
// + span: $SRC_DIR/libstd/macros.rs:LL:COL
38-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
38+
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [101, 120, 112, 108, 105, 99, 105, 116, 32, 112, 97, 110, 105, 99], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, size: Size { raw: 14 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
3939
}
4040

4141
bb3: {

‎src/test/mir-opt/no-spurious-drop-after-call/rustc.main.ElaborateDrops.before.mir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ fn main() -> () {
1515
_4 = const ""; // bb0[4]: scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
1616
// ty::Const
1717
// + ty: &str
18-
// + val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 })
18+
// + val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 })
1919
// mir::Constant
2020
// + span: $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
21-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) }
21+
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [], len: Size { raw: 0 } }, size: Size { raw: 0 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) }
2222
_3 = &(*_4); // bb0[5]: scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
2323
_2 = const <str as std::string::ToString>::to_string(move _3) -> bb2; // bb0[6]: scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
2424
// ty::Const

‎src/test/mir-opt/storage_live_dead_in_statics/rustc.XXX.mir_map.0.mir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,10 +653,10 @@ static XXX: &Foo = {
653653
_2 = Foo { tup: const "hi", data: move _3 }; // bb0[94]: scope 0 at $DIR/storage_live_dead_in_statics.rs:5:29: 23:2
654654
// ty::Const
655655
// + ty: &str
656-
// + val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 })
656+
// + val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 })
657657
// mir::Constant
658658
// + span: $DIR/storage_live_dead_in_statics.rs:6:10: 6:14
659-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), uninit_mask: UninitMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) }
659+
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), uninit_mask: InitMask { blocks: [3], len: Size { raw: 2 } }, size: Size { raw: 2 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) }
660660
_1 = &_2; // bb0[95]: scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2
661661
_0 = &(*_1); // bb0[96]: scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2
662662
StorageDead(_5); // bb0[97]: scope 0 at $DIR/storage_live_dead_in_statics.rs:23:1: 23:2

0 commit comments

Comments
 (0)