Skip to content

Commit ed25ca0

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #71459 - divergentdave:pointer-offset-0x, r=RalfJung
Add leading 0x to offset in Debug fmt of Pointer Currently the `Debug` format for `Pointer` prints its offset in hexadecimal, for example, `alloc38657819+e2` or `alloc35122748+64`. This PR adds a leading `0x` to the offset, in order to make it apparent that it is indeed a hexadecimal number. This came up during discussion of rust-lang/miri#1354. r? @RalfJung
2 parents fa7fb93 + c16b6e0 commit ed25ca0

13 files changed

+40
-40
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ static_assert_size!(Pointer, 16);
121121

122122
impl<Tag: fmt::Debug, Id: fmt::Debug> fmt::Debug for Pointer<Tag, Id> {
123123
default fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
124-
write!(f, "{:?}+{:x}[{:?}]", self.alloc_id, self.offset.bytes(), self.tag)
124+
write!(f, "{:?}+0x{:x}[{:?}]", self.alloc_id, self.offset.bytes(), self.tag)
125125
}
126126
}
127127
// Specialization for no tag
128128
impl<Id: fmt::Debug> fmt::Debug for Pointer<(), Id> {
129129
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
130-
write!(f, "{:?}+{:x}", self.alloc_id, self.offset.bytes())
130+
write!(f, "{:?}+0x{:x}", self.alloc_id, self.offset.bytes())
131131
}
132132
}
133133

