Skip to content

Commit c29f857

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of #96581 - RalfJung:debug-size-align, r=oli-obk
make Size and Align debug-printing a bit more compact In particular in `{:#?}`-mode, these take up a lot of space, so I think this is the better alternative (even though it is a bit longer in `{:?}` mode, I think it is still more readable). We could make it even smaller by deviating further from what the actual code looks like, e.g. via something like `Size(4 bytes)`. Not sure what people would think about that? Cc `````@oli-obk`````
2 parents 6139205 + d455752 commit c29f857

26 files changed

+244
-555
lines changed

‎compiler/rustc_middle/src/mir/pretty.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,12 @@ impl<'tcx> Visitor<'tcx> for ExtraComments<'tcx> {
448448
self.push(&format!("+ user_ty: {:?}", user_ty));
449449
}
450450

451+
let fmt_val = |val: &ConstValue<'tcx>| match val {
452+
ConstValue::Scalar(s) => format!("Scalar({:?})", s),
453+
ConstValue::Slice { .. } => format!("Slice(..)"),
454+
ConstValue::ByRef { .. } => format!("ByRef(..)"),
455+
};
456+
451457
let val = match literal {
452458
ConstantKind::Ty(ct) => match ct.val() {
453459
ty::ConstKind::Param(p) => format!("Param({})", p),
@@ -457,7 +463,7 @@ impl<'tcx> Visitor<'tcx> for ExtraComments<'tcx> {
457463
uv.substs,
458464
uv.promoted,
459465
),
460-
ty::ConstKind::Value(val) => format!("Value({:?})", val),
466+
ty::ConstKind::Value(val) => format!("Value({})", fmt_val(&val)),
461467
ty::ConstKind::Error(_) => "Error".to_string(),
462468
// These variants shouldn't exist in the MIR.
463469
ty::ConstKind::Placeholder(_)
@@ -467,7 +473,7 @@ impl<'tcx> Visitor<'tcx> for ExtraComments<'tcx> {
467473
// To keep the diffs small, we render this like we render `ty::Const::Value`.
468474
//
469475
// This changes once `ty::Const::Value` is represented using valtrees.
470-
ConstantKind::Val(val, _) => format!("Value({:?})", val),
476+
ConstantKind::Val(val, _) => format!("Value({})", fmt_val(&val)),
471477
};
472478

473479
self.push(&format!("+ literal: Const {{ ty: {}, val: {} }}", literal.ty(), val));

‎compiler/rustc_target/src/abi/mod.rs

+16-2
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,19 @@ impl ToJson for Endian {
276276
}
277277

278278
/// Size of a type in bytes.
279-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Encodable, Decodable)]
279+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Encodable, Decodable)]
280280
#[derive(HashStable_Generic)]
281281
pub struct Size {
282282
raw: u64,
283283
}
284284

285+
// This is debug-printed a lot in larger structs, don't waste too much space there
286+
impl fmt::Debug for Size {
287+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
288+
write!(f, "Size({} bytes)", self.bytes())
289+
}
290+
}
291+
285292
impl Size {
286293
pub const ZERO: Size = Size { raw: 0 };
287294

@@ -485,12 +492,19 @@ impl Step for Size {
485492
}
486493

487494
/// Alignment of a type in bytes (always a power of two).
488-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Encodable, Decodable)]
495+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Encodable, Decodable)]
489496
#[derive(HashStable_Generic)]
490497
pub struct Align {
491498
pow2: u8,
492499
}
493500

501+
// This is debug-printed a lot in larger structs, don't waste too much space there
502+
impl fmt::Debug for Align {
503+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
504+
write!(f, "Align({} bytes)", self.bytes())
505+
}
506+
}
507+
494508
impl Align {
495509
pub const ONE: Align = Align { pow2: 0 };
496510

‎src/test/mir-opt/const_debuginfo.main.ConstDebugInfo.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
_9 = const "hello, world!"; // scope 4 at $DIR/const_debuginfo.rs:14:13: 14:28
7878
// mir::Constant
7979
// + span: $DIR/const_debuginfo.rs:14:13: 14:28
80-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 101, 108, 108, 111, 44, 32, 119, 111, 114, 108, 100, 33], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [8191], len: Size { raw: 13 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 13 }) }
80+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
8181
StorageLive(_10); // scope 5 at $DIR/const_debuginfo.rs:16:9: 16:10
8282
Deinit(_10); // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34
8383
(_10.0: bool) = const true; // scope 5 at $DIR/const_debuginfo.rs:16:13: 16:34

