-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Fixes reported bugs in Rust Coverage #79958
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
bors
merged 3 commits into
rust-lang:master
from
richkadel:llvm-coverage-counters-2.2.0
Dec 15, 2020
+616
−53
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
src/test/run-make-fulldeps/coverage-reports/expected_export_coverage.match_or_pattern.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| { | ||
| "data": [ | ||
| { | ||
| "files": [ | ||
| { | ||
| "filename": "../coverage/match_or_pattern.rs", | ||
| "summary": { | ||
| "functions": { | ||
| "count": 1, | ||
| "covered": 1, | ||
| "percent": 100 | ||
| }, | ||
| "instantiations": { | ||
| "count": 1, | ||
| "covered": 1, | ||
| "percent": 100 | ||
| }, | ||
| "lines": { | ||
| "count": 37, | ||
| "covered": 33, | ||
| "percent": 89.1891891891892 | ||
| }, | ||
| "regions": { | ||
| "count": 25, | ||
| "covered": 17, | ||
| "notcovered": 8, | ||
| "percent": 68 | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "totals": { | ||
| "functions": { | ||
| "count": 1, | ||
| "covered": 1, | ||
| "percent": 100 | ||
| }, | ||
| "instantiations": { | ||
| "count": 1, | ||
| "covered": 1, | ||
| "percent": 100 | ||
| }, | ||
| "lines": { | ||
| "count": 37, | ||
| "covered": 33, | ||
| "percent": 89.1891891891892 | ||
| }, | ||
| "regions": { | ||
| "count": 25, | ||
| "covered": 17, | ||
| "notcovered": 8, | ||
| "percent": 68 | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "type": "llvm.coverage.json.export", | ||
| "version": "2.0.1" | ||
| } |
50 changes: 50 additions & 0 deletions
50
src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.match_or_pattern.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| 1| |#![feature(or_patterns)] | ||
| 2| | | ||
| 3| 1|fn main() { | ||
| 4| 1| // Initialize test constants in a way that cannot be determined at compile time, to ensure | ||
| 5| 1| // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from | ||
| 6| 1| // dependent conditions. | ||
| 7| 1| let is_true = std::env::args().len() == 1; | ||
| 8| 1| | ||
| 9| 1| let mut a: u8 = 0; | ||
| 10| 1| let mut b: u8 = 0; | ||
| 11| 1| if is_true { | ||
| 12| 1| a = 2; | ||
| 13| 1| b = 0; | ||
| 14| 1| } | ||
| ^0 | ||
| 15| 1| match (a, b) { | ||
| 16| | // Or patterns generate MIR `SwitchInt` with multiple targets to the same `BasicBlock`. | ||
| 17| | // This test confirms a fix for Issue #79569. | ||
| 18| 0| (0 | 1, 2 | 3) => {} | ||
| 19| 1| _ => {} | ||
| 20| | } | ||
| 21| 1| if is_true { | ||
| 22| 1| a = 0; | ||
| 23| 1| b = 0; | ||
| 24| 1| } | ||
| ^0 | ||
| 25| 1| match (a, b) { | ||
| 26| 0| (0 | 1, 2 | 3) => {} | ||
| 27| 1| _ => {} | ||
| 28| | } | ||
| 29| 1| if is_true { | ||
| 30| 1| a = 2; | ||
| 31| 1| b = 2; | ||
| 32| 1| } | ||
| ^0 | ||
| 33| 1| match (a, b) { | ||
| 34| 0| (0 | 1, 2 | 3) => {} | ||
| 35| 1| _ => {} | ||
| 36| | } | ||
| 37| 1| if is_true { | ||
| 38| 1| a = 0; | ||
| 39| 1| b = 2; | ||
| 40| 1| } | ||
| ^0 | ||
| 41| 1| match (a, b) { | ||
| 42| 1| (0 | 1, 2 | 3) => {} | ||
| 43| 0| _ => {} | ||
| 44| | } | ||
| 45| 1|} | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
...t/run-make-fulldeps/coverage-reports/expected_show_coverage_counters.match_or_pattern.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| Counter in file 0 3:1 -> 11:15, #1 | ||
| Counter in file 0 11:16 -> 14:6, #2 | ||
| Counter in file 0 14:6 -> 14:7, (#1 - #2) | ||
| Counter in file 0 15:11 -> 15:17, (#2 + (#1 - #2)) | ||
| Counter in file 0 18:27 -> 18:29, #5 | ||
| Counter in file 0 19:14 -> 19:16, (#3 + #4) | ||
| Counter in file 0 21:8 -> 21:15, ((#3 + #4) + #5) | ||
| Counter in file 0 21:16 -> 24:6, #6 | ||
| Counter in file 0 24:6 -> 24:7, (((#3 + #4) + #5) - #6) | ||
| Counter in file 0 25:11 -> 25:17, (#6 + (((#3 + #4) + #5) - #6)) | ||
| Counter in file 0 26:27 -> 26:29, #9 | ||
| Counter in file 0 27:14 -> 27:16, (#7 + #8) | ||
| Counter in file 0 29:8 -> 29:15, ((#7 + #8) + #9) | ||
| Counter in file 0 29:16 -> 32:6, #10 | ||
| Counter in file 0 32:6 -> 32:7, (((#7 + #8) + #9) - #10) | ||
| Counter in file 0 33:11 -> 33:17, (#10 + (((#7 + #8) + #9) - #10)) | ||
| Counter in file 0 34:27 -> 34:29, #13 | ||
| Counter in file 0 35:14 -> 35:16, (#11 + #12) | ||
| Counter in file 0 37:8 -> 37:15, ((#11 + #12) + #13) | ||
| Counter in file 0 37:16 -> 40:6, #14 | ||
| Counter in file 0 40:6 -> 40:7, (((#11 + #12) + #13) - #14) | ||
| Counter in file 0 41:11 -> 41:17, (#14 + (((#11 + #12) + #13) - #14)) | ||
| Counter in file 0 42:27 -> 42:29, #17 | ||
| Counter in file 0 43:14 -> 43:16, (#15 + #16) | ||
| Counter in file 0 45:1 -> 45:2, ((#15 + #16) + #17) | ||
| Emitting segments for file: ../coverage/match_or_pattern.rs | ||
| Combined regions: | ||
| 3:1 -> 11:15 (count=1) | ||
| 11:16 -> 14:6 (count=1) | ||
| 14:6 -> 14:7 (count=0) | ||
| 15:11 -> 15:17 (count=1) | ||
| 18:27 -> 18:29 (count=0) | ||
| 19:14 -> 19:16 (count=1) | ||
| 21:8 -> 21:15 (count=1) | ||
| 21:16 -> 24:6 (count=1) | ||
| 24:6 -> 24:7 (count=0) | ||
| 25:11 -> 25:17 (count=1) | ||
| 26:27 -> 26:29 (count=0) | ||
| 27:14 -> 27:16 (count=1) | ||
| 29:8 -> 29:15 (count=1) | ||
| 29:16 -> 32:6 (count=1) | ||
| 32:6 -> 32:7 (count=0) | ||
| 33:11 -> 33:17 (count=1) | ||
| 34:27 -> 34:29 (count=0) | ||
| 35:14 -> 35:16 (count=1) | ||
| 37:8 -> 37:15 (count=1) | ||
| 37:16 -> 40:6 (count=1) | ||
| 40:6 -> 40:7 (count=0) | ||
| 41:11 -> 41:17 (count=1) | ||
| 42:27 -> 42:29 (count=1) | ||
| 43:14 -> 43:16 (count=0) | ||
| 45:1 -> 45:2 (count=1) | ||
| Segment at 3:1 (count = 1), RegionEntry | ||
| Segment at 11:15 (count = 0), Skipped | ||
| Segment at 11:16 (count = 1), RegionEntry | ||
| Segment at 14:6 (count = 0), RegionEntry | ||
| Segment at 14:7 (count = 0), Skipped | ||
| Segment at 15:11 (count = 1), RegionEntry | ||
| Segment at 15:17 (count = 0), Skipped | ||
| Segment at 18:27 (count = 0), RegionEntry | ||
| Segment at 18:29 (count = 0), Skipped | ||
| Segment at 19:14 (count = 1), RegionEntry | ||
| Segment at 19:16 (count = 0), Skipped | ||
| Segment at 21:8 (count = 1), RegionEntry | ||
| Segment at 21:15 (count = 0), Skipped | ||
| Segment at 21:16 (count = 1), RegionEntry | ||
| Segment at 24:6 (count = 0), RegionEntry | ||
| Segment at 24:7 (count = 0), Skipped | ||
| Segment at 25:11 (count = 1), RegionEntry | ||
| Segment at 25:17 (count = 0), Skipped | ||
| Segment at 26:27 (count = 0), RegionEntry | ||
| Segment at 26:29 (count = 0), Skipped | ||
| Segment at 27:14 (count = 1), RegionEntry | ||
| Segment at 27:16 (count = 0), Skipped | ||
| Segment at 29:8 (count = 1), RegionEntry | ||
| Segment at 29:15 (count = 0), Skipped | ||
| Segment at 29:16 (count = 1), RegionEntry | ||
| Segment at 32:6 (count = 0), RegionEntry | ||
| Segment at 32:7 (count = 0), Skipped | ||
| Segment at 33:11 (count = 1), RegionEntry | ||
| Segment at 33:17 (count = 0), Skipped | ||
| Segment at 34:27 (count = 0), RegionEntry | ||
| Segment at 34:29 (count = 0), Skipped | ||
| Segment at 35:14 (count = 1), RegionEntry | ||
| Segment at 35:16 (count = 0), Skipped | ||
| Segment at 37:8 (count = 1), RegionEntry | ||
| Segment at 37:15 (count = 0), Skipped | ||
| Segment at 37:16 (count = 1), RegionEntry | ||
| Segment at 40:6 (count = 0), RegionEntry | ||
| Segment at 40:7 (count = 0), Skipped | ||
| Segment at 41:11 (count = 1), RegionEntry | ||
| Segment at 41:17 (count = 0), Skipped | ||
| Segment at 42:27 (count = 1), RegionEntry | ||
| Segment at 42:29 (count = 0), Skipped | ||
| Segment at 43:14 (count = 0), RegionEntry | ||
| Segment at 43:16 (count = 0), Skipped | ||
| Segment at 45:1 (count = 1), RegionEntry | ||
| Segment at 45:2 (count = 0), Skipped |
271 changes: 271 additions & 0 deletions
271
...xpected_mir_dump.match_or_pattern/match_or_pattern.main.-------.InstrumentCoverage.0.html
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #![feature(or_patterns)] | ||
|
|
||
| fn main() { | ||
| // Initialize test constants in a way that cannot be determined at compile time, to ensure | ||
| // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from | ||
| // dependent conditions. | ||
| let is_true = std::env::args().len() == 1; | ||
|
|
||
| let mut a: u8 = 0; | ||
| let mut b: u8 = 0; | ||
| if is_true { | ||
| a = 2; | ||
| b = 0; | ||
| } | ||
| match (a, b) { | ||
| // Or patterns generate MIR `SwitchInt` with multiple targets to the same `BasicBlock`. | ||
| // This test confirms a fix for Issue #79569. | ||
| (0 | 1, 2 | 3) => {} | ||
| _ => {} | ||
| } | ||
| if is_true { | ||
| a = 0; | ||
| b = 0; | ||
| } | ||
| match (a, b) { | ||
| (0 | 1, 2 | 3) => {} | ||
| _ => {} | ||
| } | ||
| if is_true { | ||
| a = 2; | ||
| b = 2; | ||
| } | ||
| match (a, b) { | ||
| (0 | 1, 2 | 3) => {} | ||
| _ => {} | ||
| } | ||
| if is_true { | ||
| a = 0; | ||
| b = 2; | ||
| } | ||
| match (a, b) { | ||
| (0 | 1, 2 | 3) => {} | ||
| _ => {} | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes in the counters file in async.txt are just another example of the non-deterministic ordering of output from
llvm-cov.These 4 lines (from 31-34) moved to line 50 when I added support for multiple
SwitchInttargets to the sameBasicBlock.The other lines moved after I updated
mod.rsto ignore MIR that starts withUnreachable.I don't think these changes should have had any real effect on the existing test results, and they don't except in this one test sample, and only in the debug counters.
The
Makefilebased test does not fail based on differences in counter files. So it's not a problem, but it would be nice to make these more deterministic in the future, perhaps by sorting the entire file before comparing.