Fixes the issue with uncovered source in async function bodies
The body_span was assumed to be in the Span root context, but this was not the case for async function bodies.
This commit is contained in:
Rich Kadel
parent
3ece6061b4
commit
1893721ec4
4 changed files with 71 additions and 89 deletions
|
|
@ -246,8 +246,8 @@ impl<'a, 'tcx> CoverageSpans<'a, 'tcx> {
|
|||
) -> Vec<CoverageSpan> {
|
||||
let mut coverage_spans = CoverageSpans {
|
||||
mir_body,
|
||||
fn_sig_span,
|
||||
body_span,
|
||||
fn_sig_span: fn_sig_span.with_ctxt(SyntaxContext::root()),
|
||||
body_span: body_span.with_ctxt(SyntaxContext::root()),
|
||||
basic_coverage_blocks,
|
||||
sorted_spans_iter: None,
|
||||
refined_spans: Vec::with_capacity(basic_coverage_blocks.num_nodes() * 2),
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
18| |// the println!() and `let` assignment lines in the coverage code region(s), as it does in the
|
||||
19| |// non-async function above, unless the `println!()` is inside a covered block.
|
||||
20| 1|async fn async_func() {
|
||||
21| | println!("async_func was covered");
|
||||
22| | let b = true;
|
||||
21| 1| println!("async_func was covered");
|
||||
22| 1| let b = true;
|
||||
23| 1| if b {
|
||||
24| 1| println!("async_func println in block");
|
||||
25| 1| }
|
||||
|
|
@ -30,8 +30,8 @@
|
|||
29| |// showing coverage, so the entire async closure _appears_ uncovered; but this is not exactly true.
|
||||
30| |// It's only certain kinds of lines and/or their context that results in missing coverage.
|
||||
31| 1|async fn async_func_just_println() {
|
||||
32| | println!("async_func_just_println was covered");
|
||||
33| |}
|
||||
32| 1| println!("async_func_just_println was covered");
|
||||
33| 1|}
|
||||
34| |
|
||||
35| 1|fn main() {
|
||||
36| 1| println!("codecovsample::main");
|
||||
|
|
@ -40,85 +40,76 @@
|
|||
39| 1|
|
||||
40| 1| executor::block_on(async_func());
|
||||
41| 1| executor::block_on(async_func_just_println());
|
||||
42| 1|
|
||||
43| 1| // let mut future = Box::pin(async_func());
|
||||
44| 1| // executor::block_on(future.as_mut());
|
||||
45| 1|
|
||||
46| 1| // let mut future = Box::pin(async_func());
|
||||
47| 1| // executor::block_on(future.as_mut());
|
||||
48| 1|
|
||||
49| 1| // let mut future = Box::pin(async_func_just_println());
|
||||
50| 1| // executor::block_on(future.as_mut());
|
||||
51| 1|}
|
||||
52| |
|
||||
53| |mod executor {
|
||||
54| | use core::{
|
||||
55| | future::Future,
|
||||
56| | pin::Pin,
|
||||
57| | task::{Context, Poll, RawWaker, RawWakerVTable, Waker},
|
||||
58| | };
|
||||
59| |
|
||||
60| 2| pub fn block_on<F: Future>(mut future: F) -> F::Output {
|
||||
61| 2| let mut future = unsafe { Pin::new_unchecked(&mut future) };
|
||||
62| 2| use std::hint::unreachable_unchecked;
|
||||
63| 2| static VTABLE: RawWakerVTable = RawWakerVTable::new(
|
||||
64| 2| |_| unsafe { unreachable_unchecked() }, // clone
|
||||
42| 1|}
|
||||
43| |
|
||||
44| |mod executor {
|
||||
45| | use core::{
|
||||
46| | future::Future,
|
||||
47| | pin::Pin,
|
||||
48| | task::{Context, Poll, RawWaker, RawWakerVTable, Waker},
|
||||
49| | };
|
||||
50| |
|
||||
51| 2| pub fn block_on<F: Future>(mut future: F) -> F::Output {
|
||||
52| 2| let mut future = unsafe { Pin::new_unchecked(&mut future) };
|
||||
53| 2| use std::hint::unreachable_unchecked;
|
||||
54| 2| static VTABLE: RawWakerVTable = RawWakerVTable::new(
|
||||
55| 2| |_| unsafe { unreachable_unchecked() }, // clone
|
||||
^0
|
||||
65| 2| |_| unsafe { unreachable_unchecked() }, // wake
|
||||
56| 2| |_| unsafe { unreachable_unchecked() }, // wake
|
||||
^0
|
||||
66| 2| |_| unsafe { unreachable_unchecked() }, // wake_by_ref
|
||||
57| 2| |_| unsafe { unreachable_unchecked() }, // wake_by_ref
|
||||
^0
|
||||
67| 2| |_| (),
|
||||
68| 2| );
|
||||
69| 2| let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
|
||||
70| 2| let mut context = Context::from_waker(&waker);
|
||||
71| |
|
||||
72| | loop {
|
||||
73| 2| if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
|
||||
74| 2| break val;
|
||||
75| 0| }
|
||||
76| | }
|
||||
77| 2| }
|
||||
58| 2| |_| (),
|
||||
59| 2| );
|
||||
60| 2| let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
|
||||
61| 2| let mut context = Context::from_waker(&waker);
|
||||
62| |
|
||||
63| | loop {
|
||||
64| 2| if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
|
||||
65| 2| break val;
|
||||
66| 0| }
|
||||
67| | }
|
||||
68| 2| }
|
||||
------------------
|
||||
| async2::executor::block_on::<core::future::from_generator::GenFuture<async2::async_func::{closure#0}>>:
|
||||
| 60| 1| pub fn block_on<F: Future>(mut future: F) -> F::Output {
|
||||
| 61| 1| let mut future = unsafe { Pin::new_unchecked(&mut future) };
|
||||
| 62| 1| use std::hint::unreachable_unchecked;
|
||||
| 63| 1| static VTABLE: RawWakerVTable = RawWakerVTable::new(
|
||||
| 64| 1| |_| unsafe { unreachable_unchecked() }, // clone
|
||||
| 65| 1| |_| unsafe { unreachable_unchecked() }, // wake
|
||||
| 66| 1| |_| unsafe { unreachable_unchecked() }, // wake_by_ref
|
||||
| 67| 1| |_| (),
|
||||
| 68| 1| );
|
||||
| 69| 1| let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
|
||||
| 70| 1| let mut context = Context::from_waker(&waker);
|
||||
| 71| |
|
||||
| 72| | loop {
|
||||
| 73| 1| if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
|
||||
| 74| 1| break val;
|
||||
| 75| 0| }
|
||||
| 76| | }
|
||||
| 77| 1| }
|
||||
| 51| 1| pub fn block_on<F: Future>(mut future: F) -> F::Output {
|
||||
| 52| 1| let mut future = unsafe { Pin::new_unchecked(&mut future) };
|
||||
| 53| 1| use std::hint::unreachable_unchecked;
|
||||
| 54| 1| static VTABLE: RawWakerVTable = RawWakerVTable::new(
|
||||
| 55| 1| |_| unsafe { unreachable_unchecked() }, // clone
|
||||
| 56| 1| |_| unsafe { unreachable_unchecked() }, // wake
|
||||
| 57| 1| |_| unsafe { unreachable_unchecked() }, // wake_by_ref
|
||||
| 58| 1| |_| (),
|
||||
| 59| 1| );
|
||||
| 60| 1| let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
|
||||
| 61| 1| let mut context = Context::from_waker(&waker);
|
||||
| 62| |
|
||||
| 63| | loop {
|
||||
| 64| 1| if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
|
||||
| 65| 1| break val;
|
||||
| 66| 0| }
|
||||
| 67| | }
|
||||
| 68| 1| }
|
||||
------------------
|
||||
| async2::executor::block_on::<core::future::from_generator::GenFuture<async2::async_func_just_println::{closure#0}>>:
|
||||
| 60| 1| pub fn block_on<F: Future>(mut future: F) -> F::Output {
|
||||
| 61| 1| let mut future = unsafe { Pin::new_unchecked(&mut future) };
|
||||
| 62| 1| use std::hint::unreachable_unchecked;
|
||||
| 63| 1| static VTABLE: RawWakerVTable = RawWakerVTable::new(
|
||||
| 64| 1| |_| unsafe { unreachable_unchecked() }, // clone
|
||||
| 65| 1| |_| unsafe { unreachable_unchecked() }, // wake
|
||||
| 66| 1| |_| unsafe { unreachable_unchecked() }, // wake_by_ref
|
||||
| 67| 1| |_| (),
|
||||
| 68| 1| );
|
||||
| 69| 1| let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
|
||||
| 70| 1| let mut context = Context::from_waker(&waker);
|
||||
| 71| |
|
||||
| 72| | loop {
|
||||
| 73| 1| if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
|
||||
| 74| 1| break val;
|
||||
| 75| 0| }
|
||||
| 76| | }
|
||||
| 77| 1| }
|
||||
| 51| 1| pub fn block_on<F: Future>(mut future: F) -> F::Output {
|
||||
| 52| 1| let mut future = unsafe { Pin::new_unchecked(&mut future) };
|
||||
| 53| 1| use std::hint::unreachable_unchecked;
|
||||
| 54| 1| static VTABLE: RawWakerVTable = RawWakerVTable::new(
|
||||
| 55| 1| |_| unsafe { unreachable_unchecked() }, // clone
|
||||
| 56| 1| |_| unsafe { unreachable_unchecked() }, // wake
|
||||
| 57| 1| |_| unsafe { unreachable_unchecked() }, // wake_by_ref
|
||||
| 58| 1| |_| (),
|
||||
| 59| 1| );
|
||||
| 60| 1| let waker = unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &VTABLE)) };
|
||||
| 61| 1| let mut context = Context::from_waker(&waker);
|
||||
| 62| |
|
||||
| 63| | loop {
|
||||
| 64| 1| if let Poll::Ready(val) = future.as_mut().poll(&mut context) {
|
||||
| 65| 1| break val;
|
||||
| 66| 0| }
|
||||
| 67| | }
|
||||
| 68| 1| }
|
||||
------------------
|
||||
78| |}
|
||||
69| |}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
2| |// structure of this test.
|
||||
3| |
|
||||
4| 2|#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
|
||||
^0 ^0 ^0 ^0 ^1 ^1 ^0^0
|
||||
^0 ^0 ^0 ^1 ^0
|
||||
------------------
|
||||
| Unexecuted instantiation: <partial_eq::Version as core::cmp::PartialEq>::ne
|
||||
------------------
|
||||
|
|
|
|||
|
|
@ -39,15 +39,6 @@ fn main() {
|
|||
|
||||
executor::block_on(async_func());
|
||||
executor::block_on(async_func_just_println());
|
||||
|
||||
// let mut future = Box::pin(async_func());
|
||||
// executor::block_on(future.as_mut());
|
||||
|
||||
// let mut future = Box::pin(async_func());
|
||||
// executor::block_on(future.as_mut());
|
||||
|
||||
// let mut future = Box::pin(async_func_just_println());
|
||||
// executor::block_on(future.as_mut());
|
||||
}
|
||||
|
||||
mod executor {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue