Skip to content

Commit 0334ca2

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#130017
Rollup merge of rust-lang#130017 - Zalathar:executor, r=Mark-Simulacrum coverage: Extract `executor::block_on` from several async coverage tests By moving `block_on` to an auxiliary crate, we avoid having to keep a separate copy of it in every async test.
2 parents e7386b3 + e96b4e4 commit 0334ca2

16 files changed

+142
-277
lines changed

‎tests/coverage/async.cov-map

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,103 @@
11
Function name: async::c
2-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 09, 01, 00, 19]
2+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 0c, 01, 00, 19]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 0
66
Number of file 0 mappings: 1
7-
- Code(Counter(0)) at (prev + 9, 1) to (start + 0, 25)
7+
- Code(Counter(0)) at (prev + 12, 1) to (start + 0, 25)
88

99
Function name: async::c::{closure#0}
10-
Raw bytes (26): 0x[01, 01, 01, 01, 05, 04, 01, 09, 19, 01, 0e, 05, 02, 09, 00, 0a, 02, 02, 09, 00, 0a, 01, 02, 01, 00, 02]
10+
Raw bytes (26): 0x[01, 01, 01, 01, 05, 04, 01, 0c, 19, 01, 0e, 05, 02, 09, 00, 0a, 02, 02, 09, 00, 0a, 01, 02, 01, 00, 02]
1111
Number of files: 1
1212
- file 0 => global file 1
1313
Number of expressions: 1
1414
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
1515
Number of file 0 mappings: 4
16-
- Code(Counter(0)) at (prev + 9, 25) to (start + 1, 14)
16+
- Code(Counter(0)) at (prev + 12, 25) to (start + 1, 14)
1717
- Code(Counter(1)) at (prev + 2, 9) to (start + 0, 10)
1818
- Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 10)
1919
= (c0 - c1)
2020
- Code(Counter(0)) at (prev + 2, 1) to (start + 0, 2)
2121

2222
Function name: async::d
23-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 11, 01, 00, 14]
23+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 14, 01, 00, 14]
2424
Number of files: 1
2525
- file 0 => global file 1
2626
Number of expressions: 0
2727
Number of file 0 mappings: 1
28-
- Code(Counter(0)) at (prev + 17, 1) to (start + 0, 20)
28+
- Code(Counter(0)) at (prev + 20, 1) to (start + 0, 20)
2929

3030
Function name: async::d::{closure#0}
31-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 11, 14, 00, 19]
31+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 14, 14, 00, 19]
3232
Number of files: 1
3333
- file 0 => global file 1
3434
Number of expressions: 0
3535
Number of file 0 mappings: 1
36-
- Code(Counter(0)) at (prev + 17, 20) to (start + 0, 25)
36+
- Code(Counter(0)) at (prev + 20, 20) to (start + 0, 25)
3737

3838
Function name: async::e (unused)
39-
Raw bytes (9): 0x[01, 01, 00, 01, 00, 13, 01, 00, 14]
39+
Raw bytes (9): 0x[01, 01, 00, 01, 00, 16, 01, 00, 14]
4040
Number of files: 1
4141
- file 0 => global file 1
4242
Number of expressions: 0
4343
Number of file 0 mappings: 1
44-
- Code(Zero) at (prev + 19, 1) to (start + 0, 20)
44+
- Code(Zero) at (prev + 22, 1) to (start + 0, 20)
4545

