2023-06-12 03:07:04 -05:00
|
|
|
$DIR/auxiliary/used_crate.rs:
|
2023-08-15 21:42:33 -05:00
|
|
|
LL| |#![allow(unused_assignments, unused_variables)]
|
|
|
|
LL| |// compile-flags: -C opt-level=3
|
|
|
|
LL| |use std::fmt::Debug; // ^^ validates coverage now works with optimizations
|
|
|
|
LL| |
|
|
|
|
LL| 1|pub fn used_function() {
|
|
|
|
LL| 1| // Initialize test constants in a way that cannot be determined at compile time, to ensure
|
|
|
|
LL| 1| // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
|
|
|
|
LL| 1| // dependent conditions.
|
|
|
|
LL| 1| let is_true = std::env::args().len() == 1;
|
|
|
|
LL| 1| let mut countdown = 0;
|
|
|
|
LL| 1| if is_true {
|
|
|
|
LL| 1| countdown = 10;
|
|
|
|
LL| 1| }
|
2020-12-02 01:01:26 -06:00
|
|
|
^0
|
2023-08-15 21:42:33 -05:00
|
|
|
LL| 1| use_this_lib_crate();
|
|
|
|
LL| 1|}
|
|
|
|
LL| |
|
|
|
|
LL| 2|pub fn used_only_from_bin_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
LL| 2| println!("used_only_from_bin_crate_generic_function with {:?}", arg);
|
|
|
|
LL| 2|}
|
2020-12-02 17:39:40 -06:00
|
|
|
------------------
|
2023-05-04 02:30:09 -05:00
|
|
|
| Unexecuted instantiation: used_crate::used_only_from_bin_crate_generic_function::<_>
|
|
|
|
------------------
|
|
|
|
| used_crate::used_only_from_bin_crate_generic_function::<&alloc::vec::Vec<i32>>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_only_from_bin_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_only_from_bin_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
2020-12-02 17:39:40 -06:00
|
|
|
------------------
|
2023-05-04 02:30:09 -05:00
|
|
|
| used_crate::used_only_from_bin_crate_generic_function::<&str>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_only_from_bin_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_only_from_bin_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
coverage bug fixes and optimization support
Adjusted LLVM codegen for code compiled with `-Zinstrument-coverage` to
address multiple, somewhat related issues.
Fixed a significant flaw in prior coverage solution: Every counter
generated a new counter variable, but there should have only been one
counter variable per function. This appears to have bloated .profraw
files significantly. (For a small program, it increased the size by
about 40%. I have not tested large programs, but there is anecdotal
evidence that profraw files were way too large. This is a good fix,
regardless, but hopefully it also addresses related issues.
Fixes: #82144
Invalid LLVM coverage data produced when compiled with -C opt-level=1
Existing tests now work up to at least `opt-level=3`. This required a
detailed analysis of the LLVM IR, comparisons with Clang C++ LLVM IR
when compiled with coverage, and a lot of trial and error with codegen
adjustments.
The biggest hurdle was figuring out how to continue to support coverage
results for unused functions and generics. Rust's coverage results have
three advantages over Clang's coverage results:
1. Rust's coverage map does not include any overlapping code regions,
making coverage counting unambiguous.
2. Rust generates coverage results (showing zero counts) for all unused
functions, including generics. (Clang does not generate coverage for
uninstantiated template functions.)
3. Rust's unused functions produce minimal stubbed functions in LLVM IR,
sufficient for including in the coverage results; while Clang must
generate the complete LLVM IR for each unused function, even though
it will never be called.
This PR removes the previous hack of attempting to inject coverage into
some other existing function instance, and generates dedicated instances
for each unused function. This change, and a few other adjustments
(similar to what is required for `-C link-dead-code`, but with lower
impact), makes it possible to support LLVM optimizations.
Fixes: #79651
Coverage report: "Unexecuted instantiation:..." for a generic function
from multiple crates
Fixed by removing the aforementioned hack. Some "Unexecuted
instantiation" notices are unavoidable, as explained in the
`used_crate.rs` test, but `-Zinstrument-coverage` has new options to
back off support for either unused generics, or all unused functions,
which avoids the notice, at the cost of less coverage of unused
functions.
Fixes: #82875
Invalid LLVM coverage data produced with crate brotli_decompressor
Fixed by disabling the LLVM function attribute that forces inlining, if
`-Z instrument-coverage` is enabled. This attribute is applied to
Rust functions with `#[inline(always)], and in some cases, the forced
inlining breaks coverage instrumentation and reports.
2021-03-15 18:32:45 -05:00
|
|
|
------------------
|
2023-08-15 21:42:33 -05:00
|
|
|
LL| |// Expect for above function: `Unexecuted instantiation` (see below)
|
|
|
|
LL| 2|pub fn used_only_from_this_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
LL| 2| println!("used_only_from_this_lib_crate_generic_function with {:?}", arg);
|
|
|
|
LL| 2|}
|
2020-12-02 01:01:26 -06:00
|
|
|
------------------
|
2023-05-04 02:30:09 -05:00
|
|
|
| used_crate::used_only_from_this_lib_crate_generic_function::<&str>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_only_from_this_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_only_from_this_lib_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
2020-12-02 01:01:26 -06:00
|
|
|
------------------
|
2023-05-04 02:30:09 -05:00
|
|
|
| used_crate::used_only_from_this_lib_crate_generic_function::<alloc::vec::Vec<i32>>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_only_from_this_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_only_from_this_lib_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
2020-12-02 01:01:26 -06:00
|
|
|
------------------
|
2023-08-15 21:42:33 -05:00
|
|
|
LL| |
|
|
|
|
LL| 2|pub fn used_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
LL| 2| println!("used_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
|
|
|
|
LL| 2|}
|
2020-12-02 17:39:40 -06:00
|
|
|
------------------
|
2023-05-04 02:30:09 -05:00
|
|
|
| used_crate::used_from_bin_crate_and_lib_crate_generic_function::<&str>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
2020-12-02 17:39:40 -06:00
|
|
|
------------------
|
2023-05-04 02:30:09 -05:00
|
|
|
| used_crate::used_from_bin_crate_and_lib_crate_generic_function::<alloc::vec::Vec<i32>>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
2020-12-02 17:39:40 -06:00
|
|
|
------------------
|
2023-08-15 21:42:33 -05:00
|
|
|
LL| |
|
|
|
|
LL| 2|pub fn used_with_same_type_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
LL| 2| println!("used_with_same_type_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
|
|
|
|
LL| 2|}
|
coverage bug fixes and optimization support
Adjusted LLVM codegen for code compiled with `-Zinstrument-coverage` to
address multiple, somewhat related issues.
Fixed a significant flaw in prior coverage solution: Every counter
generated a new counter variable, but there should have only been one
counter variable per function. This appears to have bloated .profraw
files significantly. (For a small program, it increased the size by
about 40%. I have not tested large programs, but there is anecdotal
evidence that profraw files were way too large. This is a good fix,
regardless, but hopefully it also addresses related issues.
Fixes: #82144
Invalid LLVM coverage data produced when compiled with -C opt-level=1
Existing tests now work up to at least `opt-level=3`. This required a
detailed analysis of the LLVM IR, comparisons with Clang C++ LLVM IR
when compiled with coverage, and a lot of trial and error with codegen
adjustments.
The biggest hurdle was figuring out how to continue to support coverage
results for unused functions and generics. Rust's coverage results have
three advantages over Clang's coverage results:
1. Rust's coverage map does not include any overlapping code regions,
making coverage counting unambiguous.
2. Rust generates coverage results (showing zero counts) for all unused
functions, including generics. (Clang does not generate coverage for
uninstantiated template functions.)
3. Rust's unused functions produce minimal stubbed functions in LLVM IR,
sufficient for including in the coverage results; while Clang must
generate the complete LLVM IR for each unused function, even though
it will never be called.
This PR removes the previous hack of attempting to inject coverage into
some other existing function instance, and generates dedicated instances
for each unused function. This change, and a few other adjustments
(similar to what is required for `-C link-dead-code`, but with lower
impact), makes it possible to support LLVM optimizations.
Fixes: #79651
Coverage report: "Unexecuted instantiation:..." for a generic function
from multiple crates
Fixed by removing the aforementioned hack. Some "Unexecuted
instantiation" notices are unavoidable, as explained in the
`used_crate.rs` test, but `-Zinstrument-coverage` has new options to
back off support for either unused generics, or all unused functions,
which avoids the notice, at the cost of less coverage of unused
functions.
Fixes: #82875
Invalid LLVM coverage data produced with crate brotli_decompressor
Fixed by disabling the LLVM function attribute that forces inlining, if
`-Z instrument-coverage` is enabled. This attribute is applied to
Rust functions with `#[inline(always)], and in some cases, the forced
inlining breaks coverage instrumentation and reports.
2021-03-15 18:32:45 -05:00
|
|
|
------------------
|
|
|
|
| used_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function::<&str>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_with_same_type_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_with_same_type_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
coverage bug fixes and optimization support
Adjusted LLVM codegen for code compiled with `-Zinstrument-coverage` to
address multiple, somewhat related issues.
Fixed a significant flaw in prior coverage solution: Every counter
generated a new counter variable, but there should have only been one
counter variable per function. This appears to have bloated .profraw
files significantly. (For a small program, it increased the size by
about 40%. I have not tested large programs, but there is anecdotal
evidence that profraw files were way too large. This is a good fix,
regardless, but hopefully it also addresses related issues.
Fixes: #82144
Invalid LLVM coverage data produced when compiled with -C opt-level=1
Existing tests now work up to at least `opt-level=3`. This required a
detailed analysis of the LLVM IR, comparisons with Clang C++ LLVM IR
when compiled with coverage, and a lot of trial and error with codegen
adjustments.
The biggest hurdle was figuring out how to continue to support coverage
results for unused functions and generics. Rust's coverage results have
three advantages over Clang's coverage results:
1. Rust's coverage map does not include any overlapping code regions,
making coverage counting unambiguous.
2. Rust generates coverage results (showing zero counts) for all unused
functions, including generics. (Clang does not generate coverage for
uninstantiated template functions.)
3. Rust's unused functions produce minimal stubbed functions in LLVM IR,
sufficient for including in the coverage results; while Clang must
generate the complete LLVM IR for each unused function, even though
it will never be called.
This PR removes the previous hack of attempting to inject coverage into
some other existing function instance, and generates dedicated instances
for each unused function. This change, and a few other adjustments
(similar to what is required for `-C link-dead-code`, but with lower
impact), makes it possible to support LLVM optimizations.
Fixes: #79651
Coverage report: "Unexecuted instantiation:..." for a generic function
from multiple crates
Fixed by removing the aforementioned hack. Some "Unexecuted
instantiation" notices are unavoidable, as explained in the
`used_crate.rs` test, but `-Zinstrument-coverage` has new options to
back off support for either unused generics, or all unused functions,
which avoids the notice, at the cost of less coverage of unused
functions.
Fixes: #82875
Invalid LLVM coverage data produced with crate brotli_decompressor
Fixed by disabling the LLVM function attribute that forces inlining, if
`-Z instrument-coverage` is enabled. This attribute is applied to
Rust functions with `#[inline(always)], and in some cases, the forced
inlining breaks coverage instrumentation and reports.
2021-03-15 18:32:45 -05:00
|
|
|
------------------
|
|
|
|
| used_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function::<&str>:
|
2023-08-15 21:42:33 -05:00
|
|
|
| LL| 1|pub fn used_with_same_type_from_bin_crate_and_lib_crate_generic_function<T: Debug>(arg: T) {
|
|
|
|
| LL| 1| println!("used_with_same_type_from_bin_crate_and_lib_crate_generic_function with {:?}", arg);
|
|
|
|
| LL| 1|}
|
coverage bug fixes and optimization support
Adjusted LLVM codegen for code compiled with `-Zinstrument-coverage` to
address multiple, somewhat related issues.
Fixed a significant flaw in prior coverage solution: Every counter
generated a new counter variable, but there should have only been one
counter variable per function. This appears to have bloated .profraw
files significantly. (For a small program, it increased the size by
about 40%. I have not tested large programs, but there is anecdotal
evidence that profraw files were way too large. This is a good fix,
regardless, but hopefully it also addresses related issues.
Fixes: #82144
Invalid LLVM coverage data produced when compiled with -C opt-level=1
Existing tests now work up to at least `opt-level=3`. This required a
detailed analysis of the LLVM IR, comparisons with Clang C++ LLVM IR
when compiled with coverage, and a lot of trial and error with codegen
adjustments.
The biggest hurdle was figuring out how to continue to support coverage
results for unused functions and generics. Rust's coverage results have
three advantages over Clang's coverage results:
1. Rust's coverage map does not include any overlapping code regions,
making coverage counting unambiguous.
2. Rust generates coverage results (showing zero counts) for all unused
functions, including generics. (Clang does not generate coverage for
uninstantiated template functions.)
3. Rust's unused functions produce minimal stubbed functions in LLVM IR,
sufficient for including in the coverage results; while Clang must
generate the complete LLVM IR for each unused function, even though
it will never be called.
This PR removes the previous hack of attempting to inject coverage into
some other existing function instance, and generates dedicated instances
for each unused function. This change, and a few other adjustments
(similar to what is required for `-C link-dead-code`, but with lower
impact), makes it possible to support LLVM optimizations.
Fixes: #79651
Coverage report: "Unexecuted instantiation:..." for a generic function
from multiple crates
Fixed by removing the aforementioned hack. Some "Unexecuted
instantiation" notices are unavoidable, as explained in the
`used_crate.rs` test, but `-Zinstrument-coverage` has new options to
back off support for either unused generics, or all unused functions,
which avoids the notice, at the cost of less coverage of unused
functions.
Fixes: #82875
Invalid LLVM coverage data produced with crate brotli_decompressor
Fixed by disabling the LLVM function attribute that forces inlining, if
`-Z instrument-coverage` is enabled. This attribute is applied to
Rust functions with `#[inline(always)], and in some cases, the forced
inlining breaks coverage instrumentation and reports.
2021-03-15 18:32:45 -05:00
|
|
|
------------------
|
2023-08-15 21:42:33 -05:00
|
|
|
LL| |
|
|
|
|
LL| 0|pub fn unused_generic_function<T: Debug>(arg: T) {
|
|
|
|
LL| 0| println!("unused_generic_function with {:?}", arg);
|
|
|
|
LL| 0|}
|
|
|
|
LL| |
|
|
|
|
LL| 0|pub fn unused_function() {
|
|
|
|
LL| 0| let is_true = std::env::args().len() == 1;
|
|
|
|
LL| 0| let mut countdown = 2;
|
|
|
|
LL| 0| if !is_true {
|
|
|
|
LL| 0| countdown = 20;
|
|
|
|
LL| 0| }
|
|
|
|
LL| 0|}
|
|
|
|
LL| |
|
|
|
|
LL| 0|fn unused_private_function() {
|
|
|
|
LL| 0| let is_true = std::env::args().len() == 1;
|
|
|
|
LL| 0| let mut countdown = 2;
|
|
|
|
LL| 0| if !is_true {
|
|
|
|
LL| 0| countdown = 20;
|
|
|
|
LL| 0| }
|
|
|
|
LL| 0|}
|
|
|
|
LL| |
|
|
|
|
LL| 1|fn use_this_lib_crate() {
|
|
|
|
LL| 1| used_from_bin_crate_and_lib_crate_generic_function("used from library used_crate.rs");
|
|
|
|
LL| 1| used_with_same_type_from_bin_crate_and_lib_crate_generic_function(
|
|
|
|
LL| 1| "used from library used_crate.rs",
|
|
|
|
LL| 1| );
|
|
|
|
LL| 1| let some_vec = vec![5, 6, 7, 8];
|
|
|
|
LL| 1| used_only_from_this_lib_crate_generic_function(some_vec);
|
|
|
|
LL| 1| used_only_from_this_lib_crate_generic_function("used ONLY from library used_crate.rs");
|
|
|
|
LL| 1|}
|
|
|
|
LL| |
|
|
|
|
LL| |// FIXME(#79651): "Unexecuted instantiation" errors appear in coverage results,
|
|
|
|
LL| |// for example:
|
|
|
|
LL| |//
|
|
|
|
LL| |// | Unexecuted instantiation: used_crate::used_only_from_bin_crate_generic_function::<_>
|
|
|
|
LL| |//
|
|
|
|
LL| |// These notices appear when `llvm-cov` shows instantiations. This may be a
|
|
|
|
LL| |// default option, but it can be suppressed with:
|
|
|
|
LL| |//
|
|
|
|
LL| |// ```shell
|
|
|
|
LL| |// $ `llvm-cov show --show-instantiations=0 ...`
|
|
|
|
LL| |// ```
|
|
|
|
LL| |//
|
|
|
|
LL| |// The notice is triggered because the function is unused by the library itself,
|
|
|
|
LL| |// and when the library is compiled, a synthetic function is generated, so
|
|
|
|
LL| |// unused function coverage can be reported. Coverage can be skipped for unused
|
|
|
|
LL| |// generic functions with:
|
|
|
|
LL| |//
|
|
|
|
LL| |// ```shell
|
|
|
|
LL| |// $ `rustc -Zunstable-options -C instrument-coverage=except-unused-generics ...`
|
|
|
|
LL| |// ```
|
|
|
|
LL| |//
|
|
|
|
LL| |// Even though this function is used by `uses_crate.rs` (and
|
|
|
|
LL| |// counted), with substitutions for `T`, those instantiations are only generated
|
|
|
|
LL| |// when the generic function is actually used (from the binary, not from this
|
|
|
|
LL| |// library crate). So the test result shows coverage for all instantiated
|
|
|
|
LL| |// versions and their generic type substitutions, plus the `Unexecuted
|
|
|
|
LL| |// instantiation` message for the non-substituted version. This is valid, but
|
|
|
|
LL| |// unfortunately a little confusing.
|
|
|
|
LL| |//
|
|
|
|
LL| |// The library crate has its own coverage map, and the only way to show unused
|
|
|
|
LL| |// coverage of a generic function is to include the generic function in the
|
|
|
|
LL| |// coverage map, marked as an "unused function". If the library were used by
|
|
|
|
LL| |// another binary that never used this generic function, then it would be valid
|
|
|
|
LL| |// to show the unused generic, with unknown substitution (`_`).
|
|
|
|
LL| |//
|
|
|
|
LL| |// The alternative is to exclude all generics from being included in the "unused
|
|
|
|
LL| |// functions" list, which would then omit coverage results for
|
|
|
|
LL| |// `unused_generic_function<T>()`, below.
|
2020-12-02 01:01:26 -06:00
|
|
|
|
2023-06-12 03:07:04 -05:00
|
|
|
$DIR/uses_crate.rs:
|
2023-08-15 21:42:33 -05:00
|
|
|
LL| |// This test was failing on Linux for a while due to #110393 somehow making
|
|
|
|
LL| |// the unused functions not instrumented, but it seems to be fine now.
|
|
|
|
LL| |
|
|
|
|
LL| |// Validates coverage now works with optimizations
|
|
|
|
LL| |// compile-flags: -C opt-level=3
|
|
|
|
LL| |
|
|
|
|
LL| |#![allow(unused_assignments, unused_variables)]
|
|
|
|
LL| |
|
|
|
|
LL| |// aux-build:used_crate.rs
|
|
|
|
LL| |extern crate used_crate;
|
|
|
|
LL| |
|
|
|
|
LL| 1|fn main() {
|
|
|
|
LL| 1| used_crate::used_function();
|
|
|
|
LL| 1| let some_vec = vec![1, 2, 3, 4];
|
|
|
|
LL| 1| used_crate::used_only_from_bin_crate_generic_function(&some_vec);
|
|
|
|
LL| 1| used_crate::used_only_from_bin_crate_generic_function("used from bin uses_crate.rs");
|
|
|
|
LL| 1| used_crate::used_from_bin_crate_and_lib_crate_generic_function(some_vec);
|
|
|
|
LL| 1| used_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function("interesting?");
|
|
|
|
LL| 1|}
|
2023-06-12 03:07:04 -05:00
|
|
|
|