‎src/test/mir-opt/byte_slice/rustc.main.SimplifyCfg-elaborate-drops.after.mir

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ fn main() -> () {
1616
_1 = const b"foo"; // bb0[1]: scope 0 at $DIR/byte_slice.rs:5:13: 5:19
1717
// ty::Const
1818
// + ty: &[u8; 3]
19-
// + val: Value(Scalar(alloc0+0))
19+
// + val: Value(Scalar(alloc0+0x0))
2020
// mir::Constant
2121
// + span: $DIR/byte_slice.rs:5:13: 5:19
22-
// + literal: Const { ty: &[u8; 3], val: Value(Scalar(alloc0+0)) }
22+
// + literal: Const { ty: &[u8; 3], val: Value(Scalar(alloc0+0x0)) }
2323
StorageLive(_2); // bb0[2]: scope 1 at $DIR/byte_slice.rs:6:9: 6:10
2424
_2 = [const 5u8, const 120u8]; // bb0[3]: scope 1 at $DIR/byte_slice.rs:6:13: 6:24
2525
// ty::Const

‎src/test/mir-opt/const-promotion-extern-static/rustc.BAR-promoted[0].ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ promoted[0] in BAR: &[&i32; 1] = {
77
let mut _3: &i32; // in scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
88

99
bb0: {
10-
_3 = const {alloc0+0: &i32}; // bb0[0]: scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
10+
_3 = const {alloc0+0x0: &i32}; // bb0[0]: scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
1111
// ty::Const
1212
// + ty: &i32
13-
// + val: Value(Scalar(alloc0+0))
13+
// + val: Value(Scalar(alloc0+0x0))
1414
// mir::Constant
1515
// + span: $DIR/const-promotion-extern-static.rs:9:33: 9:34
16-
// + literal: Const { ty: &i32, val: Value(Scalar(alloc0+0)) }
16+
// + literal: Const { ty: &i32, val: Value(Scalar(alloc0+0x0)) }
1717
_2 = _3; // bb0[1]: scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
1818
_1 = [move _2]; // bb0[2]: scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
1919
_0 = &_1; // bb0[3]: scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35

‎src/test/mir-opt/const-promotion-extern-static/rustc.BAR.PromoteTemps.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
- StorageLive(_3); // bb0[2]: scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
1717
- StorageLive(_4); // bb0[3]: scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
1818
- StorageLive(_5); // bb0[4]: scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
19-
- _5 = const {alloc0+0: &i32}; // bb0[5]: scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
19+
- _5 = const {alloc0+0x0: &i32}; // bb0[5]: scope 0 at $DIR/const-promotion-extern-static.rs:9:33: 9:34
2020
+ _6 = const BAR::promoted[0]; // bb0[2]: scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
2121
// ty::Const
2222
- // + ty: &i32
23-
- // + val: Value(Scalar(alloc0+0))
23+
- // + val: Value(Scalar(alloc0+0x0))
2424
+ // + ty: &[&i32; 1]
2525
+ // + val: Unevaluated(DefId(0:6 ~ const_promotion_extern_static[317d]::BAR[0]), [], Some(promoted[0]))
2626
// mir::Constant
2727
- // + span: $DIR/const-promotion-extern-static.rs:9:33: 9:34
28-
- // + literal: Const { ty: &i32, val: Value(Scalar(alloc0+0)) }
28+
- // + literal: Const { ty: &i32, val: Value(Scalar(alloc0+0x0)) }
2929
- _4 = &(*_5); // bb0[6]: scope 0 at $DIR/const-promotion-extern-static.rs:9:32: 9:34
3030
- _3 = [move _4]; // bb0[7]: scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35
3131
- _2 = &_3; // bb0[8]: scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:35

‎src/test/mir-opt/const-promotion-extern-static/rustc.FOO-promoted[0].ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ promoted[0] in FOO: &[&i32; 1] = {
99
}
1010

1111
bb0: {
12-
_3 = const {alloc2+0: &i32}; // bb0[0]: scope 0 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
12+
_3 = const {alloc2+0x0: &i32}; // bb0[0]: scope 0 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
1313
// ty::Const
1414
// + ty: &i32
15-
// + val: Value(Scalar(alloc2+0))
15+
// + val: Value(Scalar(alloc2+0x0))
1616
// mir::Constant
1717
// + span: $DIR/const-promotion-extern-static.rs:13:42: 13:43
18-
// + literal: Const { ty: &i32, val: Value(Scalar(alloc2+0)) }
18+
// + literal: Const { ty: &i32, val: Value(Scalar(alloc2+0x0)) }
1919
_2 = _3; // bb0[1]: scope 0 at $DIR/const-promotion-extern-static.rs:13:41: 13:43
2020
_1 = [move _2]; // bb0[2]: scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
2121
_0 = &_1; // bb0[3]: scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46

‎src/test/mir-opt/const-promotion-extern-static/rustc.FOO.PromoteTemps.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
- StorageLive(_3); // bb0[2]: scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
1919
- StorageLive(_4); // bb0[3]: scope 0 at $DIR/const-promotion-extern-static.rs:13:32: 13:45
2020
- StorageLive(_5); // bb0[4]: scope 1 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
21-
- _5 = const {alloc2+0: &i32}; // bb0[5]: scope 1 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
21+
- _5 = const {alloc2+0x0: &i32}; // bb0[5]: scope 1 at $DIR/const-promotion-extern-static.rs:13:42: 13:43
2222
+ _6 = const FOO::promoted[0]; // bb0[2]: scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
2323
// ty::Const
2424
- // + ty: &i32
25-
- // + val: Value(Scalar(alloc2+0))
25+
- // + val: Value(Scalar(alloc2+0x0))
2626
+ // + ty: &[&i32; 1]
2727
+ // + val: Unevaluated(DefId(0:7 ~ const_promotion_extern_static[317d]::FOO[0]), [], Some(promoted[0]))
2828
// mir::Constant
2929
- // + span: $DIR/const-promotion-extern-static.rs:13:42: 13:43
30-
- // + literal: Const { ty: &i32, val: Value(Scalar(alloc2+0)) }
30+
- // + literal: Const { ty: &i32, val: Value(Scalar(alloc2+0x0)) }
3131
- _4 = &(*_5); // bb0[6]: scope 1 at $DIR/const-promotion-extern-static.rs:13:41: 13:43
3232
- _3 = [move _4]; // bb0[7]: scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46
3333
- _2 = &_3; // bb0[8]: scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:46

‎src/test/mir-opt/const_allocation/32bit/rustc.main.ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ fn main() -> () {
88
bb0: {
99
StorageLive(_1); // bb0[0]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
1010
StorageLive(_2); // bb0[1]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
11-
_2 = const {alloc0+0: &&[(std::option::Option<i32>, &[&str])]}; // bb0[2]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
11+
_2 = const {alloc0+0x0: &&[(std::option::Option<i32>, &[&str])]}; // bb0[2]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
1212
// ty::Const
1313
// + ty: &&[(std::option::Option<i32>, &[&str])]
14-
// + val: Value(Scalar(alloc0+0))
14+
// + val: Value(Scalar(alloc0+0x0))
1515
// mir::Constant
1616
// + span: $DIR/const_allocation.rs:8:5: 8:8
17-
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&str])], val: Value(Scalar(alloc0+0)) }
17+
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&str])], val: Value(Scalar(alloc0+0x0)) }
1818
_1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
1919
StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation.rs:8:8: 8:9
2020
StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation.rs:8:8: 8:9

