Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add #[no_coverage] tests for nested functions #92695

Merged
merged 1 commit into from
Feb 8, 2022
Merged

Add #[no_coverage] tests for nested functions #92695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 58 additions & 8 deletions src/test/run-make-fulldeps/coverage-reports/expected_show_coverage.no_cov_crate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
6| | println!("called but not covered");
7| |}
8| |
9| |#[no_coverage]
10| |fn do_not_add_coverage_2() {
9| |fn do_not_add_coverage_2() {
10| | #![no_coverage]
wesleywiser marked this conversation as resolved.
Show resolved Hide resolved
11| | println!("called but not covered");
12| |}
13| |
Expand All @@ -28,10 +28,60 @@
28| 0| println!("not called but covered");
29| 0|}
30| |
31| 1|fn main() {
32| 1| do_not_add_coverage_1();
33| 1| do_not_add_coverage_2();
34| 1| add_coverage_1();
35| 1| add_coverage_2();
36| 1|}
31| |// FIXME: These test-cases illustrate confusing results of nested functions.
32| |// See https://github.com/rust-lang/rust/issues/93319
33| |mod nested_fns {
34| | #[no_coverage]
35| | pub fn outer_not_covered(is_true: bool) {
36| 1| fn inner(is_true: bool) {
37| 1| if is_true {
38| 1| println!("called and covered");
39| 1| } else {
40| 0| println!("absolutely not covered");
41| 0| }
42| 1| }
43| | println!("called but not covered");
44| | inner(is_true);
45| | }
46| |
47| 1| pub fn outer(is_true: bool) {
48| 1| println!("called and covered");
49| 1| inner_not_covered(is_true);
50| 1|
51| 1| #[no_coverage]
52| 1| fn inner_not_covered(is_true: bool) {
53| 1| if is_true {
54| 1| println!("called but not covered");
55| 1| } else {
56| 1| println!("absolutely not covered");
57| 1| }
58| 1| }
59| 1| }
60| |
61| 1| pub fn outer_both_covered(is_true: bool) {
62| 1| println!("called and covered");
63| 1| inner(is_true);
64| 1|
65| 1| fn inner(is_true: bool) {
66| 1| if is_true {
67| 1| println!("called and covered");
68| 1| } else {
69| 0| println!("absolutely not covered");
70| 0| }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding this @Swatinem !!

Interesting. I'm kind of surprised to see zeros here on lines 69-70 (correctly), given the reported issue with no_coverage on inner functions. LLVM tools must recognize the overlapping inner function range and, in that case, only reports coverage for the inner function's code range.

(I'm fairly certain there were tests for inner functions, so I'm happy to see at least that part is doing what is expected. It wasn't a total oversight.)

IMO, there's not a strong use case for no_coverage of inner functions, so while it is still a bug, it isn't an urgent one. And the no_coverage attribute is not stabilized (at this point).

71| 1| }
72| 1| }
73| |}
74| |
75| 1|fn main() {
76| 1| let is_true = std::env::args().len() == 1;
77| 1|
78| 1| do_not_add_coverage_1();
79| 1| do_not_add_coverage_2();
80| 1| add_coverage_1();
81| 1| add_coverage_2();
82| 1|
83| 1| nested_fns::outer_not_covered(is_true);
84| 1| nested_fns::outer(is_true);
85| 1| nested_fns::outer_both_covered(is_true);
86| 1|}

52 changes: 51 additions & 1 deletion src/test/run-make-fulldeps/coverage/no_cov_crate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ fn do_not_add_coverage_1() {
println!("called but not covered");
}

#[no_coverage]
fn do_not_add_coverage_2() {
#![no_coverage]
println!("called but not covered");
}

Expand All @@ -28,9 +28,59 @@ fn add_coverage_not_called() {
println!("not called but covered");
}

// FIXME: These test-cases illustrate confusing results of nested functions.
// See https://github.com/rust-lang/rust/issues/93319
mod nested_fns {
#[no_coverage]
pub fn outer_not_covered(is_true: bool) {
fn inner(is_true: bool) {
if is_true {
println!("called and covered");
} else {
println!("absolutely not covered");
}
}
println!("called but not covered");
inner(is_true);
}

pub fn outer(is_true: bool) {
println!("called and covered");
inner_not_covered(is_true);

#[no_coverage]
fn inner_not_covered(is_true: bool) {
if is_true {
println!("called but not covered");
} else {
println!("absolutely not covered");
}
}
}

pub fn outer_both_covered(is_true: bool) {
println!("called and covered");
inner(is_true);

fn inner(is_true: bool) {
if is_true {
println!("called and covered");
} else {
println!("absolutely not covered");
}
}
}
}

fn main() {
let is_true = std::env::args().len() == 1;

do_not_add_coverage_1();
do_not_add_coverage_2();
add_coverage_1();
add_coverage_2();

nested_fns::outer_not_covered(is_true);
nested_fns::outer(is_true);
nested_fns::outer_both_covered(is_true);
}