4646
Function name: async::e::{closure#0} (unused)
47-
Raw bytes (9): 0x[01, 01, 00, 01, 00, 13, 14, 00, 19]
47+
Raw bytes (9): 0x[01, 01, 00, 01, 00, 16, 14, 00, 19]
4848
Number of files: 1
4949
- file 0 => global file 1
5050
Number of expressions: 0
5151
Number of file 0 mappings: 1
52-
- Code(Zero) at (prev + 19, 20) to (start + 0, 25)
52+
- Code(Zero) at (prev + 22, 20) to (start + 0, 25)
5353

5454
Function name: async::f
55-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 15, 01, 00, 14]
55+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 18, 01, 00, 14]
5656
Number of files: 1
5757
- file 0 => global file 1
5858
Number of expressions: 0
5959
Number of file 0 mappings: 1
60-
- Code(Counter(0)) at (prev + 21, 1) to (start + 0, 20)
60+
- Code(Counter(0)) at (prev + 24, 1) to (start + 0, 20)
6161

6262
Function name: async::f::{closure#0}
63-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 15, 14, 00, 19]
63+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 18, 14, 00, 19]
6464
Number of files: 1
6565
- file 0 => global file 1
6666
Number of expressions: 0
6767
Number of file 0 mappings: 1
68-
- Code(Counter(0)) at (prev + 21, 20) to (start + 0, 25)
68+
- Code(Counter(0)) at (prev + 24, 20) to (start + 0, 25)
6969

7070
Function name: async::foo (unused)
71-
Raw bytes (9): 0x[01, 01, 00, 01, 00, 17, 01, 00, 1e]
71+
Raw bytes (9): 0x[01, 01, 00, 01, 00, 1a, 01, 00, 1e]
7272
Number of files: 1
7373
- file 0 => global file 1
7474
Number of expressions: 0
7575
Number of file 0 mappings: 1
76-
- Code(Zero) at (prev + 23, 1) to (start + 0, 30)
76+
- Code(Zero) at (prev + 26, 1) to (start + 0, 30)
7777

7878
Function name: async::foo::{closure#0} (unused)
79-
Raw bytes (9): 0x[01, 01, 00, 01, 00, 17, 1e, 00, 2d]
79+
Raw bytes (9): 0x[01, 01, 00, 01, 00, 1a, 1e, 00, 2d]
8080
Number of files: 1
8181
- file 0 => global file 1
8282
Number of expressions: 0
8383
Number of file 0 mappings: 1
84-
- Code(Zero) at (prev + 23, 30) to (start + 0, 45)
84+
- Code(Zero) at (prev + 26, 30) to (start + 0, 45)
8585

8686
Function name: async::g
87-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 19, 01, 00, 17]
87+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 1c, 01, 00, 17]
8888
Number of files: 1
8989
- file 0 => global file 1
9090
Number of expressions: 0
9191
Number of file 0 mappings: 1
92-
- Code(Counter(0)) at (prev + 25, 1) to (start + 0, 23)
92+
- Code(Counter(0)) at (prev + 28, 1) to (start + 0, 23)
9393

9494
Function name: async::g::{closure#0} (unused)
95-
Raw bytes (59): 0x[01, 01, 00, 0b, 00, 19, 17, 01, 0c, 00, 02, 09, 00, 0a, 00, 00, 0e, 00, 17, 00, 00, 1b, 00, 1c, 00, 00, 20, 00, 22, 00, 01, 09, 00, 0a, 00, 00, 0e, 00, 17, 00, 00, 1b, 00, 1c, 00, 00, 20, 00, 22, 00, 01, 0e, 00, 10, 00, 02, 01, 00, 02]
95+
Raw bytes (59): 0x[01, 01, 00, 0b, 00, 1c, 17, 01, 0c, 00, 02, 09, 00, 0a, 00, 00, 0e, 00, 17, 00, 00, 1b, 00, 1c, 00, 00, 20, 00, 22, 00, 01, 09, 00, 0a, 00, 00, 0e, 00, 17, 00, 00, 1b, 00, 1c, 00, 00, 20, 00, 22, 00, 01, 0e, 00, 10, 00, 02, 01, 00, 02]
9696
Number of files: 1
9797
- file 0 => global file 1
9898
Number of expressions: 0
9999
Number of file 0 mappings: 11
100-
- Code(Zero) at (prev + 25, 23) to (start + 1, 12)
100+
- Code(Zero) at (prev + 28, 23) to (start + 1, 12)
101101
- Code(Zero) at (prev + 2, 9) to (start + 0, 10)
102102
- Code(Zero) at (prev + 0, 14) to (start + 0, 23)
103103
- Code(Zero) at (prev + 0, 27) to (start + 0, 28)
@@ -110,20 +110,20 @@ Number of file 0 mappings: 11
110110
- Code(Zero) at (prev + 2, 1) to (start + 0, 2)
111111

112112
Function name: async::h
113-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 21, 01, 00, 16]
113+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 24, 01, 00, 16]
114114
Number of files: 1
115115
- file 0 => global file 1
116116
Number of expressions: 0
117117
Number of file 0 mappings: 1
118-
- Code(Counter(0)) at (prev + 33, 1) to (start + 0, 22)
118+
- Code(Counter(0)) at (prev + 36, 1) to (start + 0, 22)
119119

