diff options
| author | bors <bors@rust-lang.org> | 2023-12-18 08:03:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-18 08:03:22 +0000 |
| commit | e004adb5561b724ac18f5b24584648ca4e42b6ad (patch) | |
| tree | 31673b8c168649f8e3ccccc9462d91a11b5c9e22 /compiler/rustc_mir_transform/src/coverage/mod.rs | |
| parent | cda4736f1eaad8af6f49388baa9b7e480df8e329 (diff) | |
| parent | c088f6af8f5b95044a199ec73d1a7e216643195a (diff) | |
| download | rust-e004adb5561b724ac18f5b24584648ca4e42b6ad.tar.gz rust-e004adb5561b724ac18f5b24584648ca4e42b6ad.zip | |
Auto merge of #119069 - matthiaskrgr:rollup-xxk4m30, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #118852 (coverage: Skip instrumenting a function if no spans were extracted from MIR) - #118905 ([AIX] Fix XCOFF metadata) - #118967 (Add better ICE messages for some undescriptive panics) - #119051 (Replace `FileAllocationInfo` with `FileEndOfFileInfo`) - #119059 (Deny `~const` trait bounds in inherent impl headers) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/mod.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/mod.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/mod.rs b/compiler/rustc_mir_transform/src/coverage/mod.rs index 65a0924f1c9..709d1fdc21a 100644 --- a/compiler/rustc_mir_transform/src/coverage/mod.rs +++ b/compiler/rustc_mir_transform/src/coverage/mod.rs @@ -99,12 +99,15 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> { fn inject_counters(&'a mut self) { //////////////////////////////////////////////////// // Compute coverage spans from the `CoverageGraph`. - let coverage_spans = CoverageSpans::generate_coverage_spans( + let Some(coverage_spans) = CoverageSpans::generate_coverage_spans( self.mir_body, self.fn_sig_span, self.body_span, &self.basic_coverage_blocks, - ); + ) else { + // No relevant spans were found in MIR, so skip instrumenting this function. + return; + }; //////////////////////////////////////////////////// // Create an optimized mix of `Counter`s and `Expression`s for the `CoverageGraph`. Ensure |
