Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #134516

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
merged 15 commits into from
Dec 20, 2024
Merged

Rollup of 5 pull requests #134516

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dbf5ae3
Add reference annotations for the `coverage` attribute
ehuss Dec 18, 2024
d416cea
coverage: Rename some FFI fields from `span` to `cov_span`
Zalathar Dec 18, 2024
c3780e1
coverage: Quietly skip functions that end up having no mappings
Zalathar Dec 18, 2024
34ed51c
coverage: Store coverage source regions as `Span` until codegen
Zalathar Dec 18, 2024
837a25d
coverage: Identify source files by ID, not by interned filename
Zalathar Dec 18, 2024
c28e3e3
build: Update libc version
SergioGasquez Dec 19, 2024
987656f
Remove a duplicated check that doesn't do anything anymore.
oli-obk Dec 19, 2024
aced4dc
coverage: Add a synthetic test for when all spans are discarded
Zalathar Dec 19, 2024
aaca9fa
compiletest: don't register `MSVC`/`NONMSVC` FileCheck prefixes
jieyouxu Dec 18, 2024
5415f06
Explicitly register `MSVC`/`NONMSVC` revisions for some codegen tests
jieyouxu Dec 18, 2024
b978498
Rollup merge of #134463 - jieyouxu:filecheck-prefix, r=Zalathar
matthiaskrgr Dec 19, 2024
fc11b5a
Rollup merge of #134487 - ehuss:reference-coverage, r=compiler-errors
matthiaskrgr Dec 19, 2024
57cbd07
Rollup merge of #134497 - Zalathar:spans, r=jieyouxu
matthiaskrgr Dec 19, 2024
bfbe72e
Rollup merge of #134502 - SergioGasquez:feat/libc-0.2.169, r=tgross35
matthiaskrgr Dec 19, 2024
4f053b1
Rollup merge of #134506 - oli-obk:push-mrrulszyuslt, r=jieyouxu
matthiaskrgr Dec 19, 2024
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: Quietly skip functions that end up having no mappings 
In codegen, a used function with `FunctionCoverageInfo` but no mappings has
historically indicated a bug. However, that will no longer be the case after
moving some fallible span-processing steps into codegen.
  • Loading branch information
@Zalathar
Zalathar committed Dec 19, 2024
commit c3780e1d227d7544209e2cd722ac4fa35ac61b56
9 changes: 2 additions & 7 deletions compiler/rustc_codegen_llvm/src/coverageinfo/mapgen/covfun.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use rustc_abi::Align;
use rustc_codegen_ssa::traits::{
BaseTypeCodegenMethods, ConstCodegenMethods, StaticCodegenMethods,
};
use rustc_middle::bug;
use rustc_middle::mir::coverage::{
CovTerm, CoverageIdsInfo, Expression, FunctionCoverageInfo, Mapping, MappingKind, Op,
};
Expand Down Expand Up @@ -67,12 +66,8 @@ pub(crate) fn prepare_covfun_record<'tcx>(
fill_region_tables(tcx, global_file_table, fn_cov_info, ids_info, &mut covfun);

if covfun.regions.has_no_regions() {
if covfun.is_used {
bug!("a used function should have had coverage mapping data but did not: {covfun:?}");
} else {
debug!(?covfun, "unused function had no coverage mapping data");
return None;
}
debug!(?covfun, "function has no mappings to embed; skipping");
return None;
}

Some(covfun)
Expand Down