120120
Function name: async::h::{closure#0} (unused)
121-
Raw bytes (39): 0x[01, 01, 00, 07, 00, 21, 16, 03, 0c, 00, 04, 09, 00, 0a, 00, 00, 0e, 00, 19, 00, 00, 1a, 00, 1b, 00, 00, 20, 00, 22, 00, 01, 0e, 00, 10, 00, 02, 01, 00, 02]
121+
Raw bytes (39): 0x[01, 01, 00, 07, 00, 24, 16, 03, 0c, 00, 04, 09, 00, 0a, 00, 00, 0e, 00, 19, 00, 00, 1a, 00, 1b, 00, 00, 20, 00, 22, 00, 01, 0e, 00, 10, 00, 02, 01, 00, 02]
122122
Number of files: 1
123123
- file 0 => global file 1
124124
Number of expressions: 0
125125
Number of file 0 mappings: 7
126-
- Code(Zero) at (prev + 33, 22) to (start + 3, 12)
126+
- Code(Zero) at (prev + 36, 22) to (start + 3, 12)
127127
- Code(Zero) at (prev + 4, 9) to (start + 0, 10)
128128
- Code(Zero) at (prev + 0, 14) to (start + 0, 25)
129129
- Code(Zero) at (prev + 0, 26) to (start + 0, 27)
@@ -132,22 +132,22 @@ Number of file 0 mappings: 7
132132
- Code(Zero) at (prev + 2, 1) to (start + 0, 2)
133133

134134
Function name: async::i
135-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 2a, 01, 00, 13]
135+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 2d, 01, 00, 13]
136136
Number of files: 1
137137
- file 0 => global file 1
138138
Number of expressions: 0
139139
Number of file 0 mappings: 1
140-
- Code(Counter(0)) at (prev + 42, 1) to (start + 0, 19)
140+
- Code(Counter(0)) at (prev + 45, 1) to (start + 0, 19)
141141

142142
Function name: async::i::{closure#0}
143-
Raw bytes (63): 0x[01, 01, 02, 07, 19, 11, 15, 0b, 01, 2a, 13, 04, 0c, 09, 05, 09, 00, 0a, 01, 00, 0e, 00, 18, 05, 00, 1c, 00, 21, 09, 00, 27, 00, 30, 15, 01, 09, 00, 0a, 0d, 00, 0e, 00, 17, 1d, 00, 1b, 00, 20, 15, 00, 24, 00, 26, 19, 01, 0e, 00, 10, 03, 02, 01, 00, 02]
143+
Raw bytes (63): 0x[01, 01, 02, 07, 19, 11, 15, 0b, 01, 2d, 13, 04, 0c, 09, 05, 09, 00, 0a, 01, 00, 0e, 00, 18, 05, 00, 1c, 00, 21, 09, 00, 27, 00, 30, 15, 01, 09, 00, 0a, 0d, 00, 0e, 00, 17, 1d, 00, 1b, 00, 20, 15, 00, 24, 00, 26, 19, 01, 0e, 00, 10, 03, 02, 01, 00, 02]
144144
Number of files: 1
145145
- file 0 => global file 1
146146
Number of expressions: 2
147147
- expression 0 operands: lhs = Expression(1, Add), rhs = Counter(6)
148148
- expression 1 operands: lhs = Counter(4), rhs = Counter(5)
149149
Number of file 0 mappings: 11
150-
- Code(Counter(0)) at (prev + 42, 19) to (start + 4, 12)
150+
- Code(Counter(0)) at (prev + 45, 19) to (start + 4, 12)
151151
- Code(Counter(2)) at (prev + 5, 9) to (start + 0, 10)
152152
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 24)
153153
- Code(Counter(1)) at (prev + 0, 28) to (start + 0, 33)
@@ -161,14 +161,14 @@ Number of file 0 mappings: 11
161161
= ((c4 + c5) + c6)
162162

