diff options
| author | bors <bors@rust-lang.org> | 2021-02-27 02:18:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-27 02:18:11 +0000 |
| commit | 9fa580b1175018b0a276b0bc68f9827a106f7260 (patch) | |
| tree | 59c6d8c32cb9915f5ef2e461cda52c68ad4d87ba /compiler/rustc_codegen_llvm/src/debuginfo | |
| parent | 3da2dd3eae7b7cbf16960ab993de666470e43991 (diff) | |
| parent | 95b31cf94964dcd082c32b41de112541873c2d8b (diff) | |
| download | rust-9fa580b1175018b0a276b0bc68f9827a106f7260.tar.gz rust-9fa580b1175018b0a276b0bc68f9827a106f7260.zip | |
Auto merge of #82577 - Dylan-DPC:rollup-c3si8ju, r=Dylan-DPC
Rollup of 14 pull requests Successful merges: - #81794 (update tracking issue for `relaxed_struct_unsize`) - #82057 (Replace const_cstr with cstr crate) - #82370 (Improve anonymous lifetime note to indicate the target span) - #82394 (:arrow_up: rust-analyzer) - #82396 (Add Future trait for doc_spotlight feature doc) - #82404 (Test hexagon-enum only when llvm target is present) - #82419 (expand: Preserve order of inert attributes during expansion) - #82420 (Enable API documentation for `std::os::wasi`.) - #82421 (Add a `size()` function to WASI's `MetadataExt`.) - #82442 (Skip emitting closure diagnostic when closure_kind_origins has no entry) - #82473 (Use libc::accept4 on Android instead of raw syscall.) - #82482 (Use small hash set in `mir_inliner_callees`) - #82490 (Update cargo) - #82494 (Substitute erased lifetimes on bad placeholder type) Failed merges: - #82448 (Combine HasAttrs and HasTokens into AstLike) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/debuginfo')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index 1464784ae28..85d1b702399 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -18,8 +18,8 @@ use crate::llvm::debuginfo::{ }; use crate::value::Value; +use cstr::cstr; use rustc_codegen_ssa::traits::*; -use rustc_data_structures::const_cstr; use rustc_data_structures::fingerprint::Fingerprint; use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::stable_hasher::{HashStable, StableHasher}; @@ -1075,7 +1075,7 @@ pub fn compile_unit_metadata( gcov_cu_info.len() as c_uint, ); - let llvm_gcov_ident = const_cstr!("llvm.gcov"); + let llvm_gcov_ident = cstr!("llvm.gcov"); llvm::LLVMAddNamedMetadataOperand( debug_context.llmod, llvm_gcov_ident.as_ptr(), @@ -1093,7 +1093,7 @@ pub fn compile_unit_metadata( ); llvm::LLVMAddNamedMetadataOperand( debug_context.llmod, - const_cstr!("llvm.ident").as_ptr(), + cstr!("llvm.ident").as_ptr(), llvm::LLVMMDNodeInContext(debug_context.llcontext, &name_metadata, 1), ); } |