‎src/test/mir-opt/const_allocation/64bit/rustc.main.ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ fn main() -> () {
88
bb0: {
99
StorageLive(_1); // bb0[0]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
1010
StorageLive(_2); // bb0[1]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
11-
_2 = const {alloc0+0: &&[(std::option::Option<i32>, &[&str])]}; // bb0[2]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
11+
_2 = const {alloc0+0x0: &&[(std::option::Option<i32>, &[&str])]}; // bb0[2]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
1212
// ty::Const
1313
// + ty: &&[(std::option::Option<i32>, &[&str])]
14-
// + val: Value(Scalar(alloc0+0))
14+
// + val: Value(Scalar(alloc0+0x0))
1515
// mir::Constant
1616
// + span: $DIR/const_allocation.rs:8:5: 8:8
17-
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&str])], val: Value(Scalar(alloc0+0)) }
17+
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&str])], val: Value(Scalar(alloc0+0x0)) }
1818
_1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation.rs:8:5: 8:8
1919
StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation.rs:8:8: 8:9
2020
StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation.rs:8:8: 8:9

‎src/test/mir-opt/const_allocation2/32bit/rustc.main.ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ fn main() -> () {
88
bb0: {
99
StorageLive(_1); // bb0[0]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
1010
StorageLive(_2); // bb0[1]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
11-
_2 = const {alloc0+0: &&[(std::option::Option<i32>, &[&u8])]}; // bb0[2]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
11+
_2 = const {alloc0+0x0: &&[(std::option::Option<i32>, &[&u8])]}; // bb0[2]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
1212
// ty::Const
1313
// + ty: &&[(std::option::Option<i32>, &[&u8])]
14-
// + val: Value(Scalar(alloc0+0))
14+
// + val: Value(Scalar(alloc0+0x0))
1515
// mir::Constant
1616
// + span: $DIR/const_allocation2.rs:5:5: 5:8
17-
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&u8])], val: Value(Scalar(alloc0+0)) }
17+
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&u8])], val: Value(Scalar(alloc0+0x0)) }
1818
_1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
1919
StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation2.rs:5:8: 5:9
2020
StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation2.rs:5:8: 5:9

‎src/test/mir-opt/const_allocation2/64bit/rustc.main.ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ fn main() -> () {
88
bb0: {
99
StorageLive(_1); // bb0[0]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
1010
StorageLive(_2); // bb0[1]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
11-
_2 = const {alloc0+0: &&[(std::option::Option<i32>, &[&u8])]}; // bb0[2]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
11+
_2 = const {alloc0+0x0: &&[(std::option::Option<i32>, &[&u8])]}; // bb0[2]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
1212
// ty::Const
1313
// + ty: &&[(std::option::Option<i32>, &[&u8])]
14-
// + val: Value(Scalar(alloc0+0))
14+
// + val: Value(Scalar(alloc0+0x0))
1515
// mir::Constant
1616
// + span: $DIR/const_allocation2.rs:5:5: 5:8
17-
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&u8])], val: Value(Scalar(alloc0+0)) }
17+
// + literal: Const { ty: &&[(std::option::Option<i32>, &[&u8])], val: Value(Scalar(alloc0+0x0)) }
1818
_1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation2.rs:5:5: 5:8
1919
StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation2.rs:5:8: 5:9
2020
StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation2.rs:5:8: 5:9

