Skip to content

coverage: Give the instrumentor its own counter type, separate from MIR #114791

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

Merged
bors merged 4 commits into from
Aug 20, 2023
Merged

coverage: Give the instrumentor its own counter type, separate from MIR #114791

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cad50f4
coverage: Remove a useless `let () =`
Zalathar Aug 14, 2023
629437e
coverage: Move a debug print into `make_code_region`
Zalathar Jul 22, 2023
fbab055
coverage: Give the instrumentor its own counter type, separate from MIR
Zalathar Jul 8, 2023
72f4c78
coverage: Don't store `function_source_hash` in `BcbCounter::Counter`
Zalathar Aug 14, 2023
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
19 changes: 11 additions & 8 deletions compiler/rustc_mir_transform/src/coverage/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,19 +309,14 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> {
};
graphviz_data.add_bcb_coverage_span_with_counter(bcb, &covspan, &counter_kind);

debug!(
"Calling make_code_region(file_name={}, source_file={:?}, span={}, body_span={})",
file_name,
self.source_file,
source_map.span_to_diagnostic_string(span),
source_map.span_to_diagnostic_string(body_span)
);
let code_region =
make_code_region(source_map, file_name, &self.source_file, span, body_span);

inject_statement(
self.mir_body,
counter_kind,
self.bcb_leader_bb(bcb),
Some(make_code_region(source_map, file_name, &self.source_file, span, body_span)),
Some(code_region),
);
}
}
Expand Down Expand Up @@ -498,6 +493,14 @@ fn make_code_region(
span: Span,
body_span: Span,
) -> CodeRegion {
debug!(
"Called make_code_region(file_name={}, source_file={:?}, span={}, body_span={})",
file_name,
source_file,
source_map.span_to_diagnostic_string(span),
source_map.span_to_diagnostic_string(body_span)
);

Copy link
Contributor

@cjgillot cjgillot Aug 20, 2023

Choose a reason for hiding this comment

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

You can use #[instrument(level="debug", skip(source_map))] attribute macro.

Copy link
Member Author

@Zalathar Zalathar Aug 20, 2023

Choose a reason for hiding this comment

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

Note that this isn't new code; I'm just moving it here as-is so that it's out of the way of other changes to inject_coverage_span_counters (which is the only caller).

let (start_line, mut start_col) = source_file.lookup_file_pos(span.lo());
let (end_line, end_col) = if span.hi() == span.lo() {
let (end_line, mut end_col) = (start_line, start_col);
Expand Down