Skip to content

Commit 577272e

Browse files
ZalatharZalathar
committed
coverage: Shrink call spans to just the function name
This is a way to shrink call spans that doesn't involve mixing different spans, and avoids overlap with argument spans. This patch also removes some low-value comments that were causing rustfmt to ignore the match arms.
1 parent e80a3e2 commit 577272e

22 files changed

+106
-106
lines changed

Diff for: ‎compiler/rustc_mir_transform/src/coverage/spans/from_mir.rs

+7-11
Original file line numberDiff line numberDiff line change
@@ -120,22 +120,20 @@ fn filtered_terminator_span(terminator: &Terminator<'_>) -> Option<Span> {
120120
// an `if condition { block }` has a span that includes the executed block, if true,
121121
// but for coverage, the code region executed, up to *and* through the SwitchInt,
122122
// actually stops before the if's block.)
123-
TerminatorKind::Unreachable // Unreachable blocks are not connected to the MIR CFG
123+
TerminatorKind::Unreachable
124124
| TerminatorKind::Assert { .. }
125125
| TerminatorKind::Drop { .. }
126126
| TerminatorKind::SwitchInt { .. }
127-
// For `FalseEdge`, only the `real` branch is taken, so it is similar to a `Goto`.
128127
| TerminatorKind::FalseEdge { .. }
129128
| TerminatorKind::Goto { .. } => None,
130129

131130
// Call `func` operand can have a more specific span when part of a chain of calls
132-
TerminatorKind::Call { ref func, .. }
133-
| TerminatorKind::TailCall { ref func, .. } => {
131+
TerminatorKind::Call { ref func, .. } | TerminatorKind::TailCall { ref func, .. } => {
134132
let mut span = terminator.source_info.span;
135-
if let mir::Operand::Constant(box constant) = func {
136-
if constant.span.lo() > span.lo() {
137-
span = span.with_lo(constant.span.lo());
138-
}
133+
if let mir::Operand::Constant(constant) = func
134+
&& span.contains(constant.span)
135+
{
136+
span = constant.span;
139137
}
140138
Some(span)
141139
}
@@ -147,9 +145,7 @@ fn filtered_terminator_span(terminator: &Terminator<'_>) -> Option<Span> {
147145
| TerminatorKind::Yield { .. }
148146
| TerminatorKind::CoroutineDrop
149147
| TerminatorKind::FalseUnwind { .. }
150-
| TerminatorKind::InlineAsm { .. } => {
151-
Some(terminator.source_info.span)
152-
}
148+
| TerminatorKind::InlineAsm { .. } => Some(terminator.source_info.span),
153149
}
154150
}
155151

Diff for: ‎tests/coverage/assert-ne.cov-map

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Function name: assert_ne::main
2-
Raw bytes (28): 0x[01, 01, 02, 01, 05, 01, 09, 04, 01, 08, 01, 03, 1c, 05, 04, 0d, 00, 13, 02, 02, 0d, 00, 13, 06, 03, 05, 01, 02]
2+
Raw bytes (28): 0x[01, 01, 02, 01, 05, 01, 09, 04, 01, 08, 01, 03, 15, 05, 04, 0d, 00, 13, 02, 02, 0d, 00, 13, 06, 03, 05, 01, 02]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 2
66
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
77
- expression 1 operands: lhs = Counter(0), rhs = Counter(2)
88
Number of file 0 mappings: 4
9-
- Code(Counter(0)) at (prev + 8, 1) to (start + 3, 28)
9+
- Code(Counter(0)) at (prev + 8, 1) to (start + 3, 21)
1010
- Code(Counter(1)) at (prev + 4, 13) to (start + 0, 19)
1111
- Code(Expression(0, Sub)) at (prev + 2, 13) to (start + 0, 19)
1212
= (c0 - c1)

Diff for: ‎tests/coverage/attr/off-on-sandwich.cov-map

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
Function name: off_on_sandwich::dense_a::dense_b
2-
Raw bytes (14): 0x[01, 01, 00, 02, 01, 10, 05, 02, 12, 01, 07, 05, 00, 06]
2+
Raw bytes (14): 0x[01, 01, 00, 02, 01, 10, 05, 02, 10, 01, 07, 05, 00, 06]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 0
66
Number of file 0 mappings: 2
7-
- Code(Counter(0)) at (prev + 16, 5) to (start + 2, 18)
7+
- Code(Counter(0)) at (prev + 16, 5) to (start + 2, 16)
88
- Code(Counter(0)) at (prev + 7, 5) to (start + 0, 6)
99
Highest counter ID seen: c0
1010

1111
Function name: off_on_sandwich::sparse_a::sparse_b::sparse_c
12-
Raw bytes (14): 0x[01, 01, 00, 02, 01, 22, 09, 02, 17, 01, 0b, 09, 00, 0a]
12+
Raw bytes (14): 0x[01, 01, 00, 02, 01, 22, 09, 02, 15, 01, 0b, 09, 00, 0a]
1313
Number of files: 1
1414
- file 0 => global file 1
1515
Number of expressions: 0
1616
Number of file 0 mappings: 2
17-
- Code(Counter(0)) at (prev + 34, 9) to (start + 2, 23)
17+
- Code(Counter(0)) at (prev + 34, 9) to (start + 2, 21)
1818
- Code(Counter(0)) at (prev + 11, 9) to (start + 0, 10)
1919
Highest counter ID seen: c0
2020

2121
Function name: off_on_sandwich::sparse_a::sparse_b::sparse_c::sparse_d
22-
Raw bytes (14): 0x[01, 01, 00, 02, 01, 25, 0d, 02, 1b, 01, 07, 0d, 00, 0e]
22+
Raw bytes (14): 0x[01, 01, 00, 02, 01, 25, 0d, 02, 19, 01, 07, 0d, 00, 0e]
2323
Number of files: 1
2424
- file 0 => global file 1
2525
Number of expressions: 0
2626
Number of file 0 mappings: 2
27-
- Code(Counter(0)) at (prev + 37, 13) to (start + 2, 27)
27+
- Code(Counter(0)) at (prev + 37, 13) to (start + 2, 25)
2828
- Code(Counter(0)) at (prev + 7, 13) to (start + 0, 14)
2929
Highest counter ID seen: c0
3030

Diff for: ‎tests/coverage/branch/if.cov-map

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Number of file 0 mappings: 8
2323
Highest counter ID seen: c2
2424

2525
Function name: if::branch_not
26-
Raw bytes (116): 0x[01, 01, 07, 01, 05, 01, 09, 01, 09, 01, 0d, 01, 0d, 01, 11, 01, 11, 12, 01, 0c, 01, 01, 10, 01, 03, 08, 00, 09, 20, 05, 02, 00, 08, 00, 09, 05, 01, 09, 00, 11, 02, 01, 05, 00, 06, 01, 01, 08, 00, 0a, 20, 0a, 09, 00, 08, 00, 0a, 0a, 00, 0b, 02, 06, 09, 02, 05, 00, 06, 01, 01, 08, 00, 0b, 20, 0d, 12, 00, 08, 00, 0b, 0d, 00, 0c, 02, 06, 12, 02, 05, 00, 06, 01, 01, 08, 00, 0c, 20, 1a, 11, 00, 08, 00, 0c, 1a, 00, 0d, 02, 06, 11, 02, 05, 00, 06, 01, 01, 01, 00, 02]
26+
Raw bytes (116): 0x[01, 01, 07, 01, 05, 01, 09, 01, 09, 01, 0d, 01, 0d, 01, 11, 01, 11, 12, 01, 0c, 01, 01, 10, 01, 03, 08, 00, 09, 20, 05, 02, 00, 08, 00, 09, 05, 01, 09, 00, 10, 02, 01, 05, 00, 06, 01, 01, 08, 00, 0a, 20, 0a, 09, 00, 08, 00, 0a, 0a, 00, 0b, 02, 06, 09, 02, 05, 00, 06, 01, 01, 08, 00, 0b, 20, 0d, 12, 00, 08, 00, 0b, 0d, 00, 0c, 02, 06, 12, 02, 05, 00, 06, 01, 01, 08, 00, 0c, 20, 1a, 11, 00, 08, 00, 0c, 1a, 00, 0d, 02, 06, 11, 02, 05, 00, 06, 01, 01, 01, 00, 02]
2727
Number of files: 1
2828
- file 0 => global file 1
2929
Number of expressions: 7
@@ -40,7 +40,7 @@ Number of file 0 mappings: 18
4040
- Branch { true: Counter(1), false: Expression(0, Sub) } at (prev + 0, 8) to (start + 0, 9)
4141
true = c1
4242
false = (c0 - c1)
43-
- Code(Counter(1)) at (prev + 1, 9) to (start + 0, 17)
43+
- Code(Counter(1)) at (prev + 1, 9) to (start + 0, 16)
4444
- Code(Expression(0, Sub)) at (prev + 1, 5) to (start + 0, 6)
4545
= (c0 - c1)
4646
- Code(Counter(0)) at (prev + 1, 8) to (start + 0, 10)

Diff for: ‎tests/coverage/branch/lazy-boolean.cov-map

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Number of file 0 mappings: 6
3434
Highest counter ID seen: c1
3535

3636
Function name: lazy_boolean::chain
37-
Raw bytes (141): 0x[01, 01, 0f, 01, 05, 05, 09, 09, 0d, 01, 11, 01, 11, 01, 3b, 11, 15, 01, 3b, 11, 15, 01, 37, 3b, 19, 11, 15, 01, 37, 3b, 19, 11, 15, 13, 01, 24, 01, 01, 10, 01, 04, 09, 00, 0a, 01, 00, 0d, 00, 12, 20, 05, 02, 00, 0d, 00, 12, 05, 00, 16, 00, 1b, 20, 09, 06, 00, 16, 00, 1b, 09, 00, 1f, 00, 24, 20, 0d, 0a, 00, 1f, 00, 24, 0d, 00, 28, 00, 2d, 01, 01, 05, 00, 11, 01, 03, 09, 00, 0a, 01, 00, 0d, 00, 12, 20, 11, 12, 00, 0d, 00, 12, 12, 00, 16, 00, 1b, 20, 15, 1e, 00, 16, 00, 1b, 1e, 00, 1f, 00, 24, 20, 19, 32, 00, 1f, 00, 24, 32, 00, 28, 00, 2d, 01, 01, 05, 01, 02]
37+
Raw bytes (141): 0x[01, 01, 0f, 01, 05, 05, 09, 09, 0d, 01, 11, 01, 11, 01, 3b, 11, 15, 01, 3b, 11, 15, 01, 37, 3b, 19, 11, 15, 01, 37, 3b, 19, 11, 15, 13, 01, 24, 01, 01, 10, 01, 04, 09, 00, 0a, 01, 00, 0d, 00, 12, 20, 05, 02, 00, 0d, 00, 12, 05, 00, 16, 00, 1b, 20, 09, 06, 00, 16, 00, 1b, 09, 00, 1f, 00, 24, 20, 0d, 0a, 00, 1f, 00, 24, 0d, 00, 28, 00, 2d, 01, 01, 05, 00, 10, 01, 03, 09, 00, 0a, 01, 00, 0d, 00, 12, 20, 11, 12, 00, 0d, 00, 12, 12, 00, 16, 00, 1b, 20, 15, 1e, 00, 16, 00, 1b, 1e, 00, 1f, 00, 24, 20, 19, 32, 00, 1f, 00, 24, 32, 00, 28, 00, 2d, 01, 01, 05, 01, 02]
3838
Number of files: 1
3939
- file 0 => global file 1
4040
Number of expressions: 15
@@ -69,7 +69,7 @@ Number of file 0 mappings: 19
6969
true = c3
7070
false = (c2 - c3)
7171
- Code(Counter(3)) at (prev + 0, 40) to (start + 0, 45)
72-
- Code(Counter(0)) at (prev + 1, 5) to (start + 0, 17)
72+
- Code(Counter(0)) at (prev + 1, 5) to (start + 0, 16)
7373
- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 10)
7474
- Code(Counter(0)) at (prev + 0, 13) to (start + 0, 18)
7575
- Branch { true: Counter(4), false: Expression(4, Sub) } at (prev + 0, 13) to (start + 0, 18)
@@ -91,7 +91,7 @@ Number of file 0 mappings: 19
9191
Highest counter ID seen: c6
9292

9393
Function name: lazy_boolean::nested_mixed
94-
Raw bytes (137): 0x[01, 01, 0d, 01, 05, 01, 1f, 05, 09, 05, 09, 1f, 0d, 05, 09, 1f, 0d, 05, 09, 01, 11, 11, 15, 01, 15, 01, 33, 15, 19, 13, 01, 31, 01, 01, 10, 01, 04, 09, 00, 0a, 01, 00, 0e, 00, 13, 20, 05, 02, 00, 0e, 00, 13, 02, 00, 17, 00, 1d, 20, 09, 06, 00, 17, 00, 1d, 1f, 00, 23, 00, 28, 20, 0d, 1a, 00, 23, 00, 28, 1a, 00, 2c, 00, 33, 01, 01, 05, 00, 11, 01, 03, 09, 00, 0a, 01, 00, 0e, 00, 13, 20, 11, 22, 00, 0e, 00, 13, 11, 00, 17, 00, 1c, 20, 15, 26, 00, 17, 00, 1c, 2a, 00, 22, 00, 28, 20, 19, 2e, 00, 22, 00, 28, 19, 00, 2c, 00, 33, 01, 01, 05, 01, 02]
94+
Raw bytes (137): 0x[01, 01, 0d, 01, 05, 01, 1f, 05, 09, 05, 09, 1f, 0d, 05, 09, 1f, 0d, 05, 09, 01, 11, 11, 15, 01, 15, 01, 33, 15, 19, 13, 01, 31, 01, 01, 10, 01, 04, 09, 00, 0a, 01, 00, 0e, 00, 13, 20, 05, 02, 00, 0e, 00, 13, 02, 00, 17, 00, 1d, 20, 09, 06, 00, 17, 00, 1d, 1f, 00, 23, 00, 28, 20, 0d, 1a, 00, 23, 00, 28, 1a, 00, 2c, 00, 33, 01, 01, 05, 00, 10, 01, 03, 09, 00, 0a, 01, 00, 0e, 00, 13, 20, 11, 22, 00, 0e, 00, 13, 11, 00, 17, 00, 1c, 20, 15, 26, 00, 17, 00, 1c, 2a, 00, 22, 00, 28, 20, 19, 2e, 00, 22, 00, 28, 19, 00, 2c, 00, 33, 01, 01, 05, 01, 02]
9595
Number of files: 1
9696
- file 0 => global file 1
9797
Number of expressions: 13
@@ -127,7 +127,7 @@ Number of file 0 mappings: 19
127127
false = ((c1 + c2) - c3)
128128
- Code(Expression(6, Sub)) at (prev + 0, 44) to (start + 0, 51)
129129
= ((c1 + c2) - c3)
130-
- Code(Counter(0)) at (prev + 1, 5) to (start + 0, 17)
130+
- Code(Counter(0)) at (prev + 1, 5) to (start + 0, 16)
131131
- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 10)
132132
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 19)
133133
- Branch { true: Counter(4), false: Expression(8, Sub) } at (prev + 0, 14) to (start + 0, 19)

