Skip to content

Commit 3010fa9

Browse files
kpreidkpreid
committed
In pretty_print_type(), print async fn futures' paths instead of spans.
This makes `-Zprint-type-sizes`'s output easier to read, because the name of an `async fn` is more immediately recognizable than its span. I also deleted the comment "FIXME(eddyb) should use `def_span`." because it appears to have already been fixed by commit 67727aa.
1 parent af98101 commit 3010fa9

10 files changed

+139
-131
lines changed

‎compiler/rustc_middle/src/ty/print/pretty.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
804804
}
805805
ty::Str => p!("str"),
806806
ty::Coroutine(did, args) => {
807-
p!(write("{{"));
807+
p!("{{");
808808
let coroutine_kind = self.tcx().coroutine_kind(did).unwrap();
809809
let should_print_movability = self.should_print_verbose()
810810
|| matches!(coroutine_kind, hir::CoroutineKind::Coroutine(_));
@@ -818,17 +818,25 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
818818

819819
if !self.should_print_verbose() {
820820
p!(write("{}", coroutine_kind));
821-
// FIXME(eddyb) should use `def_span`.
822-
if let Some(did) = did.as_local() {
823-
let span = self.tcx().def_span(did);
821+
if coroutine_kind.is_fn_like() {
822+
// If we are printing an `async fn` coroutine type, then give the path
823+
// of the fn, instead of its span, because that will in most cases be
824+
// more helpful for the reader than just a source location.
825+
//
826+
// This will look like:
827+
// {async fn body of some_fn()}
828+
let did_of_the_fn_item = self.tcx().parent(did);
829+
p!(" of ", print_def_path(did_of_the_fn_item, args), "()");
830+
} else if let Some(local_did) = did.as_local() {
831+
let span = self.tcx().def_span(local_did);
824832
p!(write(
825833
"@{}",
826834
// This may end up in stderr diagnostics but it may also be emitted
827835
// into MIR. Hence we use the remapped path if available
828836
self.tcx().sess.source_map().span_to_embeddable_string(span)
829837
));
830838
} else {
831-
p!(write("@"), print_def_path(did, args));
839+
p!("@", print_def_path(did, args));
832840
}
833841
} else {
834842
p!(print_def_path(did, args));

‎tests/mir-opt/building/async_await.a-{closure#0}.coroutine_resume.0.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
storage_conflicts: BitMatrix(0x0) {},
1010
} */
1111

12-
fn a::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:12:14: 12:16}>, _2: &mut Context<'_>) -> Poll<()> {
12+
fn a::{closure#0}(_1: Pin<&mut {async fn body of a()}>, _2: &mut Context<'_>) -> Poll<()> {
1313
debug _task_context => _4;
1414
let mut _0: std::task::Poll<()>;
1515
let mut _3: ();
1616
let mut _4: &mut std::task::Context<'_>;
1717
let mut _5: u32;
1818

1919
bb0: {
20-
_5 = discriminant((*(_1.0: &mut {async fn body@$DIR/async_await.rs:12:14: 12:16})));
20+
_5 = discriminant((*(_1.0: &mut {async fn body of a()})));
2121
switchInt(move _5) -> [0: bb1, 1: bb4, otherwise: bb5];
2222
}
2323

@@ -29,7 +29,7 @@ fn a::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:12:14: 12:16}>
2929

3030
bb2: {
3131
_0 = Poll::<()>::Ready(move _3);
32-
discriminant((*(_1.0: &mut {async fn body@$DIR/async_await.rs:12:14: 12:16}))) = 1;
32+
discriminant((*(_1.0: &mut {async fn body of a()}))) = 1;
3333
return;
3434
}
3535

‎tests/mir-opt/building/async_await.b-{closure#0}.coroutine_resume.0.mir

+31-31
Original file line numberDiff line numberDiff line change
@@ -51,34 +51,34 @@
5151
},
5252
} */
5353

54-
fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>, _2: &mut Context<'_>) -> Poll<()> {
54+
fn b::{closure#0}(_1: Pin<&mut {async fn body of b()}>, _2: &mut Context<'_>) -> Poll<()> {
5555
debug _task_context => _38;
5656
let mut _0: std::task::Poll<()>;
5757
let _3: ();
58-
let mut _4: {async fn body@$DIR/async_await.rs:12:14: 12:16};
59-
let mut _5: {async fn body@$DIR/async_await.rs:12:14: 12:16};
60-
let mut _6: {async fn body@$DIR/async_await.rs:12:14: 12:16};
58+
let mut _4: {async fn body of a()};
59+
let mut _5: {async fn body of a()};
60+
let mut _6: {async fn body of a()};
6161
let mut _7: ();
6262
let _8: ();
6363
let mut _9: std::task::Poll<()>;
64-
let mut _10: std::pin::Pin<&mut {async fn body@$DIR/async_await.rs:12:14: 12:16}>;
65-
let mut _11: &mut {async fn body@$DIR/async_await.rs:12:14: 12:16};
66-
let mut _12: &mut {async fn body@$DIR/async_await.rs:12:14: 12:16};
64+
let mut _10: std::pin::Pin<&mut {async fn body of a()}>;
65+
let mut _11: &mut {async fn body of a()};
66+
let mut _12: &mut {async fn body of a()};
6767
let mut _13: &mut std::task::Context<'_>;
6868
let mut _14: &mut std::task::Context<'_>;
6969
let mut _15: &mut std::task::Context<'_>;
7070
let mut _16: isize;
7171
let mut _18: !;
7272
let mut _19: &mut std::task::Context<'_>;
7373
let mut _20: ();
74-
let mut _21: {async fn body@$DIR/async_await.rs:12:14: 12:16};
75-
let mut _22: {async fn body@$DIR/async_await.rs:12:14: 12:16};
76-
let mut _23: {async fn body@$DIR/async_await.rs:12:14: 12:16};
74+
let mut _21: {async fn body of a()};
75+
let mut _22: {async fn body of a()};
76+
let mut _23: {async fn body of a()};
7777
let _24: ();
7878
let mut _25: std::task::Poll<()>;
79-
let mut _26: std::pin::Pin<&mut {async fn body@$DIR/async_await.rs:12:14: 12:16}>;
80-
let mut _27: &mut {async fn body@$DIR/async_await.rs:12:14: 12:16};
81-
let mut _28: &mut {async fn body@$DIR/async_await.rs:12:14: 12:16};
79+
let mut _26: std::pin::Pin<&mut {async fn body of a()}>;
80+
let mut _27: &mut {async fn body of a()};
81+
let mut _28: &mut {async fn body of a()};
8282
let mut _29: &mut std::task::Context<'_>;
8383
let mut _30: &mut std::task::Context<'_>;
8484
let mut _31: &mut std::task::Context<'_>;
@@ -90,7 +90,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
9090
let mut _38: &mut std::task::Context<'_>;
9191
let mut _39: u32;
9292
scope 1 {
93-
debug __awaitee => (((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#3).0: {async fn body@$DIR/async_await.rs:12:14: 12:16});
93+
debug __awaitee => (((*(_1.0: &mut {async fn body of b()})) as variant#3).0: {async fn body of a()});
9494
let _17: ();
9595
scope 2 {
9696
}
@@ -99,7 +99,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
9999
}
100100
}
101101
scope 4 {
102-
debug __awaitee => (((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#4).0: {async fn body@$DIR/async_await.rs:12:14: 12:16});
102+
debug __awaitee => (((*(_1.0: &mut {async fn body of b()})) as variant#4).0: {async fn body of a()});
103103
let _33: ();
104104
scope 5 {
105105
}
@@ -109,7 +109,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
109109
}
110110

111111
bb0: {
112-
_39 = discriminant((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})));
112+
_39 = discriminant((*(_1.0: &mut {async fn body of b()})));
113113
switchInt(move _39) -> [0: bb1, 1: bb29, 3: bb27, 4: bb28, otherwise: bb8];
114114
}
115115

@@ -122,14 +122,14 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
122122
}
123123

124124
bb2: {
125-
_4 = <{async fn body@$DIR/async_await.rs:12:14: 12:16} as IntoFuture>::into_future(move _5) -> [return: bb3, unwind unreachable];
125+
_4 = <{async fn body of a()} as IntoFuture>::into_future(move _5) -> [return: bb3, unwind unreachable];
126126
}
127127

128128
bb3: {
129129
StorageDead(_5);
130130
PlaceMention(_4);
131131
nop;
132-
(((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#3).0: {async fn body@$DIR/async_await.rs:12:14: 12:16}) = move _4;
132+
(((*(_1.0: &mut {async fn body of b()})) as variant#3).0: {async fn body of a()}) = move _4;
133133
goto -> bb4;
134134
}
135135

@@ -139,9 +139,9 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
139139
StorageLive(_10);
140140
StorageLive(_11);
141141
StorageLive(_12);
142-
_12 = &mut (((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#3).0: {async fn body@$DIR/async_await.rs:12:14: 12:16});
142+
_12 = &mut (((*(_1.0: &mut {async fn body of b()})) as variant#3).0: {async fn body of a()});
143143
_11 = &mut (*_12);
144-
_10 = Pin::<&mut {async fn body@$DIR/async_await.rs:12:14: 12:16}>::new_unchecked(move _11) -> [return: bb5, unwind unreachable];
144+
_10 = Pin::<&mut {async fn body of a()}>::new_unchecked(move _11) -> [return: bb5, unwind unreachable];
145145
}
146146

147147
bb5: {
@@ -157,7 +157,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
157157
bb6: {
158158
_13 = &mut (*_14);
159159
StorageDead(_15);
160-
_9 = <{async fn body@$DIR/async_await.rs:12:14: 12:16} as Future>::poll(move _10, move _13) -> [return: bb7, unwind unreachable];
160+
_9 = <{async fn body of a()} as Future>::poll(move _10, move _13) -> [return: bb7, unwind unreachable];
161161
}
162162

163163
bb7: {
@@ -186,7 +186,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
186186
StorageDead(_4);
187187
StorageDead(_19);
188188
StorageDead(_20);
189-
discriminant((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2}))) = 3;
189+
discriminant((*(_1.0: &mut {async fn body of b()}))) = 3;
190190
return;
191191
}
192192

@@ -199,7 +199,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
199199
StorageDead(_12);
200200
StorageDead(_9);
201201
StorageDead(_8);
202-
drop((((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#3).0: {async fn body@$DIR/async_await.rs:12:14: 12:16})) -> [return: bb12, unwind unreachable];
202+
drop((((*(_1.0: &mut {async fn body of b()})) as variant#3).0: {async fn body of a()})) -> [return: bb12, unwind unreachable];
203203
}
204204

205205
bb11: {
@@ -224,14 +224,14 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
224224
}
225225

226226
bb14: {
227-
_21 = <{async fn body@$DIR/async_await.rs:12:14: 12:16} as IntoFuture>::into_future(move _22) -> [return: bb15, unwind unreachable];
227+
_21 = <{async fn body of a()} as IntoFuture>::into_future(move _22) -> [return: bb15, unwind unreachable];
228228
}
229229

230230
bb15: {
231231
StorageDead(_22);
232232
PlaceMention(_21);
233233
nop;
234-
(((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#4).0: {async fn body@$DIR/async_await.rs:12:14: 12:16}) = move _21;
234+
(((*(_1.0: &mut {async fn body of b()})) as variant#4).0: {async fn body of a()}) = move _21;
235235
goto -> bb16;
236236
}
237237

@@ -241,9 +241,9 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
241241
StorageLive(_26);
242242
StorageLive(_27);
243243
StorageLive(_28);
244-
_28 = &mut (((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#4).0: {async fn body@$DIR/async_await.rs:12:14: 12:16});
244+
_28 = &mut (((*(_1.0: &mut {async fn body of b()})) as variant#4).0: {async fn body of a()});
245245
_27 = &mut (*_28);
246-
_26 = Pin::<&mut {async fn body@$DIR/async_await.rs:12:14: 12:16}>::new_unchecked(move _27) -> [return: bb17, unwind unreachable];
246+
_26 = Pin::<&mut {async fn body of a()}>::new_unchecked(move _27) -> [return: bb17, unwind unreachable];
247247
}
248248

249249
bb17: {
@@ -259,7 +259,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
259259
bb18: {
260260
_29 = &mut (*_30);
261261
StorageDead(_31);
262-
_25 = <{async fn body@$DIR/async_await.rs:12:14: 12:16} as Future>::poll(move _26, move _29) -> [return: bb19, unwind unreachable];
262+
_25 = <{async fn body of a()} as Future>::poll(move _26, move _29) -> [return: bb19, unwind unreachable];
263263
}
264264

265265
bb19: {
@@ -283,7 +283,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
283283
StorageDead(_21);
284284
StorageDead(_35);
285285
StorageDead(_36);
286-
discriminant((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2}))) = 4;
286+
discriminant((*(_1.0: &mut {async fn body of b()}))) = 4;
287287
return;
288288
}
289289

@@ -296,7 +296,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
296296
StorageDead(_28);
297297
StorageDead(_25);
298298
StorageDead(_24);
299-
drop((((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2})) as variant#4).0: {async fn body@$DIR/async_await.rs:12:14: 12:16})) -> [return: bb23, unwind unreachable];
299+
drop((((*(_1.0: &mut {async fn body of b()})) as variant#4).0: {async fn body of a()})) -> [return: bb23, unwind unreachable];
300300
}
301301

302302
bb22: {
@@ -319,7 +319,7 @@ fn b::{closure#0}(_1: Pin<&mut {async fn body@$DIR/async_await.rs:15:18: 18:2}>,
319319

320320
bb25: {
321321
_0 = Poll::<()>::Ready(move _37);
322-
discriminant((*(_1.0: &mut {async fn body@$DIR/async_await.rs:15:18: 18:2}))) = 1;
322+
discriminant((*(_1.0: &mut {async fn body of b()}))) = 1;
323323
return;
324324
}
325325

0 commit comments

Comments
 (0)