Skip to content

Commit ed8298b

Browse files
committed
coverage: Avoid creating malformed macro name spans
This method is trying to detect macro invocations, so that it can split a span into two parts just after the `!` of the invocation. Under some circumstances (probably involving nested macros), it gets confused and produces a span that is larger than the original span, and possibly extends outside its enclosing function and even into an adjacent file. In extreme cases, that can result in malformed coverage mappings that cause `llvm-cov` to fail. For now, we at least want to detect these egregious cases and avoid them, so that coverage reports can still be produced.
1 parent a04d56b commit ed8298b

File tree

1 file changed

+6
-0
lines changed
  • compiler/rustc_mir_transform/src/coverage

1 file changed

+6
-0
lines changed

compiler/rustc_mir_transform/src/coverage/spans.rs

+6
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,12 @@ impl<'a> CoverageSpansGenerator<'a> {
381381

382382
let merged_prefix_len = self.curr_original_span.lo() - curr.span.lo();
383383
let after_macro_bang = merged_prefix_len + BytePos(visible_macro.as_str().len() as u32 + 1);
384+
if self.curr().span.lo() + after_macro_bang > self.curr().span.hi() {
385+
// Something is wrong with the macro name span;
386+
// return now to avoid emitting malformed mappings.
387+
// FIXME(#117788): Track down why this happens.
388+
return;
389+
}
384390
let mut macro_name_cov = curr.clone();
385391
self.curr_mut().span = curr.span.with_lo(curr.span.lo() + after_macro_bang);
386392
macro_name_cov.span =

0 commit comments

Comments
 (0)