Diff for: ‎tests/coverage/branch/let-else.cov-map

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Function name: let_else::let_else
2-
Raw bytes (43): 0x[01, 01, 01, 01, 05, 07, 01, 0c, 01, 01, 10, 20, 02, 05, 03, 09, 00, 10, 02, 00, 0e, 00, 0f, 01, 00, 13, 00, 18, 05, 01, 09, 01, 0f, 02, 04, 05, 00, 0b, 01, 01, 01, 00, 02]
2+
Raw bytes (43): 0x[01, 01, 01, 01, 05, 07, 01, 0c, 01, 01, 10, 20, 02, 05, 03, 09, 00, 10, 02, 00, 0e, 00, 0f, 01, 00, 13, 00, 18, 05, 01, 09, 01, 0f, 02, 04, 05, 00, 0a, 01, 01, 01, 00, 02]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 1
@@ -13,7 +13,7 @@ Number of file 0 mappings: 7
1313
= (c0 - c1)
1414
- Code(Counter(0)) at (prev + 0, 19) to (start + 0, 24)
1515
- Code(Counter(1)) at (prev + 1, 9) to (start + 1, 15)
16-
- Code(Expression(0, Sub)) at (prev + 4, 5) to (start + 0, 11)
16+
- Code(Expression(0, Sub)) at (prev + 4, 5) to (start + 0, 10)
1717
= (c0 - c1)
1818
- Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
1919
Highest counter ID seen: c1

