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

Jump to bottom

coverage: llvm-cov expects column numbers to be bytes, not code points #119033

Merged
merged 3 commits into from
Jan 9, 2024
Merged

coverage: llvm-cov expects column numbers to be bytes, not code points #119033

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift click to select a range
585a285
coverage: Test for column numbers involving non-ASCII characters
Zalathar Dec 15, 2023
88f5759
coverage: Allow `make_code_region` to fail
Zalathar Jan 6, 2024
6971e93
coverage: `llvm-cov` expects column numbers to be bytes, not code points
Zalathar Dec 15, 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
Prev Previous commit
Next Next commit
coverage: Allow make_code_region to fail
  • Loading branch information
@Zalathar
Zalathar committed Jan 8, 2024
commit 88f5759ace32abed2bd3dd81ee2aa15d6878675c
18 changes: 12 additions & 6 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 @@ -107,6 107,12 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> {
);

let mappings = self.create_mappings(&coverage_spans, &coverage_counters);
if mappings.is_empty() {
// No spans could be converted into valid mappings, so skip this function.
debug!("no spans could be converted into valid mappings; skipping");
return;
}

self.inject_coverage_statements(bcb_has_coverage_spans, &coverage_counters);

self.mir_body.function_coverage_info = Some(Box::new(FunctionCoverageInfo {
Expand Down Expand Up @@ -148,9 154,9 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> {
// Flatten the spans into individual term/span pairs.
.flat_map(|(term, spans)| spans.iter().map(move |&span| (term, span)))
// Convert each span to a code region, and create the final mapping.
.map(|(term, span)| {
let code_region = make_code_region(source_map, file_name, span, body_span);
Mapping { term, code_region }
.filter_map(|(term, span)| {
let code_region = make_code_region(source_map, file_name, span, body_span)?;
Some(Mapping { term, code_region })
})
.collect::<Vec<_>>()
}
Expand Down Expand Up @@ -258,7 264,7 @@ fn make_code_region(
file_name: Symbol,
span: Span,
body_span: Span,
) -> CodeRegion {
) -> Option<CodeRegion> {
debug!(
"Called make_code_region(file_name={}, span={}, body_span={})",
file_name,
Expand All @@ -280,13 286,13 @@ fn make_code_region(
start_line = source_map.doctest_offset_line(&file.name, start_line);
end_line = source_map.doctest_offset_line(&file.name, end_line);
}
CodeRegion {
Some(CodeRegion {
file_name,
start_line: start_line as u32,
start_col: start_col as u32,
end_line: end_line as u32,
end_col: end_col as u32,
}
})
}

fn is_eligible_for_coverage(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
Expand Down