More improvements to macro coverage

2021-04-26 16:27:54 -07:00
parent c26afb765c
commit f12795f8a0
7 changed files with 366 additions and 155 deletions
--- a/compiler/rustc_mir/src/transform/coverage/tests.rs
+++ b/compiler/rustc_mir/src/transform/coverage/tests.rs
@@ -683,12 +683,12 @@ fn test_make_bcb_counters() {
        let mut basic_coverage_blocks = graph::CoverageGraph::from_mir(&mir_body);
        let mut coverage_spans = Vec::new();
        for (bcb, data) in basic_coverage_blocks.iter_enumerated() {
-            if let Some((span, is_macro_expansion)) =
+            if let Some((span, expn_span)) =
                spans::filtered_terminator_span(data.terminator(&mir_body), body_span)
            {
                coverage_spans.push(spans::CoverageSpan::for_terminator(
                    span,
-                    is_macro_expansion,
+                    expn_span,
                    bcb,
                    data.last_bb(),
                ));