Diff for: ‎tests/coverage/branch/match-arms.cov-map

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Function name: match_arms::guards
2-
Raw bytes (88): 0x[01, 01, 08, 15, 05, 19, 09, 1d, 0d, 21, 11, 01, 17, 1b, 11, 1f, 0d, 05, 09, 0c, 01, 30, 01, 01, 10, 21, 03, 0b, 00, 10, 05, 01, 11, 00, 29, 20, 05, 02, 00, 17, 00, 1b, 09, 01, 11, 00, 29, 20, 09, 06, 00, 17, 00, 1b, 0d, 01, 11, 00, 29, 20, 0d, 0a, 00, 17, 00, 1b, 11, 01, 11, 00, 29, 20, 11, 0e, 00, 17, 00, 1b, 12, 01, 0e, 00, 18, 01, 03, 05, 01, 02]
2+
Raw bytes (88): 0x[01, 01, 08, 15, 05, 19, 09, 1d, 0d, 21, 11, 01, 17, 1b, 11, 1f, 0d, 05, 09, 0c, 01, 30, 01, 01, 10, 21, 03, 0b, 00, 10, 05, 01, 11, 00, 28, 20, 05, 02, 00, 17, 00, 1b, 09, 01, 11, 00, 28, 20, 09, 06, 00, 17, 00, 1b, 0d, 01, 11, 00, 28, 20, 0d, 0a, 00, 17, 00, 1b, 11, 01, 11, 00, 28, 20, 11, 0e, 00, 17, 00, 1b, 12, 01, 0e, 00, 15, 01, 03, 05, 01, 02]
33
Number of files: 1
44
- file 0 => global file 1
55
Number of expressions: 8
@@ -14,29 +14,29 @@ Number of expressions: 8
1414
Number of file 0 mappings: 12
1515
- Code(Counter(0)) at (prev + 48, 1) to (start + 1, 16)
1616
- Code(Counter(8)) at (prev + 3, 11) to (start + 0, 16)
17-
- Code(Counter(1)) at (prev + 1, 17) to (start + 0, 41)
17+
- Code(Counter(1)) at (prev + 1, 17) to (start + 0, 40)
1818
- Branch { true: Counter(1), false: Expression(0, Sub) } at (prev + 0, 23) to (start + 0, 27)
1919
true = c1
2020
false = (c5 - c1)
21-
- Code(Counter(2)) at (prev + 1, 17) to (start + 0, 41)
21+
- Code(Counter(2)) at (prev + 1, 17) to (start + 0, 40)
2222
- Branch { true: Counter(2), false: Expression(1, Sub) } at (prev + 0, 23) to (start + 0, 27)
2323
true = c2
2424
false = (c6 - c2)
25-
- Code(Counter(3)) at (prev + 1, 17) to (start + 0, 41)
25+
- Code(Counter(3)) at (prev + 1, 17) to (start + 0, 40)
2626
- Branch { true: Counter(3), false: Expression(2, Sub) } at (prev + 0, 23) to (start + 0, 27)
2727
true = c3
2828
false = (c7 - c3)
29-
- Code(Counter(4)) at (prev + 1, 17) to (start + 0, 41)
29+
- Code(Counter(4)) at (prev + 1, 17) to (start + 0, 40)
3030
- Branch { true: Counter(4), false: Expression(3, Sub) } at (prev + 0, 23) to (start + 0, 27)
3131
true = c4
3232
false = (c8 - c4)
33-
- Code(Expression(4, Sub)) at (prev + 1, 14) to (start + 0, 24)
33+
- Code(Expression(4, Sub)) at (prev + 1, 14) to (start + 0, 21)
3434
= (c0 - (((c1 + c2) + c3) + c4))
3535
- Code(Counter(0)) at (prev + 3, 5) to (start + 1, 2)
3636
Highest counter ID seen: c8
3737

3838
Function name: match_arms::match_arms
39-
Raw bytes (45): 0x[01, 01, 03, 01, 07, 0b, 0d, 05, 09, 07, 01, 18, 01, 01, 10, 01, 03, 0b, 00, 10, 05, 01, 11, 00, 21, 09, 01, 11, 00, 21, 0d, 01, 11, 00, 21, 02, 01, 11, 00, 21, 01, 03, 05, 01, 02]
39+
Raw bytes (45): 0x[01, 01, 03, 01, 07, 0b, 0d, 05, 09, 07, 01, 18, 01, 01, 10, 01, 03, 0b, 00, 10, 05, 01, 11, 00, 20, 09, 01, 11, 00, 20, 0d, 01, 11, 00, 20, 02, 01, 11, 00, 20, 01, 03, 05, 01, 02]
4040
Number of files: 1
4141
- file 0 => global file 1
4242
Number of expressions: 3
@@ -46,16 +46,16 @@ Number of expressions: 3
4646
Number of file 0 mappings: 7
4747
- Code(Counter(0)) at (prev + 24, 1) to (start + 1, 16)
4848
- Code(Counter(0)) at (prev + 3, 11) to (start + 0, 16)
49-
- Code(Counter(1)) at (prev + 1, 17) to (start + 0, 33)
50-
- Code(Counter(2)) at (prev + 1, 17) to (start + 0, 33)
51-
- Code(Counter(3)) at (prev + 1, 17) to (start + 0, 33)
52-
- Code(Expression(0, Sub)) at (prev + 1, 17) to (start + 0, 33)
49+
- Code(Counter(1)) at (prev + 1, 17) to (start + 0, 32)
50+
- Code(Counter(2)) at (prev + 1, 17) to (start + 0, 32)
51+
- Code(Counter(3)) at (prev + 1, 17) to (start + 0, 32)
52+
- Code(Expression(0, Sub)) at (prev + 1, 17) to (start + 0, 32)
5353
= (c0 - ((c1 + c2) + c3))
5454
- Code(Counter(0)) at (prev + 3, 5) to (start + 1, 2)
5555
Highest counter ID seen: c3
5656

