2020-08-29 17:55:46 +00:00
|
|
|
use rustc_hir::def_id::DefId;
|
|
|
|
|
use rustc_middle::hir;
|
|
|
|
|
use rustc_middle::mir::*;
|
|
|
|
|
use rustc_middle::ty::TyCtxt;
|
|
|
|
|
use rustc_session::config::MirSpanview;
|
2020-09-04 03:31:18 +00:00
|
|
|
use rustc_span::{BytePos, Pos, Span, SyntaxContext};
|
2020-08-29 17:55:46 +00:00
|
|
|
|
2020-09-04 03:31:18 +00:00
|
|
|
use std::cmp;
|
2020-08-29 17:55:46 +00:00
|
|
|
use std::io::{self, Write};
|
|
|
|
|
|
|
|
|
|
pub const TOOLTIP_INDENT: &str = " ";
|
|
|
|
|
|
2020-09-04 03:31:18 +00:00
|
|
|
const CARET: char = '\u{2038}'; // Unicode `CARET`
|
|
|
|
|
const ANNOTATION_LEFT_BRACKET: char = '\u{298a}'; // Unicode `Z NOTATION RIGHT BINDING BRACKET
|
|
|
|
|
const ANNOTATION_RIGHT_BRACKET: char = '\u{2989}'; // Unicode `Z NOTATION LEFT BINDING BRACKET`
|
2020-08-29 17:55:46 +00:00
|
|
|
const NEW_LINE_SPAN: &str = "</span>\n<span class=\"line\">";
|
|
|
|
|
const HEADER: &str = r#"<!DOCTYPE html>
|
|
|
|
|
<html>
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
<head>"#;
|
|
|
|
|
const START_BODY: &str = r#"</head>
|
|
|
|
|
<body>"#;
|
|
|
|
|
const FOOTER: &str = r#"</body>
|
|
|
|
|
</html>"#;
|
|
|
|
|
|
|
|
|
|
const STYLE_SECTION: &str = r#"<style>
|
2020-08-29 17:55:46 +00:00
|
|
|
.line {
|
|
|
|
|
counter-increment: line;
|
|
|
|
|
}
|
|
|
|
|
.line:before {
|
|
|
|
|
content: counter(line) ": ";
|
|
|
|
|
font-family: Menlo, Monaco, monospace;
|
|
|
|
|
font-style: italic;
|
|
|
|
|
width: 3.8em;
|
|
|
|
|
display: inline-block;
|
|
|
|
|
text-align: right;
|
|
|
|
|
filter: opacity(50%);
|
|
|
|
|
-webkit-user-select: none;
|
|
|
|
|
}
|
|
|
|
|
.code {
|
|
|
|
|
color: #dddddd;
|
|
|
|
|
background-color: #222222;
|
|
|
|
|
font-family: Menlo, Monaco, monospace;
|
|
|
|
|
line-height: 1.4em;
|
|
|
|
|
border-bottom: 2px solid #222222;
|
|
|
|
|
white-space: pre;
|
|
|
|
|
display: inline-block;
|
|
|
|
|
}
|
|
|
|
|
.odd {
|
|
|
|
|
background-color: #55bbff;
|
|
|
|
|
color: #223311;
|
|
|
|
|
}
|
|
|
|
|
.even {
|
|
|
|
|
background-color: #ee7756;
|
|
|
|
|
color: #551133;
|
|
|
|
|
}
|
|
|
|
|
.code {
|
|
|
|
|
--index: calc(var(--layer) - 1);
|
|
|
|
|
padding-top: calc(var(--index) * 0.15em);
|
|
|
|
|
filter:
|
|
|
|
|
hue-rotate(calc(var(--index) * 25deg))
|
|
|
|
|
saturate(calc(100% - (var(--index) * 2%)))
|
|
|
|
|
brightness(calc(100% - (var(--index) * 1.5%)));
|
|
|
|
|
}
|
|
|
|
|
.annotation {
|
|
|
|
|
color: #4444ff;
|
|
|
|
|
font-family: monospace;
|
|
|
|
|
font-style: italic;
|
|
|
|
|
display: none;
|
|
|
|
|
-webkit-user-select: none;
|
|
|
|
|
}
|
|
|
|
|
body:active .annotation {
|
|
|
|
|
/* requires holding mouse down anywhere on the page */
|
|
|
|
|
display: inline-block;
|
|
|
|
|
}
|
|
|
|
|
span:hover .annotation {
|
|
|
|
|
/* requires hover over a span ONLY on its first line */
|
|
|
|
|
display: inline-block;
|
|
|
|
|
}
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
</style>"#;
|
2020-08-29 17:55:46 +00:00
|
|
|
|
|
|
|
|
/// Metadata to highlight the span of a MIR BasicBlock, Statement, or Terminator.
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
#[derive(Clone, Debug)]
|
2020-08-29 17:55:46 +00:00
|
|
|
pub struct SpanViewable {
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
pub bb: BasicBlock,
|
2020-08-29 17:55:46 +00:00
|
|
|
pub span: Span,
|
2020-09-04 03:31:18 +00:00
|
|
|
pub id: String,
|
2020-08-29 17:55:46 +00:00
|
|
|
pub tooltip: String,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Write a spanview HTML+CSS file to analyze MIR element spans.
|
|
|
|
|
pub fn write_mir_fn_spanview<'tcx, W>(
|
|
|
|
|
tcx: TyCtxt<'tcx>,
|
|
|
|
|
body: &Body<'tcx>,
|
|
|
|
|
spanview: MirSpanview,
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
title: &str,
|
2020-08-29 17:55:46 +00:00
|
|
|
w: &mut W,
|
|
|
|
|
) -> io::Result<()>
|
|
|
|
|
where
|
|
|
|
|
W: Write,
|
|
|
|
|
{
|
2020-10-04 22:22:23 +00:00
|
|
|
let def_id = body.source.def_id();
|
2021-04-25 00:22:29 +00:00
|
|
|
let hir_body = hir_body(tcx, def_id);
|
|
|
|
|
if hir_body.is_none() {
|
|
|
|
|
return Ok(());
|
|
|
|
|
}
|
|
|
|
|
let body_span = hir_body.unwrap().value.span;
|
2020-08-29 17:55:46 +00:00
|
|
|
let mut span_viewables = Vec::new();
|
|
|
|
|
for (bb, data) in body.basic_blocks().iter_enumerated() {
|
|
|
|
|
match spanview {
|
|
|
|
|
MirSpanview::Statement => {
|
|
|
|
|
for (i, statement) in data.statements.iter().enumerate() {
|
|
|
|
|
if let Some(span_viewable) =
|
|
|
|
|
statement_span_viewable(tcx, body_span, bb, i, statement)
|
|
|
|
|
{
|
|
|
|
|
span_viewables.push(span_viewable);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if let Some(span_viewable) = terminator_span_viewable(tcx, body_span, bb, data) {
|
|
|
|
|
span_viewables.push(span_viewable);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MirSpanview::Terminator => {
|
|
|
|
|
if let Some(span_viewable) = terminator_span_viewable(tcx, body_span, bb, data) {
|
|
|
|
|
span_viewables.push(span_viewable);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
MirSpanview::Block => {
|
|
|
|
|
if let Some(span_viewable) = block_span_viewable(tcx, body_span, bb, data) {
|
|
|
|
|
span_viewables.push(span_viewable);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-05-10 06:08:31 +00:00
|
|
|
write_document(tcx, fn_span(tcx, def_id), span_viewables, title, w)?;
|
2020-08-29 17:55:46 +00:00
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Generate a spanview HTML+CSS document for the given local function `def_id`, and a pre-generated
|
|
|
|
|
/// list `SpanViewable`s.
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
pub fn write_document<'tcx, W>(
|
2020-08-29 17:55:46 +00:00
|
|
|
tcx: TyCtxt<'tcx>,
|
2021-05-10 06:08:31 +00:00
|
|
|
spanview_span: Span,
|
2020-08-29 17:55:46 +00:00
|
|
|
mut span_viewables: Vec<SpanViewable>,
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
title: &str,
|
2020-08-29 17:55:46 +00:00
|
|
|
w: &mut W,
|
|
|
|
|
) -> io::Result<()>
|
|
|
|
|
where
|
|
|
|
|
W: Write,
|
|
|
|
|
{
|
2021-05-10 06:08:31 +00:00
|
|
|
let mut from_pos = spanview_span.lo();
|
|
|
|
|
let end_pos = spanview_span.hi();
|
2020-08-29 17:55:46 +00:00
|
|
|
let source_map = tcx.sess.source_map();
|
2020-09-04 03:31:18 +00:00
|
|
|
let start = source_map.lookup_char_pos(from_pos);
|
|
|
|
|
let indent_to_initial_start_col = " ".repeat(start.col.to_usize());
|
|
|
|
|
debug!(
|
2021-05-10 06:08:31 +00:00
|
|
|
"spanview_span={:?}; source is:\n{}{}",
|
|
|
|
|
spanview_span,
|
2020-09-04 03:31:18 +00:00
|
|
|
indent_to_initial_start_col,
|
2021-05-10 06:08:31 +00:00
|
|
|
source_map.span_to_snippet(spanview_span).expect("function should have printable source")
|
2020-09-04 03:31:18 +00:00
|
|
|
);
|
|
|
|
|
writeln!(w, "{}", HEADER)?;
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
writeln!(w, "<title>{}</title>", title)?;
|
|
|
|
|
writeln!(w, "{}", STYLE_SECTION)?;
|
|
|
|
|
writeln!(w, "{}", START_BODY)?;
|
2020-08-29 17:55:46 +00:00
|
|
|
write!(
|
|
|
|
|
w,
|
|
|
|
|
r#"<div class="code" style="counter-reset: line {}"><span class="line">{}"#,
|
|
|
|
|
start.line - 1,
|
2020-09-04 03:31:18 +00:00
|
|
|
indent_to_initial_start_col,
|
2020-08-29 17:55:46 +00:00
|
|
|
)?;
|
|
|
|
|
span_viewables.sort_unstable_by(|a, b| {
|
|
|
|
|
let a = a.span;
|
|
|
|
|
let b = b.span;
|
|
|
|
|
if a.lo() == b.lo() {
|
|
|
|
|
// Sort hi() in reverse order so shorter spans are attempted after longer spans.
|
|
|
|
|
// This should give shorter spans a higher "layer", so they are not covered by
|
|
|
|
|
// the longer spans.
|
|
|
|
|
b.hi().partial_cmp(&a.hi())
|
|
|
|
|
} else {
|
|
|
|
|
a.lo().partial_cmp(&b.lo())
|
|
|
|
|
}
|
|
|
|
|
.unwrap()
|
|
|
|
|
});
|
2020-09-04 03:31:18 +00:00
|
|
|
let mut ordered_viewables = &span_viewables[..];
|
|
|
|
|
const LOWEST_VIEWABLE_LAYER: usize = 1;
|
2020-08-29 17:55:46 +00:00
|
|
|
let mut alt = false;
|
2020-09-04 03:31:18 +00:00
|
|
|
while ordered_viewables.len() > 0 {
|
|
|
|
|
debug!(
|
|
|
|
|
"calling write_next_viewable with from_pos={}, end_pos={}, and viewables len={}",
|
|
|
|
|
from_pos.to_usize(),
|
|
|
|
|
end_pos.to_usize(),
|
|
|
|
|
ordered_viewables.len()
|
|
|
|
|
);
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
let curr_id = &ordered_viewables[0].id;
|
2020-09-04 03:31:18 +00:00
|
|
|
let (next_from_pos, next_ordered_viewables) = write_next_viewable_with_overlaps(
|
|
|
|
|
tcx,
|
|
|
|
|
from_pos,
|
|
|
|
|
end_pos,
|
|
|
|
|
ordered_viewables,
|
|
|
|
|
alt,
|
|
|
|
|
LOWEST_VIEWABLE_LAYER,
|
|
|
|
|
w,
|
|
|
|
|
)?;
|
|
|
|
|
debug!(
|
|
|
|
|
"DONE calling write_next_viewable, with new from_pos={}, \
|
|
|
|
|
and remaining viewables len={}",
|
|
|
|
|
next_from_pos.to_usize(),
|
|
|
|
|
next_ordered_viewables.len()
|
|
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
from_pos != next_from_pos || ordered_viewables.len() != next_ordered_viewables.len(),
|
|
|
|
|
"write_next_viewable_with_overlaps() must make a state change"
|
|
|
|
|
);
|
|
|
|
|
from_pos = next_from_pos;
|
|
|
|
|
if next_ordered_viewables.len() != ordered_viewables.len() {
|
|
|
|
|
ordered_viewables = next_ordered_viewables;
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
if let Some(next_ordered_viewable) = ordered_viewables.first() {
|
|
|
|
|
if &next_ordered_viewable.id != curr_id {
|
|
|
|
|
alt = !alt;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
}
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
if from_pos < end_pos {
|
|
|
|
|
write_coverage_gap(tcx, from_pos, end_pos, w)?;
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
writeln!(w, r#"</span></div>"#)?;
|
2020-08-29 17:55:46 +00:00
|
|
|
writeln!(w, "{}", FOOTER)?;
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Format a string showing the start line and column, and end line and column within a file.
|
|
|
|
|
pub fn source_range_no_file<'tcx>(tcx: TyCtxt<'tcx>, span: &Span) -> String {
|
|
|
|
|
let source_map = tcx.sess.source_map();
|
|
|
|
|
let start = source_map.lookup_char_pos(span.lo());
|
|
|
|
|
let end = source_map.lookup_char_pos(span.hi());
|
|
|
|
|
format!("{}:{}-{}:{}", start.line, start.col.to_usize() + 1, end.line, end.col.to_usize() + 1)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn statement_kind_name(statement: &Statement<'_>) -> &'static str {
|
|
|
|
|
use StatementKind::*;
|
|
|
|
|
match statement.kind {
|
|
|
|
|
Assign(..) => "Assign",
|
|
|
|
|
FakeRead(..) => "FakeRead",
|
|
|
|
|
SetDiscriminant { .. } => "SetDiscriminant",
|
|
|
|
|
StorageLive(..) => "StorageLive",
|
|
|
|
|
StorageDead(..) => "StorageDead",
|
|
|
|
|
LlvmInlineAsm(..) => "LlvmInlineAsm",
|
|
|
|
|
Retag(..) => "Retag",
|
|
|
|
|
AscribeUserType(..) => "AscribeUserType",
|
|
|
|
|
Coverage(..) => "Coverage",
|
2020-10-05 22:53:00 +00:00
|
|
|
CopyNonOverlapping(..) => "CopyNonOverlapping",
|
2020-08-29 17:55:46 +00:00
|
|
|
Nop => "Nop",
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub fn terminator_kind_name(term: &Terminator<'_>) -> &'static str {
|
|
|
|
|
use TerminatorKind::*;
|
|
|
|
|
match term.kind {
|
|
|
|
|
Goto { .. } => "Goto",
|
|
|
|
|
SwitchInt { .. } => "SwitchInt",
|
|
|
|
|
Resume => "Resume",
|
|
|
|
|
Abort => "Abort",
|
|
|
|
|
Return => "Return",
|
|
|
|
|
Unreachable => "Unreachable",
|
|
|
|
|
Drop { .. } => "Drop",
|
|
|
|
|
DropAndReplace { .. } => "DropAndReplace",
|
|
|
|
|
Call { .. } => "Call",
|
|
|
|
|
Assert { .. } => "Assert",
|
|
|
|
|
Yield { .. } => "Yield",
|
|
|
|
|
GeneratorDrop => "GeneratorDrop",
|
|
|
|
|
FalseEdge { .. } => "FalseEdge",
|
|
|
|
|
FalseUnwind { .. } => "FalseUnwind",
|
|
|
|
|
InlineAsm { .. } => "InlineAsm",
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn statement_span_viewable<'tcx>(
|
|
|
|
|
tcx: TyCtxt<'tcx>,
|
|
|
|
|
body_span: Span,
|
|
|
|
|
bb: BasicBlock,
|
|
|
|
|
i: usize,
|
|
|
|
|
statement: &Statement<'tcx>,
|
|
|
|
|
) -> Option<SpanViewable> {
|
|
|
|
|
let span = statement.source_info.span;
|
|
|
|
|
if !body_span.contains(span) {
|
|
|
|
|
return None;
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
let id = format!("{}[{}]", bb.index(), i);
|
|
|
|
|
let tooltip = tooltip(tcx, &id, span, vec![statement.clone()], &None);
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
Some(SpanViewable { bb, span, id, tooltip })
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn terminator_span_viewable<'tcx>(
|
|
|
|
|
tcx: TyCtxt<'tcx>,
|
|
|
|
|
body_span: Span,
|
|
|
|
|
bb: BasicBlock,
|
|
|
|
|
data: &BasicBlockData<'tcx>,
|
|
|
|
|
) -> Option<SpanViewable> {
|
|
|
|
|
let term = data.terminator();
|
|
|
|
|
let span = term.source_info.span;
|
|
|
|
|
if !body_span.contains(span) {
|
|
|
|
|
return None;
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
let id = format!("{}:{}", bb.index(), terminator_kind_name(term));
|
|
|
|
|
let tooltip = tooltip(tcx, &id, span, vec![], &data.terminator);
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
Some(SpanViewable { bb, span, id, tooltip })
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn block_span_viewable<'tcx>(
|
|
|
|
|
tcx: TyCtxt<'tcx>,
|
|
|
|
|
body_span: Span,
|
|
|
|
|
bb: BasicBlock,
|
|
|
|
|
data: &BasicBlockData<'tcx>,
|
|
|
|
|
) -> Option<SpanViewable> {
|
|
|
|
|
let span = compute_block_span(data, body_span);
|
|
|
|
|
if !body_span.contains(span) {
|
|
|
|
|
return None;
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
let id = format!("{}", bb.index());
|
|
|
|
|
let tooltip = tooltip(tcx, &id, span, data.statements.clone(), &data.terminator);
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
Some(SpanViewable { bb, span, id, tooltip })
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn compute_block_span<'tcx>(data: &BasicBlockData<'tcx>, body_span: Span) -> Span {
|
|
|
|
|
let mut span = data.terminator().source_info.span;
|
|
|
|
|
for statement_span in data.statements.iter().map(|statement| statement.source_info.span) {
|
2020-09-04 03:31:18 +00:00
|
|
|
// Only combine Spans from the root context, and within the function's body_span.
|
|
|
|
|
if statement_span.ctxt() == SyntaxContext::root() && body_span.contains(statement_span) {
|
2020-08-29 17:55:46 +00:00
|
|
|
span = span.to(statement_span);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
span
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Recursively process each ordered span. Spans that overlap will have progressively varying
|
|
|
|
|
/// styles, such as increased padding for each overlap. Non-overlapping adjacent spans will
|
|
|
|
|
/// have alternating style choices, to help distinguish between them if, visually adjacent.
|
|
|
|
|
/// The `layer` is incremented for each overlap, and the `alt` bool alternates between true
|
|
|
|
|
/// and false, for each adjacent non-overlapping span. Source code between the spans (code
|
|
|
|
|
/// that is not in any coverage region) has neutral styling.
|
2020-09-04 03:31:18 +00:00
|
|
|
fn write_next_viewable_with_overlaps<'tcx, 'b, W>(
|
2020-08-29 17:55:46 +00:00
|
|
|
tcx: TyCtxt<'tcx>,
|
2020-09-04 03:31:18 +00:00
|
|
|
mut from_pos: BytePos,
|
|
|
|
|
mut to_pos: BytePos,
|
|
|
|
|
ordered_viewables: &'b [SpanViewable],
|
2020-08-29 17:55:46 +00:00
|
|
|
alt: bool,
|
|
|
|
|
layer: usize,
|
|
|
|
|
w: &mut W,
|
2020-09-04 03:31:18 +00:00
|
|
|
) -> io::Result<(BytePos, &'b [SpanViewable])>
|
2020-08-29 17:55:46 +00:00
|
|
|
where
|
|
|
|
|
W: Write,
|
|
|
|
|
{
|
2020-09-04 03:31:18 +00:00
|
|
|
let debug_indent = " ".repeat(layer);
|
|
|
|
|
let (viewable, mut remaining_viewables) =
|
|
|
|
|
ordered_viewables.split_first().expect("ordered_viewables should have some");
|
|
|
|
|
|
|
|
|
|
if from_pos < viewable.span.lo() {
|
|
|
|
|
debug!(
|
|
|
|
|
"{}advance from_pos to next SpanViewable (from from_pos={} to viewable.span.lo()={} \
|
|
|
|
|
of {:?}), with to_pos={}",
|
|
|
|
|
debug_indent,
|
|
|
|
|
from_pos.to_usize(),
|
|
|
|
|
viewable.span.lo().to_usize(),
|
|
|
|
|
viewable.span,
|
|
|
|
|
to_pos.to_usize()
|
|
|
|
|
);
|
|
|
|
|
let hi = cmp::min(viewable.span.lo(), to_pos);
|
|
|
|
|
write_coverage_gap(tcx, from_pos, hi, w)?;
|
|
|
|
|
from_pos = hi;
|
|
|
|
|
if from_pos < viewable.span.lo() {
|
|
|
|
|
debug!(
|
|
|
|
|
"{}EARLY RETURN: stopped before getting to next SpanViewable, at {}",
|
|
|
|
|
debug_indent,
|
|
|
|
|
from_pos.to_usize()
|
|
|
|
|
);
|
|
|
|
|
return Ok((from_pos, ordered_viewables));
|
|
|
|
|
}
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
|
|
|
|
|
if from_pos < viewable.span.hi() {
|
|
|
|
|
// Set to_pos to the end of this `viewable` to ensure the recursive calls stop writing
|
|
|
|
|
// with room to print the tail.
|
|
|
|
|
to_pos = cmp::min(viewable.span.hi(), to_pos);
|
|
|
|
|
debug!(
|
|
|
|
|
"{}update to_pos (if not closer) to viewable.span.hi()={}; to_pos is now {}",
|
|
|
|
|
debug_indent,
|
|
|
|
|
viewable.span.hi().to_usize(),
|
|
|
|
|
to_pos.to_usize()
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-29 17:55:46 +00:00
|
|
|
let mut subalt = false;
|
2020-09-04 03:31:18 +00:00
|
|
|
while remaining_viewables.len() > 0 && remaining_viewables[0].span.overlaps(viewable.span) {
|
|
|
|
|
let overlapping_viewable = &remaining_viewables[0];
|
|
|
|
|
debug!("{}overlapping_viewable.span={:?}", debug_indent, overlapping_viewable.span);
|
|
|
|
|
|
|
|
|
|
let span =
|
|
|
|
|
trim_span(viewable.span, from_pos, cmp::min(overlapping_viewable.span.lo(), to_pos));
|
|
|
|
|
let mut some_html_snippet = if from_pos <= viewable.span.hi() || viewable.span.is_empty() {
|
|
|
|
|
// `viewable` is not yet fully rendered, so start writing the span, up to either the
|
|
|
|
|
// `to_pos` or the next `overlapping_viewable`, whichever comes first.
|
|
|
|
|
debug!(
|
|
|
|
|
"{}make html_snippet (may not write it if early exit) for partial span {:?} \
|
|
|
|
|
of viewable.span {:?}",
|
|
|
|
|
debug_indent, span, viewable.span
|
|
|
|
|
);
|
|
|
|
|
from_pos = span.hi();
|
|
|
|
|
make_html_snippet(tcx, span, Some(&viewable))
|
|
|
|
|
} else {
|
|
|
|
|
None
|
2020-08-29 17:55:46 +00:00
|
|
|
};
|
2020-09-04 03:31:18 +00:00
|
|
|
|
|
|
|
|
// Defer writing the HTML snippet (until after early return checks) ONLY for empty spans.
|
|
|
|
|
// An empty Span with Some(html_snippet) is probably a tail marker. If there is an early
|
|
|
|
|
// exit, there should be another opportunity to write the tail marker.
|
|
|
|
|
if !span.is_empty() {
|
|
|
|
|
if let Some(ref html_snippet) = some_html_snippet {
|
|
|
|
|
debug!(
|
|
|
|
|
"{}write html_snippet for that partial span of viewable.span {:?}",
|
|
|
|
|
debug_indent, viewable.span
|
|
|
|
|
);
|
|
|
|
|
write_span(html_snippet, &viewable.tooltip, alt, layer, w)?;
|
|
|
|
|
}
|
|
|
|
|
some_html_snippet = None;
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
|
|
|
|
|
if from_pos < overlapping_viewable.span.lo() {
|
|
|
|
|
debug!(
|
|
|
|
|
"{}EARLY RETURN: from_pos={} has not yet reached the \
|
|
|
|
|
overlapping_viewable.span {:?}",
|
|
|
|
|
debug_indent,
|
|
|
|
|
from_pos.to_usize(),
|
|
|
|
|
overlapping_viewable.span
|
|
|
|
|
);
|
|
|
|
|
// must have reached `to_pos` before reaching the start of the
|
|
|
|
|
// `overlapping_viewable.span`
|
|
|
|
|
return Ok((from_pos, ordered_viewables));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if from_pos == to_pos
|
|
|
|
|
&& !(from_pos == overlapping_viewable.span.lo() && overlapping_viewable.span.is_empty())
|
|
|
|
|
{
|
|
|
|
|
debug!(
|
|
|
|
|
"{}EARLY RETURN: from_pos=to_pos={} and overlapping_viewable.span {:?} is not \
|
|
|
|
|
empty, or not from_pos",
|
|
|
|
|
debug_indent,
|
|
|
|
|
to_pos.to_usize(),
|
|
|
|
|
overlapping_viewable.span
|
|
|
|
|
);
|
|
|
|
|
// `to_pos` must have occurred before the overlapping viewable. Return
|
|
|
|
|
// `ordered_viewables` so we can continue rendering the `viewable`, from after the
|
|
|
|
|
// `to_pos`.
|
|
|
|
|
return Ok((from_pos, ordered_viewables));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Some(ref html_snippet) = some_html_snippet {
|
|
|
|
|
debug!(
|
|
|
|
|
"{}write html_snippet for that partial span of viewable.span {:?}",
|
|
|
|
|
debug_indent, viewable.span
|
|
|
|
|
);
|
|
|
|
|
write_span(html_snippet, &viewable.tooltip, alt, layer, w)?;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
debug!(
|
|
|
|
|
"{}recursively calling write_next_viewable with from_pos={}, to_pos={}, \
|
|
|
|
|
and viewables len={}",
|
|
|
|
|
debug_indent,
|
|
|
|
|
from_pos.to_usize(),
|
|
|
|
|
to_pos.to_usize(),
|
|
|
|
|
remaining_viewables.len()
|
|
|
|
|
);
|
|
|
|
|
// Write the overlaps (and the overlaps' overlaps, if any) up to `to_pos`.
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
let curr_id = &remaining_viewables[0].id;
|
2020-09-04 03:31:18 +00:00
|
|
|
let (next_from_pos, next_remaining_viewables) = write_next_viewable_with_overlaps(
|
2020-08-29 17:55:46 +00:00
|
|
|
tcx,
|
2020-09-04 03:31:18 +00:00
|
|
|
from_pos,
|
|
|
|
|
to_pos,
|
|
|
|
|
&remaining_viewables,
|
2020-08-29 17:55:46 +00:00
|
|
|
subalt,
|
|
|
|
|
layer + 1,
|
|
|
|
|
w,
|
|
|
|
|
)?;
|
2020-09-04 03:31:18 +00:00
|
|
|
debug!(
|
|
|
|
|
"{}DONE recursively calling write_next_viewable, with new from_pos={}, and remaining \
|
|
|
|
|
viewables len={}",
|
|
|
|
|
debug_indent,
|
|
|
|
|
next_from_pos.to_usize(),
|
|
|
|
|
next_remaining_viewables.len()
|
|
|
|
|
);
|
|
|
|
|
assert!(
|
|
|
|
|
from_pos != next_from_pos
|
|
|
|
|
|| remaining_viewables.len() != next_remaining_viewables.len(),
|
|
|
|
|
"write_next_viewable_with_overlaps() must make a state change"
|
|
|
|
|
);
|
|
|
|
|
from_pos = next_from_pos;
|
|
|
|
|
if next_remaining_viewables.len() != remaining_viewables.len() {
|
|
|
|
|
remaining_viewables = next_remaining_viewables;
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
if let Some(next_ordered_viewable) = remaining_viewables.first() {
|
|
|
|
|
if &next_ordered_viewable.id != curr_id {
|
|
|
|
|
subalt = !subalt;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if from_pos <= viewable.span.hi() {
|
|
|
|
|
let span = trim_span(viewable.span, from_pos, to_pos);
|
|
|
|
|
debug!(
|
|
|
|
|
"{}After overlaps, writing (end span?) {:?} of viewable.span {:?}",
|
|
|
|
|
debug_indent, span, viewable.span
|
|
|
|
|
);
|
|
|
|
|
if let Some(ref html_snippet) = make_html_snippet(tcx, span, Some(&viewable)) {
|
|
|
|
|
from_pos = span.hi();
|
|
|
|
|
write_span(html_snippet, &viewable.tooltip, alt, layer, w)?;
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
debug!("{}RETURN: No more overlap", debug_indent);
|
|
|
|
|
Ok((
|
|
|
|
|
from_pos,
|
|
|
|
|
if from_pos < viewable.span.hi() { ordered_viewables } else { remaining_viewables },
|
|
|
|
|
))
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
2020-09-04 03:31:18 +00:00
|
|
|
#[inline(always)]
|
2020-08-29 17:55:46 +00:00
|
|
|
fn write_coverage_gap<'tcx, W>(
|
|
|
|
|
tcx: TyCtxt<'tcx>,
|
|
|
|
|
lo: BytePos,
|
|
|
|
|
hi: BytePos,
|
|
|
|
|
w: &mut W,
|
2020-09-04 03:31:18 +00:00
|
|
|
) -> io::Result<()>
|
2020-08-29 17:55:46 +00:00
|
|
|
where
|
|
|
|
|
W: Write,
|
|
|
|
|
{
|
2020-09-04 03:31:18 +00:00
|
|
|
let span = Span::with_root_ctxt(lo, hi);
|
|
|
|
|
if let Some(ref html_snippet) = make_html_snippet(tcx, span, None) {
|
|
|
|
|
write_span(html_snippet, "", false, 0, w)
|
|
|
|
|
} else {
|
|
|
|
|
Ok(())
|
|
|
|
|
}
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
2020-09-04 03:31:18 +00:00
|
|
|
fn write_span<W>(
|
|
|
|
|
html_snippet: &str,
|
|
|
|
|
tooltip: &str,
|
2020-08-29 17:55:46 +00:00
|
|
|
alt: bool,
|
|
|
|
|
layer: usize,
|
|
|
|
|
w: &mut W,
|
2020-09-04 03:31:18 +00:00
|
|
|
) -> io::Result<()>
|
2020-08-29 17:55:46 +00:00
|
|
|
where
|
|
|
|
|
W: Write,
|
|
|
|
|
{
|
2020-09-04 03:31:18 +00:00
|
|
|
let maybe_alt_class = if layer > 0 {
|
2020-08-29 17:55:46 +00:00
|
|
|
if alt { " odd" } else { " even" }
|
|
|
|
|
} else {
|
|
|
|
|
""
|
|
|
|
|
};
|
2020-09-04 03:31:18 +00:00
|
|
|
let maybe_title_attr = if !tooltip.is_empty() {
|
2020-08-29 17:55:46 +00:00
|
|
|
format!(" title=\"{}\"", escape_attr(tooltip))
|
|
|
|
|
} else {
|
|
|
|
|
"".to_owned()
|
|
|
|
|
};
|
|
|
|
|
if layer == 1 {
|
|
|
|
|
write!(w, "<span>")?;
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
for (i, line) in html_snippet.lines().enumerate() {
|
2020-08-29 17:55:46 +00:00
|
|
|
if i > 0 {
|
|
|
|
|
write!(w, "{}", NEW_LINE_SPAN)?;
|
|
|
|
|
}
|
|
|
|
|
write!(
|
|
|
|
|
w,
|
|
|
|
|
r#"<span class="code{}" style="--layer: {}"{}>{}</span>"#,
|
2020-09-04 03:31:18 +00:00
|
|
|
maybe_alt_class, layer, maybe_title_attr, line
|
2020-08-29 17:55:46 +00:00
|
|
|
)?;
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
// Check for and translate trailing newlines, because `str::lines()` ignores them
|
|
|
|
|
if html_snippet.ends_with('\n') {
|
|
|
|
|
write!(w, "{}", NEW_LINE_SPAN)?;
|
|
|
|
|
}
|
2020-08-29 17:55:46 +00:00
|
|
|
if layer == 1 {
|
|
|
|
|
write!(w, "</span>")?;
|
|
|
|
|
}
|
2020-09-04 03:31:18 +00:00
|
|
|
Ok(())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn make_html_snippet<'tcx>(
|
|
|
|
|
tcx: TyCtxt<'tcx>,
|
|
|
|
|
span: Span,
|
|
|
|
|
some_viewable: Option<&SpanViewable>,
|
|
|
|
|
) -> Option<String> {
|
|
|
|
|
let source_map = tcx.sess.source_map();
|
|
|
|
|
let snippet = source_map
|
|
|
|
|
.span_to_snippet(span)
|
|
|
|
|
.unwrap_or_else(|err| bug!("span_to_snippet error for span {:?}: {:?}", span, err));
|
|
|
|
|
let html_snippet = if let Some(viewable) = some_viewable {
|
|
|
|
|
let is_head = span.lo() == viewable.span.lo();
|
|
|
|
|
let is_tail = span.hi() == viewable.span.hi();
|
|
|
|
|
let mut labeled_snippet = if is_head {
|
|
|
|
|
format!(r#"<span class="annotation">{}{}</span>"#, viewable.id, ANNOTATION_LEFT_BRACKET)
|
|
|
|
|
} else {
|
|
|
|
|
"".to_owned()
|
|
|
|
|
};
|
|
|
|
|
if span.is_empty() {
|
|
|
|
|
if is_head && is_tail {
|
|
|
|
|
labeled_snippet.push(CARET);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
labeled_snippet.push_str(&escape_html(&snippet));
|
|
|
|
|
};
|
|
|
|
|
if is_tail {
|
|
|
|
|
labeled_snippet.push_str(&format!(
|
|
|
|
|
r#"<span class="annotation">{}{}</span>"#,
|
|
|
|
|
ANNOTATION_RIGHT_BRACKET, viewable.id
|
|
|
|
|
));
|
|
|
|
|
}
|
|
|
|
|
labeled_snippet
|
|
|
|
|
} else {
|
|
|
|
|
escape_html(&snippet)
|
|
|
|
|
};
|
|
|
|
|
if html_snippet.is_empty() { None } else { Some(html_snippet) }
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn tooltip<'tcx>(
|
|
|
|
|
tcx: TyCtxt<'tcx>,
|
2020-09-04 03:31:18 +00:00
|
|
|
spanview_id: &str,
|
2020-08-29 17:55:46 +00:00
|
|
|
span: Span,
|
|
|
|
|
statements: Vec<Statement<'tcx>>,
|
|
|
|
|
terminator: &Option<Terminator<'tcx>>,
|
|
|
|
|
) -> String {
|
|
|
|
|
let source_map = tcx.sess.source_map();
|
|
|
|
|
let mut text = Vec::new();
|
2021-05-03 00:14:25 +00:00
|
|
|
text.push(format!("{}: {}:", spanview_id, &source_map.span_to_embeddable_string(span)));
|
2020-08-29 17:55:46 +00:00
|
|
|
for statement in statements {
|
|
|
|
|
let source_range = source_range_no_file(tcx, &statement.source_info.span);
|
|
|
|
|
text.push(format!(
|
|
|
|
|
"\n{}{}: {}: {}",
|
|
|
|
|
TOOLTIP_INDENT,
|
|
|
|
|
source_range,
|
|
|
|
|
statement_kind_name(&statement),
|
|
|
|
|
format!("{:?}", statement)
|
|
|
|
|
));
|
|
|
|
|
}
|
|
|
|
|
if let Some(term) = terminator {
|
|
|
|
|
let source_range = source_range_no_file(tcx, &term.source_info.span);
|
|
|
|
|
text.push(format!(
|
|
|
|
|
"\n{}{}: {}: {:?}",
|
|
|
|
|
TOOLTIP_INDENT,
|
|
|
|
|
source_range,
|
|
|
|
|
terminator_kind_name(term),
|
|
|
|
|
term.kind
|
|
|
|
|
));
|
|
|
|
|
}
|
|
|
|
|
text.join("")
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-04 03:31:18 +00:00
|
|
|
fn trim_span(span: Span, from_pos: BytePos, to_pos: BytePos) -> Span {
|
|
|
|
|
trim_span_hi(trim_span_lo(span, from_pos), to_pos)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn trim_span_lo(span: Span, from_pos: BytePos) -> Span {
|
|
|
|
|
if from_pos <= span.lo() { span } else { span.with_lo(cmp::min(span.hi(), from_pos)) }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn trim_span_hi(span: Span, to_pos: BytePos) -> Span {
|
|
|
|
|
if to_pos >= span.hi() { span } else { span.with_hi(cmp::max(span.lo(), to_pos)) }
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-29 17:55:46 +00:00
|
|
|
fn fn_span<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> Span {
|
|
|
|
|
let hir_id =
|
|
|
|
|
tcx.hir().local_def_id_to_hir_id(def_id.as_local().expect("expected DefId is local"));
|
2020-09-04 03:31:18 +00:00
|
|
|
let fn_decl_span = tcx.hir().span(hir_id);
|
2021-04-25 00:22:29 +00:00
|
|
|
if let Some(body_span) = hir_body(tcx, def_id).map(|hir_body| hir_body.value.span) {
|
|
|
|
|
if fn_decl_span.ctxt() == body_span.ctxt() { fn_decl_span.to(body_span) } else { body_span }
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
} else {
|
2021-04-25 00:22:29 +00:00
|
|
|
fn_decl_span
|
Updates to experimental coverage counter injection
This is a combination of 18 commits.
Commit #2:
Additional examples and some small improvements.
Commit #3:
fixed mir-opt non-mir extensions and spanview title elements
Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)
Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.
Commit #4:
added more test examples
also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.
Commit #5:
Fixed rare issues after testing on real-world crate
Commit #6:
Addressed PR feedback, and removed temporary -Zexperimental-coverage
-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.
Also fixed a bug in spanview.
Commit #7:
Fix closure handling, add tests for closures and inner items
And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.
Commit #8:
renamed "typical" test results "expected"
Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.
Commit #9:
test coverage of inline generic struct function
Commit #10:
Addressed review feedback
* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal
Commit #11:
refactoring based on feedback
* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs
Commit #12:
Optimized use of SourceMap and SourceFile
Commit #13:
Fixed a regression, and synched with upstream
Some generated test file names changed due to some new change upstream.
Commit #14:
Stripping out crate disambiguators from demangled names
These can vary depending on the test platform.
Commit #15:
Ignore llvm-cov show diff on test with generics, expand IO error message
Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.
I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.
Commit #16:
Modify rust-demangler to strip disambiguators by default
Commit #17:
Remove std::process::exit from coverage tests
Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.
Commit #18:
fix: test file paths exceeding Windows max path len
2020-09-01 23:15:17 +00:00
|
|
|
}
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
2021-04-25 00:22:29 +00:00
|
|
|
fn hir_body<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> Option<&'tcx rustc_hir::Body<'tcx>> {
|
2020-08-29 17:55:46 +00:00
|
|
|
let hir_node = tcx.hir().get_if_local(def_id).expect("expected DefId is local");
|
2021-04-25 00:22:29 +00:00
|
|
|
hir::map::associated_body(hir_node).map(|fn_body_id| tcx.hir().body(fn_body_id))
|
2020-08-29 17:55:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn escape_html(s: &str) -> String {
|
|
|
|
|
s.replace("&", "&").replace("<", "<").replace(">", ">")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn escape_attr(s: &str) -> String {
|
|
|
|
|
s.replace("&", "&")
|
|
|
|
|
.replace("\"", """)
|
|
|
|
|
.replace("'", "'")
|
|
|
|
|
.replace("<", "<")
|
|
|
|
|
.replace(">", ">")
|
|
|
|
|
}
|