diff options
| author | bors <bors@rust-lang.org> | 2021-03-17 23:39:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-17 23:39:51 +0000 |
| commit | 146f5745606b48afca8e7d7702e363e88caa80e1 (patch) | |
| tree | 28f5a4d7b7c985a5f6ec77b1d2ee24cf0a901f71 /compiler/rustc_codegen_llvm | |
| parent | 36f1f04f18b89ba4a999bcfd6584663fd6fc1c5d (diff) | |
| parent | 1839d1d57d5f4292eeadb419bc0c1e92fa9b478a (diff) | |
| download | rust-146f5745606b48afca8e7d7702e363e88caa80e1.tar.gz rust-146f5745606b48afca8e7d7702e363e88caa80e1.zip | |
Auto merge of #83247 - Dylan-DPC:rollup-bdwmvjg, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #82191 (Vec::dedup_by optimization) - #82270 (Emit error when trying to use assembler syntax directives in `asm!`) - #82434 (Add more links between hash and btree collections) - #83080 (Make source-based code coverage compatible with MIR inlining) - #83168 (Extend `proc_macro_back_compat` lint to `procedural-masquerade`) - #83192 (ci/docker: Add SDK/NDK level 21 to android docker for 32bit platforms) - #83204 (Simplify C compilation for Fortanix-SGX target) - #83216 (Allow registering tool lints with `register_tool`) - #83223 (Display error details when a `mmap` call fails) - #83228 (Don't show HTML diff if tidy isn't installed for rustdoc tests) - #83231 (Switch riscvgc-unknown-none-elf use lp64d ABI) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs index 444a9d4ba04..352638aa88e 100644 --- a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs +++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs @@ -254,7 +254,7 @@ fn save_function_record( /// /// 1. The file name of an "Unreachable" function must match the file name of the existing /// codegenned (covered) function to which the unreachable code regions will be added. -/// 2. The function to which the unreachable code regions will be added must not be a genaric +/// 2. The function to which the unreachable code regions will be added must not be a generic /// function (must not have type parameters) because the coverage tools will get confused /// if the codegenned function has more than one instantiation and additional `CodeRegion`s /// attached to only one of those instantiations. @@ -284,7 +284,7 @@ fn add_unreachable_coverage<'tcx>( let all_def_ids: DefIdSet = tcx.mir_keys(LOCAL_CRATE).iter().map(|local_def_id| local_def_id.to_def_id()).collect(); - let (codegenned_def_ids, _) = tcx.collect_and_partition_mono_items(LOCAL_CRATE); + let codegenned_def_ids = tcx.codegened_and_inlined_items(LOCAL_CRATE); let mut unreachable_def_ids_by_file: FxHashMap<Symbol, Vec<DefId>> = FxHashMap::default(); for &non_codegenned_def_id in all_def_ids.difference(codegenned_def_ids) { |