5757
Function name: match_arms::or_patterns
58-
Raw bytes (57): 0x[01, 01, 04, 05, 09, 01, 0b, 03, 0d, 01, 03, 09, 01, 25, 01, 01, 10, 01, 03, 0b, 00, 10, 05, 01, 11, 00, 12, 09, 00, 1e, 00, 1f, 03, 00, 24, 00, 2e, 0d, 01, 11, 00, 12, 06, 00, 1e, 00, 1f, 0e, 00, 24, 00, 2e, 01, 03, 05, 01, 02]
58+
Raw bytes (57): 0x[01, 01, 04, 05, 09, 01, 0b, 03, 0d, 01, 03, 09, 01, 25, 01, 01, 10, 01, 03, 0b, 00, 10, 05, 01, 11, 00, 12, 09, 00, 1e, 00, 1f, 03, 00, 24, 00, 2d, 0d, 01, 11, 00, 12, 06, 00, 1e, 00, 1f, 0e, 00, 24, 00, 2d, 01, 03, 05, 01, 02]
5959
Number of files: 1
6060
- file 0 => global file 1
6161
Number of expressions: 4
@@ -68,12 +68,12 @@ Number of file 0 mappings: 9
6868
- Code(Counter(0)) at (prev + 3, 11) to (start + 0, 16)
6969
- Code(Counter(1)) at (prev + 1, 17) to (start + 0, 18)
7070
- Code(Counter(2)) at (prev + 0, 30) to (start + 0, 31)
71-
- Code(Expression(0, Add)) at (prev + 0, 36) to (start + 0, 46)
71+
- Code(Expression(0, Add)) at (prev + 0, 36) to (start + 0, 45)
7272
= (c1 + c2)
7373
- Code(Counter(3)) at (prev + 1, 17) to (start + 0, 18)
7474
- Code(Expression(1, Sub)) at (prev + 0, 30) to (start + 0, 31)
7575
= (c0 - ((c1 + c2) + c3))
76-
- Code(Expression(3, Sub)) at (prev + 0, 36) to (start + 0, 46)
76+
- Code(Expression(3, Sub)) at (prev + 0, 36) to (start + 0, 45)
7777
= (c0 - (c1 + c2))
7878
- Code(Counter(0)) at (prev + 3, 5) to (start + 1, 2)
7979
Highest counter ID seen: c3