‎src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
2323
// mir::Constant
2424
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
25-
// + 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: [] }), init_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
25+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
2626
}
2727

2828
bb2: {

‎src/test/mir-opt/inline/inline_diverging.g.Inline.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
+ // + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
4444
+ // mir::Constant
4545
+ // + span: $SRC_DIR/std/src/panic.rs:LL:COL
46-
+ // + 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: [] }), init_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
46+
+ // + literal: Const { ty: &str, val: Value(Slice(..)) }
4747
}
4848
}
4949

‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
- bb2: {
4747
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4848
+ // + user_ty: UserType(0)
49-
+ // + 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: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
49+
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef(..)) }
5050
+ Deinit((*_7)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5151
+ ((*_7).0: alloc::raw_vec::RawVec<u32>) = move _8; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5252
+ ((*_7).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL

‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.64bit.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
- bb2: {
4747
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4848
+ // + user_ty: UserType(0)
49-
+ // + 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: [] }), init_mask: InitMask { blocks: [65535], len: Size { raw: 16 } }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
49+
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef(..)) }
5050
+ Deinit((*_7)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5151
+ ((*_7).0: alloc::raw_vec::RawVec<u32>) = move _8; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5252
+ ((*_7).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL

‎src/test/mir-opt/issue_76432.test.SimplifyComparisonIntegral.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
// + literal: Const { ty: fn(&'static str) -> ! {core::panicking::panic}, val: Value(Scalar(<ZST>)) }
7474
// mir::Constant
7575
// + span: $SRC_DIR/core/src/panic.rs:LL:COL
76-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [105, 110, 116, 101, 114, 110, 97, 108, 32, 101, 114, 114, 111, 114, 58, 32, 101, 110, 116, 101, 114, 101, 100, 32, 117, 110, 114, 101, 97, 99, 104, 97, 98, 108, 101, 32, 99, 111, 100, 101], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1099511627775], len: Size { raw: 40 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 40 }) }
76+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
7777
}
7878

7979
bb2: {

‎src/test/mir-opt/issues/issue_59352.num_to_digit.PreCodegen.after.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fn num_to_digit(_1: char) -> u32 {
9292
// + literal: Const { ty: fn(&'static str) -> ! {core::panicking::panic}, val: Value(Scalar(<ZST>)) }
9393
// mir::Constant
9494
// + span: $SRC_DIR/core/src/option.rs:LL:COL
95-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [99, 97, 108, 108, 101, 100, 32, 96, 79, 112, 116, 105, 111, 110, 58, 58, 117, 110, 119, 114, 97, 112, 40, 41, 96, 32, 111, 110, 32, 97, 32, 96, 78, 111, 110, 101, 96, 32, 118, 97, 108, 117, 101], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [8796093022207], len: Size { raw: 43 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 43 }) }
95+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
9696
}
9797

9898
bb7: {

‎src/test/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn unwrap(_1: Option<T>) -> T {
2626
// + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
2727
// mir::Constant
2828
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
29-
// + 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: [] }), init_mask: InitMask { blocks: [16383], len: Size { raw: 14 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 14 }) }
29+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
3030
}
3131

3232
bb2: {

‎src/test/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn main() -> () {
1515
_4 = const ""; // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
1616
// mir::Constant
1717
// + span: $DIR/no-spurious-drop-after-call.rs:9:20: 9:22
18-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [], len: Size { raw: 0 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 0 }) }
18+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
1919
_3 = &(*_4); // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
2020
_2 = <str as ToString>::to_string(move _3) -> bb1; // scope 0 at $DIR/no-spurious-drop-after-call.rs:9:20: 9:34
2121
// mir::Constant

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static XXX: &Foo = {
192192
_2 = Foo { tup: const "hi", data: move _3 }; // scope 0 at $DIR/storage_live_dead_in_statics.rs:5:29: 23:2
193193
// mir::Constant
194194
// + span: $DIR/storage_live_dead_in_statics.rs:6:10: 6:14
195-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [104, 105], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [3], len: Size { raw: 2 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 2 }) }
195+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
196196
StorageDead(_3); // scope 0 at $DIR/storage_live_dead_in_statics.rs:23:1: 23:2
197197
_1 = &_2; // scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2
198198
_0 = &(*_1); // scope 0 at $DIR/storage_live_dead_in_statics.rs:5:28: 23:2