163163
Function name: async::j
164-
Raw bytes (58): 0x[01, 01, 02, 07, 0d, 05, 09, 0a, 01, 35, 01, 00, 0d, 01, 0b, 0b, 00, 0c, 05, 01, 09, 00, 0a, 01, 00, 0e, 00, 1b, 05, 00, 1f, 00, 27, 09, 01, 09, 00, 0a, 11, 00, 0e, 00, 1a, 09, 00, 1e, 00, 20, 0d, 01, 0e, 00, 10, 03, 02, 01, 00, 02]
164+
Raw bytes (58): 0x[01, 01, 02, 07, 0d, 05, 09, 0a, 01, 38, 01, 00, 0d, 01, 0b, 0b, 00, 0c, 05, 01, 09, 00, 0a, 01, 00, 0e, 00, 1b, 05, 00, 1f, 00, 27, 09, 01, 09, 00, 0a, 11, 00, 0e, 00, 1a, 09, 00, 1e, 00, 20, 0d, 01, 0e, 00, 10, 03, 02, 01, 00, 02]
165165
Number of files: 1
166166
- file 0 => global file 1
167167
Number of expressions: 2
168168
- expression 0 operands: lhs = Expression(1, Add), rhs = Counter(3)
169169
- expression 1 operands: lhs = Counter(1), rhs = Counter(2)
170170
Number of file 0 mappings: 10
171-
- Code(Counter(0)) at (prev + 53, 1) to (start + 0, 13)
171+
- Code(Counter(0)) at (prev + 56, 1) to (start + 0, 13)
172172
- Code(Counter(0)) at (prev + 11, 11) to (start + 0, 12)
173173
- Code(Counter(1)) at (prev + 1, 9) to (start + 0, 10)
174174
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 27)
@@ -181,48 +181,48 @@ Number of file 0 mappings: 10
181181
= ((c1 + c2) + c3)
182182

183183
Function name: async::j::c
184-
Raw bytes (26): 0x[01, 01, 01, 01, 05, 04, 01, 37, 05, 01, 12, 05, 02, 0d, 00, 0e, 02, 02, 0d, 00, 0e, 01, 02, 05, 00, 06]
184+
Raw bytes (26): 0x[01, 01, 01, 01, 05, 04, 01, 3a, 05, 01, 12, 05, 02, 0d, 00, 0e, 02, 02, 0d, 00, 0e, 01, 02, 05, 00, 06]
185185
Number of files: 1
186186
- file 0 => global file 1
187187
Number of expressions: 1
188188
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
189189
Number of file 0 mappings: 4
190-
- Code(Counter(0)) at (prev + 55, 5) to (start + 1, 18)
190+
- Code(Counter(0)) at (prev + 58, 5) to (start + 1, 18)
191191
- Code(Counter(1)) at (prev + 2, 13) to (start + 0, 14)
192192
- Code(Expression(0, Sub)) at (prev + 2, 13) to (start + 0, 14)
193193
= (c0 - c1)
194194
- Code(Counter(0)) at (prev + 2, 5) to (start + 0, 6)
195195