Diff for: ‎tests/coverage/condition/conditions.cov-map

+6-4
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,17 @@ Number of file 0 mappings: 1
109109
Highest counter ID seen: c0
110110

111111
Function name: conditions::func_call
112-
Raw bytes (37): 0x[01, 01, 02, 01, 05, 05, 09, 05, 01, 25, 01, 01, 0a, 20, 05, 02, 01, 09, 00, 0a, 05, 00, 0e, 00, 0f, 20, 09, 06, 00, 0e, 00, 0f, 01, 01, 01, 00, 02]
112+
Raw bytes (47): 0x[01, 01, 02, 01, 05, 05, 09, 07, 01, 25, 01, 00, 20, 01, 01, 05, 00, 08, 01, 00, 09, 00, 0a, 20, 05, 02, 00, 09, 00, 0a, 05, 00, 0e, 00, 0f, 20, 09, 06, 00, 0e, 00, 0f, 01, 01, 01, 00, 02]
113113
Number of files: 1
114114
- file 0 => global file 1
115115
Number of expressions: 2
116116
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
117117
- expression 1 operands: lhs = Counter(1), rhs = Counter(2)
118-
Number of file 0 mappings: 5
119-
- Code(Counter(0)) at (prev + 37, 1) to (start + 1, 10)
120-
- Branch { true: Counter(1), false: Expression(0, Sub) } at (prev + 1, 9) to (start + 0, 10)
118+
Number of file 0 mappings: 7
119+
- Code(Counter(0)) at (prev + 37, 1) to (start + 0, 32)
120+
- Code(Counter(0)) at (prev + 1, 5) to (start + 0, 8)
121+
- Code(Counter(0)) at (prev + 0, 9) to (start + 0, 10)
122+
- Branch { true: Counter(1), false: Expression(0, Sub) } at (prev + 0, 9) to (start + 0, 10)
121123
true = c1
122124
false = (c0 - c1)
123125
- Code(Counter(1)) at (prev + 0, 14) to (start + 0, 15)

