mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cg_llvm: Switch llvm::add_global to &CStr

Browse Source
This commit is contained in:
Jubilee Young 2024-10-18 00:00:23 -07:00
parent dd5127615a
commit 888efe74a3
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
View File

@ -132,7 +132,7 @@ pub(crate) fn finalize(cx: &CodegenCx<'_, '_>) {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let initializer = cx.const_array(cx.type_ptr(), &name_globals); let initializer = cx.const_array(cx.type_ptr(), &name_globals);
let array = llvm::add_global(cx.llmod, cx.val_ty(initializer), "__llvm_coverage_names"); let array = llvm::add_global(cx.llmod, cx.val_ty(initializer), c"__llvm_coverage_names");
llvm::set_global_constant(array, true); llvm::set_global_constant(array, true);
llvm::set_linkage(array, llvm::Linkage::InternalLinkage); llvm::set_linkage(array, llvm::Linkage::InternalLinkage);
llvm::set_initializer(array, initializer); llvm::set_initializer(array, initializer);

12
compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs
View File

@ -1,4 +1,5 @@
use std::cell::RefCell; use std::cell::RefCell;
use std::ffi::CString;
use libc::c_uint; use libc::c_uint;
use rustc_codegen_ssa::traits::{ use rustc_codegen_ssa::traits::{
@ -284,10 +285,10 @@ pub(crate) fn save_cov_data_to_mod<'ll, 'tcx>(
cx: &CodegenCx<'ll, 'tcx>, cx: &CodegenCx<'ll, 'tcx>,
cov_data_val: &'ll llvm::Value, cov_data_val: &'ll llvm::Value,
) { ) {
let covmap_var_name = llvm::build_string(|s| unsafe { let covmap_var_name = CString::new(llvm::build_byte_buffer(|s| unsafe {
llvm::LLVMRustCoverageWriteMappingVarNameToString(s); llvm::LLVMRustCoverageWriteMappingVarNameToString(s);
}) }))
.expect("Rust Coverage Mapping var name failed UTF-8 conversion"); .unwrap();
debug!("covmap var name: {:?}", covmap_var_name); debug!("covmap var name: {:?}", covmap_var_name);
let covmap_section_name = llvm::build_string(|s| unsafe { let covmap_section_name = llvm::build_string(|s| unsafe {
@ -322,7 +323,8 @@ pub(crate) fn save_func_record_to_mod<'ll, 'tcx>(
// of descriptions play distinct roles in LLVM IR; therefore, assign them different names (by // of descriptions play distinct roles in LLVM IR; therefore, assign them different names (by
// appending "u" to the end of the function record var name, to prevent `linkonce_odr` merging. // appending "u" to the end of the function record var name, to prevent `linkonce_odr` merging.
let func_record_var_name = let func_record_var_name =
format!("__covrec_{:X}{}", func_name_hash, if is_used { "u" } else { "" }); CString::new(format!("__covrec_{:X}{}", func_name_hash, if is_used { "u" } else { "" }))
.unwrap();
debug!("function record var name: {:?}", func_record_var_name); debug!("function record var name: {:?}", func_record_var_name);
debug!("function record section name: {:?}", covfun_section_name); debug!("function record section name: {:?}", covfun_section_name);
@ -334,7 +336,7 @@ pub(crate) fn save_func_record_to_mod<'ll, 'tcx>(
llvm::set_section(llglobal, covfun_section_name); llvm::set_section(llglobal, covfun_section_name);
// LLVM's coverage mapping format specifies 8-byte alignment for items in this section. // LLVM's coverage mapping format specifies 8-byte alignment for items in this section.
llvm::set_alignment(llglobal, Align::EIGHT); llvm::set_alignment(llglobal, Align::EIGHT);
llvm::set_comdat(cx.llmod, llglobal, &func_record_var_name); llvm::set_comdat(cx.llmod, llglobal, func_record_var_name.to_str().unwrap());
cx.add_used_global(llglobal); cx.add_used_global(llglobal);
} }

3
compiler/rustc_codegen_llvm/src/llvm/mod.rs
View File

@ -217,8 +217,7 @@ pub fn set_section(llglobal: &Value, section_name: &str) {
} }
} }
pub fn add_global<'a>(llmod: &'a Module, ty: &'a Type, name: &str) -> &'a Value { pub fn add_global<'a>(llmod: &'a Module, ty: &'a Type, name_cstr: &CStr) -> &'a Value {
let name_cstr = CString::new(name).expect("unexpected CString error");
unsafe { LLVMAddGlobal(llmod, ty, name_cstr.as_ptr()) } unsafe { LLVMAddGlobal(llmod, ty, name_cstr.as_ptr()) }
} }