196196
Function name: async::j::d
197-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 3e, 05, 00, 17]
197+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 41, 05, 00, 17]
198198
Number of files: 1
199199
- file 0 => global file 1
200200
Number of expressions: 0
201201
Number of file 0 mappings: 1
202-
- Code(Counter(0)) at (prev + 62, 5) to (start + 0, 23)
202+
- Code(Counter(0)) at (prev + 65, 5) to (start + 0, 23)
203203

204204
Function name: async::j::f
205-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 3f, 05, 00, 17]
205+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 42, 05, 00, 17]
206206
Number of files: 1
207207
- file 0 => global file 1
208208
Number of expressions: 0
209209
Number of file 0 mappings: 1
210-
- Code(Counter(0)) at (prev + 63, 5) to (start + 0, 23)
210+
- Code(Counter(0)) at (prev + 66, 5) to (start + 0, 23)
211211

212212
Function name: async::k (unused)
213-
Raw bytes (29): 0x[01, 01, 00, 05, 00, 47, 01, 01, 0c, 00, 02, 0e, 00, 10, 00, 01, 0e, 00, 10, 00, 01, 0e, 00, 10, 00, 02, 01, 00, 02]
213+
Raw bytes (29): 0x[01, 01, 00, 05, 00, 4a, 01, 01, 0c, 00, 02, 0e, 00, 10, 00, 01, 0e, 00, 10, 00, 01, 0e, 00, 10, 00, 02, 01, 00, 02]
214214
Number of files: 1
215215
- file 0 => global file 1
216216
Number of expressions: 0
217217
Number of file 0 mappings: 5
218-
- Code(Zero) at (prev + 71, 1) to (start + 1, 12)
218+
- Code(Zero) at (prev + 74, 1) to (start + 1, 12)
219219
- Code(Zero) at (prev + 2, 14) to (start + 0, 16)
220220
- Code(Zero) at (prev + 1, 14) to (start + 0, 16)
221221
- Code(Zero) at (prev + 1, 14) to (start + 0, 16)
222222
- Code(Zero) at (prev + 2, 1) to (start + 0, 2)
223223

224224
Function name: async::l
225-
Raw bytes (37): 0x[01, 01, 04, 01, 07, 05, 09, 0f, 02, 09, 05, 05, 01, 4f, 01, 01, 0c, 02, 02, 0e, 00, 10, 05, 01, 0e, 00, 10, 09, 01, 0e, 00, 10, 0b, 02, 01, 00, 02]
225+
Raw bytes (37): 0x[01, 01, 04, 01, 07, 05, 09, 0f, 02, 09, 05, 05, 01, 52, 01, 01, 0c, 02, 02, 0e, 00, 10, 05, 01, 0e, 00, 10, 09, 01, 0e, 00, 10, 0b, 02, 01, 00, 02]
226226
Number of files: 1
227227
- file 0 => global file 1
228228
Number of expressions: 4
@@ -231,7 +231,7 @@ Number of expressions: 4
231231
- expression 2 operands: lhs = Expression(3, Add), rhs = Expression(0, Sub)
232232
- expression 3 operands: lhs = Counter(2), rhs = Counter(1)
233233
Number of file 0 mappings: 5
234-
- Code(Counter(0)) at (prev + 79, 1) to (start + 1, 12)
234+
- Code(Counter(0)) at (prev + 82, 1) to (start + 1, 12)
235235
- Code(Expression(0, Sub)) at (prev + 2, 14) to (start + 0, 16)
236236
= (c0 - (c1 + c2))
237237
- Code(Counter(1)) at (prev + 1, 14) to (start + 0, 16)
@@ -240,26 +240,26 @@ Number of file 0 mappings: 5
240240
= ((c2 + c1) + (c0 - (c1 + c2)))
241241