Diff for: ‎tests/coverage/coroutine.cov-map

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ Number of file 0 mappings: 4
1313
Highest counter ID seen: c1
1414

1515
Function name: coroutine::main
16-
Raw bytes (53): 0x[01, 01, 02, 01, 05, 05, 09, 09, 01, 13, 01, 02, 16, 01, 08, 0b, 00, 2e, 05, 01, 2b, 00, 2d, 02, 01, 0e, 00, 35, 05, 02, 0b, 00, 2e, 0d, 01, 22, 00, 27, 09, 00, 2c, 00, 2e, 06, 01, 0e, 00, 35, 09, 02, 01, 00, 02]
16+
Raw bytes (53): 0x[01, 01, 02, 01, 05, 05, 09, 09, 01, 13, 01, 02, 16, 01, 08, 0b, 00, 2d, 05, 01, 2b, 00, 2d, 02, 01, 0e, 00, 35, 05, 02, 0b, 00, 2e, 0d, 01, 22, 00, 27, 09, 00, 2c, 00, 2e, 06, 01, 0e, 00, 35, 09, 02, 01, 00, 02]
1717
Number of files: 1
1818
- file 0 => global file 1
1919
Number of expressions: 2
2020
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
2121
- expression 1 operands: lhs = Counter(1), rhs = Counter(2)
2222
Number of file 0 mappings: 9
2323
- Code(Counter(0)) at (prev + 19, 1) to (start + 2, 22)
24-
- Code(Counter(0)) at (prev + 8, 11) to (start + 0, 46)
24+
- Code(Counter(0)) at (prev + 8, 11) to (start + 0, 45)
2525
- Code(Counter(1)) at (prev + 1, 43) to (start + 0, 45)
2626
- Code(Expression(0, Sub)) at (prev + 1, 14) to (start + 0, 53)
2727
= (c0 - c1)

