Skip to content

Commit 0c434e8

Browse files
ranger-rossranger-ross
committed
More test branch coverage fixes
1 parent 5ccfda9 commit 0c434e8

File tree

4 files changed

+122
-67
lines changed

4 files changed

+122
-67
lines changed

‎tests/coverage/branch/match-arms.coverage

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,4 @@
121121
LL| | }
122122
LL| |}
123123
LL| |
124-
LL| |// FIXME(#124118) Support match expressions with or-patterns.
125124

‎tests/coverage/branch/match-arms.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,3 @@ fn main() {
8686
call_everything(Enum::D(d));
8787
}
8888
}
89-
90-
// FIXME(#124118) Support match expressions with or-patterns.

‎tests/coverage/branch/match-or-pattern-nested.coverage

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
LL| | }
1919
LL| 3|}
2020
LL| |
21-
LL| |
2221
LL| |#[coverage(off)]
2322
LL| |fn main() {
2423
LL| | foo(1, 2);
2524
LL| | foo(1, 99);
2625
LL| | foo(2, 5);
2726
LL| |}
28-
LL| |
2927

‎tests/coverage/match_or_pattern.cov-map

Lines changed: 122 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,135 @@
11
Function name: match_or_pattern::main
2-
Raw bytes (185): 0x[01, 01, 1c, 01, 05, 09, 0d, 23, 11, 09, 0d, 1f, 15, 23, 11, 09, 0d, 23, 11, 09, 0d, 19, 1d, 43, 21, 19, 1d, 3f, 25, 43, 21, 19, 1d, 43, 21, 19, 1d, 29, 2d, 63, 31, 29, 2d, 5f, 35, 63, 31, 29, 2d, 63, 31, 29, 2d, 39, 3d, 6f, 41, 39, 3d, 19, 01, 01, 01, 08, 0f, 05, 08, 10, 03, 06, 02, 03, 06, 00, 07, 01, 01, 0b, 00, 11, 11, 03, 1b, 00, 1d, 23, 01, 0e, 00, 10, 1f, 02, 08, 00, 0f, 15, 00, 10, 03, 06, 12, 03, 06, 00, 07, 1f, 01, 0b, 00, 11, 21, 01, 1b, 00, 1d, 43, 01, 0e, 00, 10, 3f, 02, 08, 00, 0f, 25, 00, 10, 03, 06, 32, 03, 06, 00, 07, 3f, 01, 0b, 00, 11, 31, 01, 1b, 00, 1d, 63, 01, 0e, 00, 10, 5f, 02, 08, 00, 0f, 35, 00, 10, 03, 06, 52, 03, 06, 00, 07, 5f, 01, 0b, 00, 11, 41, 01, 1b, 00, 1d, 6f, 01, 0e, 00, 10, 6b, 02, 01, 00, 02]
2+
Raw bytes (366): 0x[01, 01, 54, 01, 05, 5f, 25, 63, 21, 19, 1d, 57, 15, 0d, 11, 53, 5b, 57, 15, 0d, 11, 5f, 25, 63, 21, 19, 1d, 4f, 29, 53, 5b, 57, 15, 0d, 11, 5f, 25, 63, 21, 19, 1d, 53, 5b, 57, 15, 0d, 11, 5f, 25, 63, 21, 19, 1d, bf, 01, 49, c3, 01, 45, 3d, 41, b7, 01, 39, 31, 35, b3, 01, bb, 01, b7, 01, 39, 31, 35, bf, 01, 49, c3, 01, 45, 3d, 41, af, 01, 4d, b3, 01, bb, 01, b7, 01, 39, 31, 35, bf, 01, 49, c3, 01, 45, 3d, 41, b3, 01, bb, 01, b7, 01, 39, 31, 35, bf, 01, 49, c3, 01, 45, 3d, 41, 9f, 02, 6d, a3, 02, 69, 61, 65, 97, 02, 5d, 55, 59, 93, 02, 9b, 02, 97, 02, 5d, 55, 59, 9f, 02, 6d, a3, 02, 69, 61, 65, 8f, 02, 71, 93, 02, 9b, 02, 97, 02, 5d, 55, 59, 9f, 02, 6d, a3, 02, 69, 61, 65, 93, 02, 9b, 02, 97, 02, 5d, 55, 59, 9f, 02, 6d, a3, 02, 69, 61, 65, cb, 02, 91, 01, cf, 02, 8d, 01, 85, 01, 89, 01, c3, 02, 81, 01, 79, 7d, bf, 02, c7, 02, c3, 02, 81, 01, 79, 7d, cb, 02, 91, 01, cf, 02, 8d, 01, 85, 01, 89, 01, 19, 01, 01, 01, 08, 0f, 05, 08, 10, 03, 06, 02, 03, 06, 00, 07, 01, 01, 0b, 00, 11, 5b, 03, 1b, 00, 1d, 53, 01, 0e, 00, 10, 4f, 02, 08, 00, 0f, 29, 00, 10, 03, 06, 32, 03, 06, 00, 07, 4f, 01, 0b, 00, 11, bb, 01, 01, 1b, 00, 1d, b3, 01, 01, 0e, 00, 10, af, 01, 02, 08, 00, 0f, 4d, 00, 10, 03, 06, 92, 01, 03, 06, 00, 07, af, 01, 01, 0b, 00, 11, 9b, 02, 01, 1b, 00, 1d, 93, 02, 01, 0e, 00, 10, 8f, 02, 02, 08, 00, 0f, 71, 00, 10, 03, 06, f2, 01, 03, 06, 00, 07, 8f, 02, 01, 0b, 00, 11, c7, 02, 01, 1b, 00, 1d, bf, 02, 01, 0e, 00, 10, bb, 02, 02, 01, 00, 02]
33
Number of files: 1
44
- file 0 => global file 1
5-
Number of expressions: 28
5+
Number of expressions: 84
66
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
7-
- expression 1 operands: lhs = Counter(2), rhs = Counter(3)
8-
- expression 2 operands: lhs = Expression(8, Add), rhs = Counter(4)
9-
- expression 3 operands: lhs = Counter(2), rhs = Counter(3)
10-
- expression 4 operands: lhs = Expression(7, Add), rhs = Counter(5)
11-
- expression 5 operands: lhs = Expression(8, Add), rhs = Counter(4)
12-
- expression 6 operands: lhs = Counter(2), rhs = Counter(3)
13-
- expression 7 operands: lhs = Expression(8, Add), rhs = Counter(4)
14-
- expression 8 operands: lhs = Counter(2), rhs = Counter(3)
15-
- expression 9 operands: lhs = Counter(6), rhs = Counter(7)
16-
- expression 10 operands: lhs = Expression(16, Add), rhs = Counter(8)
7+
- expression 1 operands: lhs = Expression(23, Add), rhs = Counter(9)
8+
- expression 2 operands: lhs = Expression(24, Add), rhs = Counter(8)
9+
- expression 3 operands: lhs = Counter(6), rhs = Counter(7)
10+
- expression 4 operands: lhs = Expression(21, Add), rhs = Counter(5)
11+
- expression 5 operands: lhs = Counter(3), rhs = Counter(4)
12+
- expression 6 operands: lhs = Expression(20, Add), rhs = Expression(22, Add)
13+
- expression 7 operands: lhs = Expression(21, Add), rhs = Counter(5)
14+
- expression 8 operands: lhs = Counter(3), rhs = Counter(4)
15+
- expression 9 operands: lhs = Expression(23, Add), rhs = Counter(9)
16+
- expression 10 operands: lhs = Expression(24, Add), rhs = Counter(8)
1717
- expression 11 operands: lhs = Counter(6), rhs = Counter(7)
18-
- expression 12 operands: lhs = Expression(15, Add), rhs = Counter(9)
19-
- expression 13 operands: lhs = Expression(16, Add), rhs = Counter(8)
20-
- expression 14 operands: lhs = Counter(6), rhs = Counter(7)
21-
- expression 15 operands: lhs = Expression(16, Add), rhs = Counter(8)
22-
- expression 16 operands: lhs = Counter(6), rhs = Counter(7)
23-
- expression 17 operands: lhs = Counter(10), rhs = Counter(11)
24-
- expression 18 operands: lhs = Expression(24, Add), rhs = Counter(12)
25-
- expression 19 operands: lhs = Counter(10), rhs = Counter(11)
26-
- expression 20 operands: lhs = Expression(23, Add), rhs = Counter(13)
27-
- expression 21 operands: lhs = Expression(24, Add), rhs = Counter(12)
28-
- expression 22 operands: lhs = Counter(10), rhs = Counter(11)
29-
- expression 23 operands: lhs = Expression(24, Add), rhs = Counter(12)
30-
- expression 24 operands: lhs = Counter(10), rhs = Counter(11)
31-
- expression 25 operands: lhs = Counter(14), rhs = Counter(15)
32-
- expression 26 operands: lhs = Expression(27, Add), rhs = Counter(16)
33-
- expression 27 operands: lhs = Counter(14), rhs = Counter(15)
18+
- expression 12 operands: lhs = Expression(19, Add), rhs = Counter(10)
19+
- expression 13 operands: lhs = Expression(20, Add), rhs = Expression(22, Add)
20+
- expression 14 operands: lhs = Expression(21, Add), rhs = Counter(5)
21+
- expression 15 operands: lhs = Counter(3), rhs = Counter(4)
22+
- expression 16 operands: lhs = Expression(23, Add), rhs = Counter(9)
23+
- expression 17 operands: lhs = Expression(24, Add), rhs = Counter(8)
24+
- expression 18 operands: lhs = Counter(6), rhs = Counter(7)
25+
- expression 19 operands: lhs = Expression(20, Add), rhs = Expression(22, Add)
26+
- expression 20 operands: lhs = Expression(21, Add), rhs = Counter(5)
27+
- expression 21 operands: lhs = Counter(3), rhs = Counter(4)
28+
- expression 22 operands: lhs = Expression(23, Add), rhs = Counter(9)
29+
- expression 23 operands: lhs = Expression(24, Add), rhs = Counter(8)
30+
- expression 24 operands: lhs = Counter(6), rhs = Counter(7)
31+
- expression 25 operands: lhs = Expression(47, Add), rhs = Counter(18)
32+
- expression 26 operands: lhs = Expression(48, Add), rhs = Counter(17)
33+
- expression 27 operands: lhs = Counter(15), rhs = Counter(16)
34+
- expression 28 operands: lhs = Expression(45, Add), rhs = Counter(14)
35+
- expression 29 operands: lhs = Counter(12), rhs = Counter(13)
36+
- expression 30 operands: lhs = Expression(44, Add), rhs = Expression(46, Add)
37+
- expression 31 operands: lhs = Expression(45, Add), rhs = Counter(14)
38+
- expression 32 operands: lhs = Counter(12), rhs = Counter(13)
39+
- expression 33 operands: lhs = Expression(47, Add), rhs = Counter(18)
40+
- expression 34 operands: lhs = Expression(48, Add), rhs = Counter(17)
41+
- expression 35 operands: lhs = Counter(15), rhs = Counter(16)
42+
- expression 36 operands: lhs = Expression(43, Add), rhs = Counter(19)
43+
- expression 37 operands: lhs = Expression(44, Add), rhs = Expression(46, Add)
44+
- expression 38 operands: lhs = Expression(45, Add), rhs = Counter(14)
45+
- expression 39 operands: lhs = Counter(12), rhs = Counter(13)
46+
- expression 40 operands: lhs = Expression(47, Add), rhs = Counter(18)
47+
- expression 41 operands: lhs = Expression(48, Add), rhs = Counter(17)
48+
- expression 42 operands: lhs = Counter(15), rhs = Counter(16)
49+
- expression 43 operands: lhs = Expression(44, Add), rhs = Expression(46, Add)
50+
- expression 44 operands: lhs = Expression(45, Add), rhs = Counter(14)
51+
- expression 45 operands: lhs = Counter(12), rhs = Counter(13)
52+
- expression 46 operands: lhs = Expression(47, Add), rhs = Counter(18)
53+
- expression 47 operands: lhs = Expression(48, Add), rhs = Counter(17)
54+
- expression 48 operands: lhs = Counter(15), rhs = Counter(16)
55+
- expression 49 operands: lhs = Expression(71, Add), rhs = Counter(27)
56+
- expression 50 operands: lhs = Expression(72, Add), rhs = Counter(26)
57+
- expression 51 operands: lhs = Counter(24), rhs = Counter(25)
58+
- expression 52 operands: lhs = Expression(69, Add), rhs = Counter(23)
59+
- expression 53 operands: lhs = Counter(21), rhs = Counter(22)
60+
- expression 54 operands: lhs = Expression(68, Add), rhs = Expression(70, Add)
61+
- expression 55 operands: lhs = Expression(69, Add), rhs = Counter(23)
62+
- expression 56 operands: lhs = Counter(21), rhs = Counter(22)
63+
- expression 57 operands: lhs = Expression(71, Add), rhs = Counter(27)
64+
- expression 58 operands: lhs = Expression(72, Add), rhs = Counter(26)
65+
- expression 59 operands: lhs = Counter(24), rhs = Counter(25)
66+
- expression 60 operands: lhs = Expression(67, Add), rhs = Counter(28)
67+
- expression 61 operands: lhs = Expression(68, Add), rhs = Expression(70, Add)
68+
- expression 62 operands: lhs = Expression(69, Add), rhs = Counter(23)
69+
- expression 63 operands: lhs = Counter(21), rhs = Counter(22)
70+
- expression 64 operands: lhs = Expression(71, Add), rhs = Counter(27)
71+
- expression 65 operands: lhs = Expression(72, Add), rhs = Counter(26)
72+
- expression 66 operands: lhs = Counter(24), rhs = Counter(25)
73+
- expression 67 operands: lhs = Expression(68, Add), rhs = Expression(70, Add)
74+
- expression 68 operands: lhs = Expression(69, Add), rhs = Counter(23)
75+
- expression 69 operands: lhs = Counter(21), rhs = Counter(22)
76+
- expression 70 operands: lhs = Expression(71, Add), rhs = Counter(27)
77+
- expression 71 operands: lhs = Expression(72, Add), rhs = Counter(26)
78+
- expression 72 operands: lhs = Counter(24), rhs = Counter(25)
79+
- expression 73 operands: lhs = Expression(82, Add), rhs = Counter(36)
80+
- expression 74 operands: lhs = Expression(83, Add), rhs = Counter(35)
81+
- expression 75 operands: lhs = Counter(33), rhs = Counter(34)
82+
- expression 76 operands: lhs = Expression(80, Add), rhs = Counter(32)
83+
- expression 77 operands: lhs = Counter(30), rhs = Counter(31)
84+
- expression 78 operands: lhs = Expression(79, Add), rhs = Expression(81, Add)
85+
- expression 79 operands: lhs = Expression(80, Add), rhs = Counter(32)
86+
- expression 80 operands: lhs = Counter(30), rhs = Counter(31)
87+
- expression 81 operands: lhs = Expression(82, Add), rhs = Counter(36)
88+
- expression 82 operands: lhs = Expression(83, Add), rhs = Counter(35)
89+
- expression 83 operands: lhs = Counter(33), rhs = Counter(34)
3490
Number of file 0 mappings: 25
3591
- Code(Counter(0)) at (prev + 1, 1) to (start + 8, 15)
3692
- Code(Counter(1)) at (prev + 8, 16) to (start + 3, 6)
3793
- Code(Expression(0, Sub)) at (prev + 3, 6) to (start + 0, 7)
3894
= (c0 - c1)
3995
- Code(Counter(0)) at (prev + 1, 11) to (start + 0, 17)
40-
- Code(Counter(4)) at (prev + 3, 27) to (start + 0, 29)
41-
- Code(Expression(8, Add)) at (prev + 1, 14) to (start + 0, 16)
42-
= (c2 + c3)
43-
- Code(Expression(7, Add)) at (prev + 2, 8) to (start + 0, 15)
44-
= ((c2 + c3) + c4)
45-
- Code(Counter(5)) at (prev + 0, 16) to (start + 3, 6)
46-
- Code(Expression(4, Sub)) at (prev + 3, 6) to (start + 0, 7)
47-
= (((c2 + c3) + c4) - c5)
48-
- Code(Expression(7, Add)) at (prev + 1, 11) to (start + 0, 17)
49-
= ((c2 + c3) + c4)
50-
- Code(Counter(8)) at (prev + 1, 27) to (start + 0, 29)
51-
- Code(Expression(16, Add)) at (prev + 1, 14) to (start + 0, 16)
52-
= (c6 + c7)
53-
- Code(Expression(15, Add)) at (prev + 2, 8) to (start + 0, 15)
54-
= ((c6 + c7) + c8)
55-
- Code(Counter(9)) at (prev + 0, 16) to (start + 3, 6)
96+
- Code(Expression(22, Add)) at (prev + 3, 27) to (start + 0, 29)
97+
= (((c6 + c7) + c8) + c9)
98+
- Code(Expression(20, Add)) at (prev + 1, 14) to (start + 0, 16)
99+
= ((c3 + c4) + c5)
100+
- Code(Expression(19, Add)) at (prev + 2, 8) to (start + 0, 15)
101+
= (((c3 + c4) + c5) + (((c6 + c7) + c8) + c9))
102+
- Code(Counter(10)) at (prev + 0, 16) to (start + 3, 6)
56103
- Code(Expression(12, Sub)) at (prev + 3, 6) to (start + 0, 7)
57-
= (((c6 + c7) + c8) - c9)
58-
- Code(Expression(15, Add)) at (prev + 1, 11) to (start + 0, 17)
59-
= ((c6 + c7) + c8)
60-
- Code(Counter(12)) at (prev + 1, 27) to (start + 0, 29)
61-
- Code(Expression(24, Add)) at (prev + 1, 14) to (start + 0, 16)
62-
= (c10 + c11)
63-
- Code(Expression(23, Add)) at (prev + 2, 8) to (start + 0, 15)
64-
= ((c10 + c11) + c12)
65-
- Code(Counter(13)) at (prev + 0, 16) to (start + 3, 6)
66-
- Code(Expression(20, Sub)) at (prev + 3, 6) to (start + 0, 7)
67-
= (((c10 + c11) + c12) - c13)
68-
- Code(Expression(23, Add)) at (prev + 1, 11) to (start + 0, 17)
69-
= ((c10 + c11) + c12)
70-
- Code(Counter(16)) at (prev + 1, 27) to (start + 0, 29)
71-
- Code(Expression(27, Add)) at (prev + 1, 14) to (start + 0, 16)
72-
= (c14 + c15)
73-
- Code(Expression(26, Add)) at (prev + 2, 1) to (start + 0, 2)
74-
= ((c14 + c15) + c16)
104+
= ((((c3 + c4) + c5) + (((c6 + c7) + c8) + c9)) - c10)
105+
- Code(Expression(19, Add)) at (prev + 1, 11) to (start + 0, 17)
106+
= (((c3 + c4) + c5) + (((c6 + c7) + c8) + c9))
107+
- Code(Expression(46, Add)) at (prev + 1, 27) to (start + 0, 29)
108+
= (((c15 + c16) + c17) + c18)
109+
- Code(Expression(44, Add)) at (prev + 1, 14) to (start + 0, 16)
110+
= ((c12 + c13) + c14)
111+
- Code(Expression(43, Add)) at (prev + 2, 8) to (start + 0, 15)
112+
= (((c12 + c13) + c14) + (((c15 + c16) + c17) + c18))
113+
- Code(Counter(19)) at (prev + 0, 16) to (start + 3, 6)
114+
- Code(Expression(36, Sub)) at (prev + 3, 6) to (start + 0, 7)
115+
= ((((c12 + c13) + c14) + (((c15 + c16) + c17) + c18)) - c19)
116+
- Code(Expression(43, Add)) at (prev + 1, 11) to (start + 0, 17)
117+
= (((c12 + c13) + c14) + (((c15 + c16) + c17) + c18))
118+
- Code(Expression(70, Add)) at (prev + 1, 27) to (start + 0, 29)
119+
= (((c24 + c25) + c26) + c27)
120+
- Code(Expression(68, Add)) at (prev + 1, 14) to (start + 0, 16)
121+
= ((c21 + c22) + c23)
122+
- Code(Expression(67, Add)) at (prev + 2, 8) to (start + 0, 15)
123+
= (((c21 + c22) + c23) + (((c24 + c25) + c26) + c27))
124+
- Code(Counter(28)) at (prev + 0, 16) to (start + 3, 6)
125+
- Code(Expression(60, Sub)) at (prev + 3, 6) to (start + 0, 7)
126+
= ((((c21 + c22) + c23) + (((c24 + c25) + c26) + c27)) - c28)
127+
- Code(Expression(67, Add)) at (prev + 1, 11) to (start + 0, 17)
128+
= (((c21 + c22) + c23) + (((c24 + c25) + c26) + c27))
129+
- Code(Expression(81, Add)) at (prev + 1, 27) to (start + 0, 29)
130+
= (((c33 + c34) + c35) + c36)
131+
- Code(Expression(79, Add)) at (prev + 1, 14) to (start + 0, 16)
132+
= ((c30 + c31) + c32)
133+
- Code(Expression(78, Add)) at (prev + 2, 1) to (start + 0, 2)
134+
= (((c30 + c31) + c32) + (((c33 + c34) + c35) + c36))
75135

0 commit comments

Comments
 (0)