242242
Function name: async::m
243-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 57, 01, 00, 19]
243+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 5a, 01, 00, 19]
244244
Number of files: 1
245245
- file 0 => global file 1
246246
Number of expressions: 0
247247
Number of file 0 mappings: 1
248-
- Code(Counter(0)) at (prev + 87, 1) to (start + 0, 25)
248+
- Code(Counter(0)) at (prev + 90, 1) to (start + 0, 25)
249249

250250
Function name: async::m::{closure#0} (unused)
251-
Raw bytes (9): 0x[01, 01, 00, 01, 00, 57, 19, 00, 22]
251+
Raw bytes (9): 0x[01, 01, 00, 01, 00, 5a, 19, 00, 22]
252252
Number of files: 1
253253
- file 0 => global file 1
254254
Number of expressions: 0
255255
Number of file 0 mappings: 1
256-
- Code(Zero) at (prev + 87, 25) to (start + 0, 34)
256+
- Code(Zero) at (prev + 90, 25) to (start + 0, 34)
257257

258258
Function name: async::main
259-
Raw bytes (9): 0x[01, 01, 00, 01, 01, 59, 01, 08, 02]
259+
Raw bytes (9): 0x[01, 01, 00, 01, 01, 5c, 01, 08, 02]
260260
Number of files: 1
261261
- file 0 => global file 1
262262
Number of expressions: 0
263263
Number of file 0 mappings: 1
264-
- Code(Counter(0)) at (prev + 89, 1) to (start + 8, 2)
264+
- Code(Counter(0)) at (prev + 92, 1) to (start + 8, 2)
265265

‎tests/coverage/async.coverage

+3-18
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
LL| |//@ edition: 2018
77
LL| |//@ compile-flags: -Copt-level=1
88
LL| |
9+
LL| |//@ aux-build: executor.rs
10+
LL| |extern crate executor;
11+
LL| |
912
LL| 1|async fn c(x: u8) -> u8 {
1013
LL| 1| if x == 8 {
1114
LL| 1| 1
@@ -100,22 +103,4 @@
100103
LL| 1| let _ = m(5);
101104
LL| 1| executor::block_on(future.as_mut());
102105
LL| 1|}
103-
LL| |
104-
LL| |mod executor {
105-
LL| | use core::future::Future;
106-
LL| | use core::pin::pin;
107-
LL| | use core::task::{Context, Poll, Waker};
108-
LL| |
109-
LL| | #[coverage(off)]
110-
LL| | pub fn block_on<F: Future>(mut future: F) -> F::Output {
111-
LL| | let mut future = pin!(future);
112-
LL| | let mut context = Context::from_waker(Waker::noop());
113-
LL| |
114-
LL| | loop {
115-
LL| | if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
116-
LL| | break val;
117-
LL| | }
118-
LL| | }
119-
LL| | }
120-
LL| |}
121106

‎tests/coverage/async.rs

+3-18
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
//@ edition: 2018
77
//@ compile-flags: -Copt-level=1
88

9+
//@ aux-build: executor.rs
10+
extern crate executor;
11+
912
async fn c(x: u8) -> u8 {
1013
if x == 8 {
1114
1
@@ -95,21 +98,3 @@ fn main() {
9598
let _ = m(5);
9699
executor::block_on(future.as_mut());
97100
}
98-
99-
mod executor {
100-
use core::future::Future;
101-
use core::pin::pin;
102-
use core::task::{Context, Poll, Waker};
103-
104-
#[coverage(off)]
105-
pub fn block_on<F: Future>(mut future: F) -> F::Output {
106-
let mut future = pin!(future);
107-
let mut context = Context::from_waker(Waker::noop());
108-
109-
loop {
110-
if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
111-
break val;
112-
}
113-
}
114-
}
115-
}

0 commit comments

Comments
 (0)