Diff for: ‎tests/coverage/holes.cov-map

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ Number of file 0 mappings: 1
88
Highest counter ID seen: (none)
99

1010
Function name: holes::main
11-
Raw bytes (69): 0x[01, 01, 00, 0d, 01, 08, 01, 01, 12, 01, 05, 05, 00, 12, 01, 07, 09, 00, 11, 01, 09, 05, 00, 12, 01, 04, 05, 00, 12, 01, 07, 05, 00, 12, 01, 06, 05, 00, 12, 01, 04, 05, 00, 12, 01, 04, 05, 00, 12, 01, 06, 05, 03, 0f, 01, 0a, 05, 03, 0f, 01, 0a, 05, 0c, 0d, 01, 0f, 0e, 05, 02]
11+
Raw bytes (69): 0x[01, 01, 00, 0d, 01, 08, 01, 01, 11, 01, 05, 05, 00, 11, 01, 07, 09, 00, 11, 01, 09, 05, 00, 11, 01, 04, 05, 00, 11, 01, 07, 05, 00, 11, 01, 06, 05, 00, 11, 01, 04, 05, 00, 11, 01, 04, 05, 00, 11, 01, 06, 05, 03, 0f, 01, 0a, 05, 03, 0f, 01, 0a, 05, 0c, 0d, 01, 0f, 0e, 05, 02]
1212
Number of files: 1
1313
- file 0 => global file 1
1414
Number of expressions: 0
1515
Number of file 0 mappings: 13
16-
- Code(Counter(0)) at (prev + 8, 1) to (start + 1, 18)
17-
- Code(Counter(0)) at (prev + 5, 5) to (start + 0, 18)
16+
- Code(Counter(0)) at (prev + 8, 1) to (start + 1, 17)
17+
- Code(Counter(0)) at (prev + 5, 5) to (start + 0, 17)
1818
- Code(Counter(0)) at (prev + 7, 9) to (start + 0, 17)
19-
- Code(Counter(0)) at (prev + 9, 5) to (start + 0, 18)
20-
- Code(Counter(0)) at (prev + 4, 5) to (start + 0, 18)
21-
- Code(Counter(0)) at (prev + 7, 5) to (start + 0, 18)
22-
- Code(Counter(0)) at (prev + 6, 5) to (start + 0, 18)
23-
- Code(Counter(0)) at (prev + 4, 5) to (start + 0, 18)
24-
- Code(Counter(0)) at (prev + 4, 5) to (start + 0, 18)
19+
- Code(Counter(0)) at (prev + 9, 5) to (start + 0, 17)
20+
- Code(Counter(0)) at (prev + 4, 5) to (start + 0, 17)
21+
- Code(Counter(0)) at (prev + 7, 5) to (start + 0, 17)
22+
- Code(Counter(0)) at (prev + 6, 5) to (start + 0, 17)
23+
- Code(Counter(0)) at (prev + 4, 5) to (start + 0, 17)
24+
- Code(Counter(0)) at (prev + 4, 5) to (start + 0, 17)
2525
- Code(Counter(0)) at (prev + 6, 5) to (start + 3, 15)
2626
- Code(Counter(0)) at (prev + 10, 5) to (start + 3, 15)
2727
- Code(Counter(0)) at (prev + 10, 5) to (start + 12, 13)

0 commit comments

Comments
 (0)