‎src/test/mir-opt/const_allocation3/32bit/rustc.main.ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ fn main() -> () {
88
bb0: {
99
StorageLive(_1); // bb0[0]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
1010
StorageLive(_2); // bb0[1]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
11-
_2 = const {alloc0+0: &&Packed}; // bb0[2]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
11+
_2 = const {alloc0+0x0: &&Packed}; // bb0[2]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
1212
// ty::Const
1313
// + ty: &&Packed
14-
// + val: Value(Scalar(alloc0+0))
14+
// + val: Value(Scalar(alloc0+0x0))
1515
// mir::Constant
1616
// + span: $DIR/const_allocation3.rs:5:5: 5:8
17-
// + literal: Const { ty: &&Packed, val: Value(Scalar(alloc0+0)) }
17+
// + literal: Const { ty: &&Packed, val: Value(Scalar(alloc0+0x0)) }
1818
_1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
1919
StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation3.rs:5:8: 5:9
2020
StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation3.rs:5:8: 5:9

‎src/test/mir-opt/const_allocation3/64bit/rustc.main.ConstProp.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ fn main() -> () {
88
bb0: {
99
StorageLive(_1); // bb0[0]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
1010
StorageLive(_2); // bb0[1]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
11-
_2 = const {alloc0+0: &&Packed}; // bb0[2]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
11+
_2 = const {alloc0+0x0: &&Packed}; // bb0[2]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
1212
// ty::Const
1313
// + ty: &&Packed
14-
// + val: Value(Scalar(alloc0+0))
14+
// + val: Value(Scalar(alloc0+0x0))
1515
// mir::Constant
1616
// + span: $DIR/const_allocation3.rs:5:5: 5:8
17-
// + literal: Const { ty: &&Packed, val: Value(Scalar(alloc0+0)) }
17+
// + literal: Const { ty: &&Packed, val: Value(Scalar(alloc0+0x0)) }
1818
_1 = (*_2); // bb0[3]: scope 0 at $DIR/const_allocation3.rs:5:5: 5:8
1919
StorageDead(_2); // bb0[4]: scope 0 at $DIR/const_allocation3.rs:5:8: 5:9
2020
StorageDead(_1); // bb0[5]: scope 0 at $DIR/const_allocation3.rs:5:8: 5:9

‎src/test/mir-opt/const_prop/read_immutable_static/rustc.main.ConstProp.diff

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
StorageLive(_1); // bb0[0]: scope 0 at $DIR/read_immutable_static.rs:7:9: 7:10
1717
StorageLive(_2); // bb0[1]: scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
1818
StorageLive(_3); // bb0[2]: scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
19-
_3 = const {alloc0+0: &u8}; // bb0[3]: scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
19+
_3 = const {alloc0+0x0: &u8}; // bb0[3]: scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
2020
// ty::Const
2121
// + ty: &u8
22-
// + val: Value(Scalar(alloc0+0))
22+
// + val: Value(Scalar(alloc0+0x0))
2323
// mir::Constant
2424
// + span: $DIR/read_immutable_static.rs:7:13: 7:16
25-
// + literal: Const { ty: &u8, val: Value(Scalar(alloc0+0)) }
25+
// + literal: Const { ty: &u8, val: Value(Scalar(alloc0+0x0)) }
2626
- _2 = (*_3); // bb0[4]: scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
2727
+ _2 = const 2u8; // bb0[4]: scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
2828
+ // ty::Const
@@ -33,13 +33,13 @@
3333
+ // + literal: Const { ty: u8, val: Value(Scalar(0x02)) }
3434
StorageLive(_4); // bb0[5]: scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
3535
StorageLive(_5); // bb0[6]: scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
36-
_5 = const {alloc0+0: &u8}; // bb0[7]: scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
36+
_5 = const {alloc0+0x0: &u8}; // bb0[7]: scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
3737
// ty::Const
3838
// + ty: &u8
39-
// + val: Value(Scalar(alloc0+0))
39+
// + val: Value(Scalar(alloc0+0x0))
4040
// mir::Constant
4141
// + span: $DIR/read_immutable_static.rs:7:19: 7:22
42-
// + literal: Const { ty: &u8, val: Value(Scalar(alloc0+0)) }
42+
// + literal: Const { ty: &u8, val: Value(Scalar(alloc0+0x0)) }
4343
- _4 = (*_5); // bb0[8]: scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
4444
- _1 = Add(move _2, move _4); // bb0[9]: scope 0 at $DIR/read_immutable_static.rs:7:13: 7:22
4545
+ _4 = const 2u8; // bb0[8]: scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22

0 commit comments

Comments
 (0)