diff options
| author | bors <bors@rust-lang.org> | 2021-12-10 21:59:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-10 21:59:07 +0000 |
| commit | f0448f44bcda55fd9eb71da82495ef648eedb4e4 (patch) | |
| tree | d7157697f5cdcd6bf59adb15521427a212f0dbce /compiler/rustc_codegen_llvm/src/coverageinfo | |
| parent | 0b42deaccc2cbe17a68067aa5fdb76104369e1fd (diff) | |
| parent | 1fca934898354160b46c17c58b67707a2dcb8988 (diff) | |
| download | rust-f0448f44bcda55fd9eb71da82495ef648eedb4e4.tar.gz rust-f0448f44bcda55fd9eb71da82495ef648eedb4e4.zip | |
Auto merge of #91760 - matthiaskrgr:rollup-zcemh6j, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #90407 (Document all public items in `rustc_incremental`) - #90897 (Fix incorrect stability attributes) - #91105 (Fix method name reference in stream documentation) - #91325 (adjust const_eval_select documentation) - #91470 (code-cov: generate dead functions with private/default linkage) - #91482 (Update documentation to use `from()` to initialize `HashMap`s and `BTreeMap`s) - #91524 (Fix Vec::extend_from_slice docs) - #91575 (Fix ICE on format string of macro with secondary-label) - #91625 (Remove redundant [..]s) - #91646 (Fix documentation for `core::ready::Ready`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/coverageinfo')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs index 0390caaec33..d2af1b247e8 100644 --- a/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs +++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs @@ -89,7 +89,7 @@ pub fn finalize<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>) { }); let filenames_size = filenames_buffer.len(); - let filenames_val = cx.const_bytes(&filenames_buffer[..]); + let filenames_val = cx.const_bytes(&filenames_buffer); let filenames_ref = coverageinfo::hash_bytes(filenames_buffer); // Generate the LLVM IR representation of the coverage map and store it in a well-known global @@ -238,7 +238,7 @@ fn save_function_record( ) { // Concatenate the encoded coverage mappings let coverage_mapping_size = coverage_mapping_buffer.len(); - let coverage_mapping_val = cx.const_bytes(&coverage_mapping_buffer[..]); + let coverage_mapping_val = cx.const_bytes(&coverage_mapping_buffer); let func_name_hash = coverageinfo::hash_str(&mangled_function_name); let func_name_hash_val = cx.const_u64(func_name_hash); diff --git a/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs index ef11e2972ea..96b278dbe32 100644 --- a/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs +++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs @@ -212,8 +212,8 @@ fn declare_unused_fn(cx: &CodegenCx<'ll, 'tcx>, def_id: &DefId) -> Instance<'tcx ), ); - llvm::set_linkage(llfn, llvm::Linkage::WeakAnyLinkage); - llvm::set_visibility(llfn, llvm::Visibility::Hidden); + llvm::set_linkage(llfn, llvm::Linkage::PrivateLinkage); + llvm::set_visibility(llfn, llvm::Visibility::Default); assert!(cx.instances.borrow_mut().insert(instance, llfn).is_none()); |