‎src/test/mir-opt/uninhabited_enum_branching.main.SimplifyCfg-after-uninhabited-enum-branching.after.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn main() -> () {
2222
_5 = const "C"; // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
2323
// mir::Constant
2424
// + span: $DIR/uninhabited_enum_branching.rs:23:21: 23:24
25-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
25+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
2626
_1 = &(*_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
2727
StorageDead(_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:23: 23:24
2828
StorageDead(_2); // scope 0 at $DIR/uninhabited_enum_branching.rs:24:6: 24:7
@@ -40,7 +40,7 @@ fn main() -> () {
4040
_9 = const "E"; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
4141
// mir::Constant
4242
// + span: $DIR/uninhabited_enum_branching.rs:28:21: 28:24
43-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
43+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
4444
_6 = &(*_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
4545
StorageDead(_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
4646
goto -> bb3; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
@@ -50,7 +50,7 @@ fn main() -> () {
5050
_6 = const "D"; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
5151
// mir::Constant
5252
// + span: $DIR/uninhabited_enum_branching.rs:27:21: 27:24
53-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
53+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
5454
goto -> bb3; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
5555
}
5656

‎src/test/mir-opt/uninhabited_enum_branching.main.UninhabitedEnumBranching.diff

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
_5 = const "C"; // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
2929
// mir::Constant
3030
// + span: $DIR/uninhabited_enum_branching.rs:23:21: 23:24
31-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [67], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
31+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
3232
_1 = &(*_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:21: 23:24
3333
StorageDead(_5); // scope 0 at $DIR/uninhabited_enum_branching.rs:23:23: 23:24
3434
goto -> bb4; // scope 0 at $DIR/uninhabited_enum_branching.rs:23:23: 23:24
@@ -38,7 +38,7 @@
3838
_1 = const "A(Empty)"; // scope 0 at $DIR/uninhabited_enum_branching.rs:21:24: 21:34
3939
// mir::Constant
4040
// + span: $DIR/uninhabited_enum_branching.rs:21:24: 21:34
41-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [65, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
41+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
4242
goto -> bb4; // scope 0 at $DIR/uninhabited_enum_branching.rs:21:24: 21:34
4343
}
4444

@@ -47,7 +47,7 @@
4747
_4 = const "B(Empty)"; // scope 0 at $DIR/uninhabited_enum_branching.rs:22:24: 22:34
4848
// mir::Constant
4949
// + span: $DIR/uninhabited_enum_branching.rs:22:24: 22:34
50-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [66, 40, 69, 109, 112, 116, 121, 41], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 8 }) }
50+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
5151
_1 = &(*_4); // scope 0 at $DIR/uninhabited_enum_branching.rs:22:24: 22:34
5252
StorageDead(_4); // scope 0 at $DIR/uninhabited_enum_branching.rs:22:33: 22:34
5353
goto -> bb4; // scope 0 at $DIR/uninhabited_enum_branching.rs:22:33: 22:34
@@ -69,7 +69,7 @@
6969
_9 = const "E"; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
7070
// mir::Constant
7171
// + span: $DIR/uninhabited_enum_branching.rs:28:21: 28:24
72-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [69], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
72+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
7373
_6 = &(*_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:21: 28:24
7474
StorageDead(_9); // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
7575
goto -> bb7; // scope 0 at $DIR/uninhabited_enum_branching.rs:28:23: 28:24
@@ -79,7 +79,7 @@
7979
_6 = const "D"; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
8080
// mir::Constant
8181
// + span: $DIR/uninhabited_enum_branching.rs:27:21: 27:24
82-
// + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [68], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [1], len: Size { raw: 1 } }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 1 }) }
82+
// + literal: Const { ty: &str, val: Value(Slice(..)) }
8383
goto -> bb7; // scope 0 at $DIR/uninhabited_enum_branching.rs:27:21: 27:24
8484
}
8585

0 commit comments

Comments
 (0)