From 77774e4e960e6b65ddb95b087772c6d2ad6c3009 Mon Sep 17 00:00:00 2001 From: Yuki OKUSHI Date: Sat, 30 Mar 2019 21:37:02 +0900 Subject: [PATCH] Use CString --- src/librustc_codegen_llvm/attributes.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs index 9aaad60cd6d..77fa34e74dd 100644 --- a/src/librustc_codegen_llvm/attributes.rs +++ b/src/librustc_codegen_llvm/attributes.rs @@ -80,14 +80,12 @@ pub fn set_instrument_function(cx: &CodegenCx<'ll, '_>, llfn: &'ll Value) { // The function name varies on platforms. // See test/CodeGen/mcount.c in clang. - use std::ffi::CStr; - let target_mcount = format!("{}{}", - &cx.sess().target.target.options.target_mcount, "\0"); - let mcount_name = CStr::from_bytes_with_nul(target_mcount.as_bytes()).unwrap(); + let mcount_name = CString::new( + cx.sess().target.target.options.target_mcount.as_str().as_bytes()).unwrap(); llvm::AddFunctionAttrStringValue( llfn, llvm::AttributePlace::Function, - const_cstr!("instrument-function-entry-inlined"), mcount_name); + const_cstr!("instrument-function-entry-inlined"), &mcount_name); } } -- 2.44.0