nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #118566 - klensy:cstr-new, r=WaffleLapkin

Browse Source 
use c literals in compiler and library

Relands refreshed https://github.com/rust-lang/rust/pull/111647
This commit is contained in:
bors 2023-12-14 11:14:03 +00:00
commit 1aa6aefdc9
23 changed files with 67 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cargo.lock
View File

@ -866,16 +866,6 @@ dependencies = [
"typenum", "typenum",
] ]
[[package]]
name = "cstr"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
dependencies = [
"proc-macro2",
"quote",
]
[[package]] [[package]]
name = "ctrlc" name = "ctrlc"
version = "3.4.0" version = "3.4.0"
@ -3582,7 +3572,6 @@ name = "rustc_codegen_llvm"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"cstr",
"itertools", "itertools",
"libc", "libc",
"measureme", "measureme",

1
compiler/rustc_codegen_llvm/Cargo.toml
View File

@ -9,7 +9,6 @@ test = false
[dependencies] [dependencies]
# tidy-alphabetical-start # tidy-alphabetical-start
bitflags = "1.0" bitflags = "1.0"
cstr = "0.2"
itertools = "0.11" itertools = "0.11"
libc = "0.2" libc = "0.2"
measureme = "10.0.0" measureme = "10.0.0"

2
compiler/rustc_codegen_llvm/src/allocator.rs
View File

@ -146,7 +146,7 @@ fn create_wrapper_function(
} }
llvm::LLVMRustSetVisibility(callee, llvm::Visibility::Hidden); llvm::LLVMRustSetVisibility(callee, llvm::Visibility::Hidden);
let llbb = llvm::LLVMAppendBasicBlockInContext(llcx, llfn, "entry\0".as_ptr().cast()); let llbb = llvm::LLVMAppendBasicBlockInContext(llcx, llfn, c"entry".as_ptr().cast());
let llbuilder = llvm::LLVMCreateBuilderInContext(llcx); let llbuilder = llvm::LLVMCreateBuilderInContext(llcx);
llvm::LLVMPositionBuilderAtEnd(llbuilder, llbb); llvm::LLVMPositionBuilderAtEnd(llbuilder, llbb);

2
compiler/rustc_codegen_llvm/src/back/lto.rs
View File

@ -631,7 +631,7 @@ pub(crate) fn run_pass_manager(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
module.module_llvm.llmod(), module.module_llvm.llmod(),
llvm::LLVMModFlagBehavior::Error, llvm::LLVMModFlagBehavior::Error,
"LTOPostLink\0".as_ptr().cast(), c"LTOPostLink".as_ptr().cast(),
1, 1,
); );
} }

11
compiler/rustc_codegen_llvm/src/back/write.rs
View File

@ -916,6 +916,7 @@ fn target_is_aix(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {
cgcx.opts.target_triple.triple().contains("-aix") cgcx.opts.target_triple.triple().contains("-aix")
} }
//FIXME use c string literals here too
pub(crate) fn bitcode_section_name(cgcx: &CodegenContext<LlvmCodegenBackend>) -> &'static str { pub(crate) fn bitcode_section_name(cgcx: &CodegenContext<LlvmCodegenBackend>) -> &'static str {
if target_is_apple(cgcx) { if target_is_apple(cgcx) {
"__LLVM,__bitcode\0" "__LLVM,__bitcode\0"
@ -994,7 +995,7 @@ unsafe fn embed_bitcode(
let llglobal = llvm::LLVMAddGlobal( let llglobal = llvm::LLVMAddGlobal(
llmod, llmod,
common::val_ty(llconst), common::val_ty(llconst),
"rustc.embedded.module\0".as_ptr().cast(), c"rustc.embedded.module".as_ptr().cast(),
); );
llvm::LLVMSetInitializer(llglobal, llconst); llvm::LLVMSetInitializer(llglobal, llconst);
@ -1007,15 +1008,15 @@ unsafe fn embed_bitcode(
let llglobal = llvm::LLVMAddGlobal( let llglobal = llvm::LLVMAddGlobal(
llmod, llmod,
common::val_ty(llconst), common::val_ty(llconst),
"rustc.embedded.cmdline\0".as_ptr().cast(), c"rustc.embedded.cmdline".as_ptr().cast(),
); );
llvm::LLVMSetInitializer(llglobal, llconst); llvm::LLVMSetInitializer(llglobal, llconst);
let section = if is_apple { let section = if is_apple {
"__LLVM,__cmdline\0" c"__LLVM,__cmdline"
} else if is_aix { } else if is_aix {
".info\0" c".info"
} else { } else {
".llvmcmd\0" c".llvmcmd"
}; };
llvm::LLVMSetSection(llglobal, section.as_ptr().cast()); llvm::LLVMSetSection(llglobal, section.as_ptr().cast());
llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage); llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage);

6
compiler/rustc_codegen_llvm/src/base.rs
View File

@ -19,8 +19,6 @@ use crate::context::CodegenCx;
use crate::llvm; use crate::llvm;
use crate::value::Value; use crate::value::Value;
use cstr::cstr;
use rustc_codegen_ssa::base::maybe_create_entry_wrapper; use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
use rustc_codegen_ssa::mono_item::MonoItemExt; use rustc_codegen_ssa::mono_item::MonoItemExt;
use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::traits::*;
@ -110,11 +108,11 @@ pub fn compile_codegen_unit(tcx: TyCtxt<'_>, cgu_name: Symbol) -> (ModuleCodegen
// Create the llvm.used and llvm.compiler.used variables. // Create the llvm.used and llvm.compiler.used variables.
if !cx.used_statics.borrow().is_empty() { if !cx.used_statics.borrow().is_empty() {
cx.create_used_variable_impl(cstr!("llvm.used"), &*cx.used_statics.borrow()); cx.create_used_variable_impl(c"llvm.used", &*cx.used_statics.borrow());
} }
if !cx.compiler_used_statics.borrow().is_empty() { if !cx.compiler_used_statics.borrow().is_empty() {
cx.create_used_variable_impl( cx.create_used_variable_impl(
cstr!("llvm.compiler.used"), c"llvm.compiler.used",
&*cx.compiler_used_statics.borrow(), &*cx.compiler_used_statics.borrow(),
); );
} }

16
compiler/rustc_codegen_llvm/src/builder.rs
View File

@ -7,7 +7,6 @@ use crate::llvm_util;
use crate::type_::Type; use crate::type_::Type;
use crate::type_of::LayoutLlvmExt; use crate::type_of::LayoutLlvmExt;
use crate::value::Value; use crate::value::Value;
use cstr::cstr;
use libc::{c_char, c_uint}; use libc::{c_char, c_uint};
use rustc_codegen_ssa::common::{IntPredicate, RealPredicate, SynchronizationScope, TypeKind}; use rustc_codegen_ssa::common::{IntPredicate, RealPredicate, SynchronizationScope, TypeKind};
use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue}; use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
@ -27,7 +26,6 @@ use rustc_target::abi::{self, call::FnAbi, Align, Size, WrappingRange};
use rustc_target::spec::{HasTargetSpec, SanitizerSet, Target}; use rustc_target::spec::{HasTargetSpec, SanitizerSet, Target};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::borrow::Cow; use std::borrow::Cow;
use std::ffi::CStr;
use std::iter; use std::iter;
use std::ops::Deref; use std::ops::Deref;
use std::ptr; use std::ptr;
@ -47,13 +45,10 @@ impl Drop for Builder<'_, '_, '_> {
} }
} }
// FIXME(eddyb) use a checked constructor when they become `const fn`.
const EMPTY_C_STR: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") };
/// Empty string, to be used where LLVM expects an instruction name, indicating /// Empty string, to be used where LLVM expects an instruction name, indicating
/// that the instruction is to be left unnamed (i.e. numbered, in textual IR). /// that the instruction is to be left unnamed (i.e. numbered, in textual IR).
// FIXME(eddyb) pass `&CStr` directly to FFI once it's a thin pointer. // FIXME(eddyb) pass `&CStr` directly to FFI once it's a thin pointer.
const UNNAMED: *const c_char = EMPTY_C_STR.as_ptr(); const UNNAMED: *const c_char = c"".as_ptr();
impl<'ll, 'tcx> BackendTypes for Builder<'_, 'll, 'tcx> { impl<'ll, 'tcx> BackendTypes for Builder<'_, 'll, 'tcx> {
type Value = <CodegenCx<'ll, 'tcx> as BackendTypes>::Value; type Value = <CodegenCx<'ll, 'tcx> as BackendTypes>::Value;
@ -1012,14 +1007,13 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
} }
fn cleanup_pad(&mut self, parent: Option<&'ll Value>, args: &[&'ll Value]) -> Funclet<'ll> { fn cleanup_pad(&mut self, parent: Option<&'ll Value>, args: &[&'ll Value]) -> Funclet<'ll> {
let name = cstr!("cleanuppad");
let ret = unsafe { let ret = unsafe {
llvm::LLVMBuildCleanupPad( llvm::LLVMBuildCleanupPad(
self.llbuilder, self.llbuilder,
parent, parent,
args.as_ptr(), args.as_ptr(),
args.len() as c_uint, args.len() as c_uint,
name.as_ptr(), c"cleanuppad".as_ptr(),
) )
}; };
Funclet::new(ret.expect("LLVM does not have support for cleanuppad")) Funclet::new(ret.expect("LLVM does not have support for cleanuppad"))
@ -1033,14 +1027,13 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
} }
fn catch_pad(&mut self, parent: &'ll Value, args: &[&'ll Value]) -> Funclet<'ll> { fn catch_pad(&mut self, parent: &'ll Value, args: &[&'ll Value]) -> Funclet<'ll> {
let name = cstr!("catchpad");
let ret = unsafe { let ret = unsafe {
llvm::LLVMBuildCatchPad( llvm::LLVMBuildCatchPad(
self.llbuilder, self.llbuilder,
parent, parent,
args.as_ptr(), args.as_ptr(),
args.len() as c_uint, args.len() as c_uint,
name.as_ptr(), c"catchpad".as_ptr(),
) )
}; };
Funclet::new(ret.expect("LLVM does not have support for catchpad")) Funclet::new(ret.expect("LLVM does not have support for catchpad"))
@ -1052,14 +1045,13 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
unwind: Option<&'ll BasicBlock>, unwind: Option<&'ll BasicBlock>,
handlers: &[&'ll BasicBlock], handlers: &[&'ll BasicBlock],
) -> &'ll Value { ) -> &'ll Value {
let name = cstr!("catchswitch");
let ret = unsafe { let ret = unsafe {
llvm::LLVMBuildCatchSwitch( llvm::LLVMBuildCatchSwitch(
self.llbuilder, self.llbuilder,
parent, parent,
unwind, unwind,
handlers.len() as c_uint, handlers.len() as c_uint,
name.as_ptr(), c"catchswitch".as_ptr(),
) )
}; };
let ret = ret.expect("LLVM does not have support for catchswitch"); let ret = ret.expect("LLVM does not have support for catchswitch");

7
compiler/rustc_codegen_llvm/src/consts.rs
View File

@ -8,7 +8,6 @@ use crate::llvm::{self, True};
use crate::type_::Type; use crate::type_::Type;
use crate::type_of::LayoutLlvmExt; use crate::type_of::LayoutLlvmExt;
use crate::value::Value; use crate::value::Value;
use cstr::cstr;
use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::traits::*;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs}; use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
@ -473,9 +472,9 @@ impl<'ll> StaticMethods for CodegenCx<'ll, '_> {
.all(|&byte| byte == 0); .all(|&byte| byte == 0);
let sect_name = if all_bytes_are_zero { let sect_name = if all_bytes_are_zero {
cstr!("__DATA,__thread_bss") c"__DATA,__thread_bss"
} else { } else {
cstr!("__DATA,__thread_data") c"__DATA,__thread_data"
}; };
llvm::LLVMSetSection(g, sect_name.as_ptr()); llvm::LLVMSetSection(g, sect_name.as_ptr());
} }
@ -504,7 +503,7 @@ impl<'ll> StaticMethods for CodegenCx<'ll, '_> {
let val = llvm::LLVMMetadataAsValue(self.llcx, meta); let val = llvm::LLVMMetadataAsValue(self.llcx, meta);
llvm::LLVMAddNamedMetadataOperand( llvm::LLVMAddNamedMetadataOperand(
self.llmod, self.llmod,
"wasm.custom_sections\0".as_ptr().cast(), c"wasm.custom_sections".as_ptr().cast(),
val, val,
); );
} }

34
compiler/rustc_codegen_llvm/src/context.rs
View File

@ -8,7 +8,6 @@ use crate::llvm_util;
use crate::type_::Type; use crate::type_::Type;
use crate::value::Value; use crate::value::Value;
use cstr::cstr;
use rustc_codegen_ssa::base::{wants_msvc_seh, wants_wasm_eh}; use rustc_codegen_ssa::base::{wants_msvc_seh, wants_wasm_eh};
use rustc_codegen_ssa::errors as ssa_errors; use rustc_codegen_ssa::errors as ssa_errors;
use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::traits::*;
@ -215,13 +214,13 @@ pub unsafe fn create_module<'ll>(
// If skipping the PLT is enabled, we need to add some module metadata // If skipping the PLT is enabled, we need to add some module metadata
// to ensure intrinsic calls don't use it. // to ensure intrinsic calls don't use it.
if !sess.needs_plt() { if !sess.needs_plt() {
let avoid_plt = "RtLibUseGOT\0".as_ptr().cast(); let avoid_plt = c"RtLibUseGOT".as_ptr().cast();
llvm::LLVMRustAddModuleFlag(llmod, llvm::LLVMModFlagBehavior::Warning, avoid_plt, 1); llvm::LLVMRustAddModuleFlag(llmod, llvm::LLVMModFlagBehavior::Warning, avoid_plt, 1);
} }
// Enable canonical jump tables if CFI is enabled. (See https://reviews.llvm.org/D65629.) // Enable canonical jump tables if CFI is enabled. (See https://reviews.llvm.org/D65629.)
if sess.is_sanitizer_cfi_canonical_jump_tables_enabled() && sess.is_sanitizer_cfi_enabled() { if sess.is_sanitizer_cfi_canonical_jump_tables_enabled() && sess.is_sanitizer_cfi_enabled() {
let canonical_jump_tables = "CFI Canonical Jump Tables\0".as_ptr().cast(); let canonical_jump_tables = c"CFI Canonical Jump Tables".as_ptr().cast();
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Override, llvm::LLVMModFlagBehavior::Override,
@ -232,7 +231,7 @@ pub unsafe fn create_module<'ll>(
// Enable LTO unit splitting if specified or if CFI is enabled. (See https://reviews.llvm.org/D53891.) // Enable LTO unit splitting if specified or if CFI is enabled. (See https://reviews.llvm.org/D53891.)
if sess.is_split_lto_unit_enabled() || sess.is_sanitizer_cfi_enabled() { if sess.is_split_lto_unit_enabled() || sess.is_sanitizer_cfi_enabled() {
let enable_split_lto_unit = "EnableSplitLTOUnit\0".as_ptr().cast(); let enable_split_lto_unit = c"EnableSplitLTOUnit".as_ptr().cast();
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Override, llvm::LLVMModFlagBehavior::Override,
@ -243,7 +242,7 @@ pub unsafe fn create_module<'ll>(
// Add "kcfi" module flag if KCFI is enabled. (See https://reviews.llvm.org/D119296.) // Add "kcfi" module flag if KCFI is enabled. (See https://reviews.llvm.org/D119296.)
if sess.is_sanitizer_kcfi_enabled() { if sess.is_sanitizer_kcfi_enabled() {
let kcfi = "kcfi\0".as_ptr().cast(); let kcfi = c"kcfi".as_ptr().cast();
llvm::LLVMRustAddModuleFlag(llmod, llvm::LLVMModFlagBehavior::Override, kcfi, 1); llvm::LLVMRustAddModuleFlag(llmod, llvm::LLVMModFlagBehavior::Override, kcfi, 1);
} }
@ -256,7 +255,7 @@ pub unsafe fn create_module<'ll>(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Warning, llvm::LLVMModFlagBehavior::Warning,
"cfguard\0".as_ptr() as *const _, c"cfguard".as_ptr() as *const _,
1, 1,
) )
} }
@ -265,7 +264,7 @@ pub unsafe fn create_module<'ll>(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Warning, llvm::LLVMModFlagBehavior::Warning,
"cfguard\0".as_ptr() as *const _, c"cfguard".as_ptr() as *const _,
2, 2,
) )
} }
@ -283,26 +282,26 @@ pub unsafe fn create_module<'ll>(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
behavior, behavior,
"branch-target-enforcement\0".as_ptr().cast(), c"branch-target-enforcement".as_ptr().cast(),
bti.into(), bti.into(),
); );
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
behavior, behavior,
"sign-return-address\0".as_ptr().cast(), c"sign-return-address".as_ptr().cast(),
pac_ret.is_some().into(), pac_ret.is_some().into(),
); );
let pac_opts = pac_ret.unwrap_or(PacRet { leaf: false, key: PAuthKey::A }); let pac_opts = pac_ret.unwrap_or(PacRet { leaf: false, key: PAuthKey::A });
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
behavior, behavior,
"sign-return-address-all\0".as_ptr().cast(), c"sign-return-address-all".as_ptr().cast(),
pac_opts.leaf.into(), pac_opts.leaf.into(),
); );
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
behavior, behavior,
"sign-return-address-with-bkey\0".as_ptr().cast(), c"sign-return-address-with-bkey".as_ptr().cast(),
u32::from(pac_opts.key == PAuthKey::B), u32::from(pac_opts.key == PAuthKey::B),
); );
} else { } else {
@ -318,7 +317,7 @@ pub unsafe fn create_module<'ll>(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Override, llvm::LLVMModFlagBehavior::Override,
"cf-protection-branch\0".as_ptr().cast(), c"cf-protection-branch".as_ptr().cast(),
1, 1,
) )
} }
@ -326,7 +325,7 @@ pub unsafe fn create_module<'ll>(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Override, llvm::LLVMModFlagBehavior::Override,
"cf-protection-return\0".as_ptr().cast(), c"cf-protection-return".as_ptr().cast(),
1, 1,
) )
} }
@ -335,7 +334,7 @@ pub unsafe fn create_module<'ll>(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Error, llvm::LLVMModFlagBehavior::Error,
"Virtual Function Elim\0".as_ptr().cast(), c"Virtual Function Elim".as_ptr().cast(),
1, 1,
); );
} }
@ -345,7 +344,7 @@ pub unsafe fn create_module<'ll>(
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Warning, llvm::LLVMModFlagBehavior::Warning,
"ehcontguard\0".as_ptr() as *const _, c"ehcontguard".as_ptr() as *const _,
1, 1,
) )
} }
@ -363,7 +362,7 @@ pub unsafe fn create_module<'ll>(
); );
llvm::LLVMAddNamedMetadataOperand( llvm::LLVMAddNamedMetadataOperand(
llmod, llmod,
cstr!("llvm.ident").as_ptr(), c"llvm.ident".as_ptr(),
llvm::LLVMMDNodeInContext(llcx, &name_metadata, 1), llvm::LLVMMDNodeInContext(llcx, &name_metadata, 1),
); );
@ -511,14 +510,13 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
} }
pub(crate) fn create_used_variable_impl(&self, name: &'static CStr, values: &[&'ll Value]) { pub(crate) fn create_used_variable_impl(&self, name: &'static CStr, values: &[&'ll Value]) {
let section = cstr!("llvm.metadata");
let array = self.const_array(self.type_ptr(), values); let array = self.const_array(self.type_ptr(), values);
unsafe { unsafe {
let g = llvm::LLVMAddGlobal(self.llmod, self.val_ty(array), name.as_ptr()); let g = llvm::LLVMAddGlobal(self.llmod, self.val_ty(array), name.as_ptr());
llvm::LLVMSetInitializer(g, array); llvm::LLVMSetInitializer(g, array);
llvm::LLVMRustSetLinkage(g, llvm::Linkage::AppendingLinkage); llvm::LLVMRustSetLinkage(g, llvm::Linkage::AppendingLinkage);
llvm::LLVMSetSection(g, section.as_ptr()); llvm::LLVMSetSection(g, c"llvm.metadata".as_ptr());
} }
} }
} }

7
compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs
View File

@ -30,14 +30,13 @@ pub fn insert_reference_to_gdb_debug_scripts_section_global(bx: &mut Builder<'_,
/// Allocates the global variable responsible for the .debug_gdb_scripts binary /// Allocates the global variable responsible for the .debug_gdb_scripts binary
/// section. /// section.
pub fn get_or_insert_gdb_debug_scripts_section_global<'ll>(cx: &CodegenCx<'ll, '_>) -> &'ll Value { pub fn get_or_insert_gdb_debug_scripts_section_global<'ll>(cx: &CodegenCx<'ll, '_>) -> &'ll Value {
let c_section_var_name = "__rustc_debug_gdb_scripts_section__\0"; let c_section_var_name = c"__rustc_debug_gdb_scripts_section__";
let section_var_name = &c_section_var_name[..c_section_var_name.len() - 1]; let section_var_name = c_section_var_name.to_str().unwrap();
let section_var = let section_var =
unsafe { llvm::LLVMGetNamedGlobal(cx.llmod, c_section_var_name.as_ptr().cast()) }; unsafe { llvm::LLVMGetNamedGlobal(cx.llmod, c_section_var_name.as_ptr().cast()) };
section_var.unwrap_or_else(|| { section_var.unwrap_or_else(|| {
let section_name = b".debug_gdb_scripts\0";
let mut section_contents = Vec::new(); let mut section_contents = Vec::new();
// Add the pretty printers for the standard library first. // Add the pretty printers for the standard library first.
@ -70,7 +69,7 @@ pub fn get_or_insert_gdb_debug_scripts_section_global<'ll>(cx: &CodegenCx<'ll, '
let section_var = cx let section_var = cx
.define_global(section_var_name, llvm_type) .define_global(section_var_name, llvm_type)
.unwrap_or_else(|| bug!("symbol `{}` is already defined", section_var_name)); .unwrap_or_else(|| bug!("symbol `{}` is already defined", section_var_name));
llvm::LLVMSetSection(section_var, section_name.as_ptr().cast()); llvm::LLVMSetSection(section_var, c".debug_gdb_scripts".as_ptr().cast());
llvm::LLVMSetInitializer(section_var, cx.const_bytes(section_contents)); llvm::LLVMSetInitializer(section_var, cx.const_bytes(section_contents));
llvm::LLVMSetGlobalConstant(section_var, llvm::True); llvm::LLVMSetGlobalConstant(section_var, llvm::True);
llvm::LLVMSetUnnamedAddress(section_var, llvm::UnnamedAddr::Global); llvm::LLVMSetUnnamedAddress(section_var, llvm::UnnamedAddr::Global);

7
compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
View File

@ -21,7 +21,6 @@ use crate::llvm::debuginfo::{
}; };
use crate::value::Value; use crate::value::Value;
use cstr::cstr;
use rustc_codegen_ssa::debuginfo::type_names::cpp_like_debuginfo; use rustc_codegen_ssa::debuginfo::type_names::cpp_like_debuginfo;
use rustc_codegen_ssa::debuginfo::type_names::VTableNameKind; use rustc_codegen_ssa::debuginfo::type_names::VTableNameKind;
use rustc_codegen_ssa::traits::*; use rustc_codegen_ssa::traits::*;
@ -856,7 +855,6 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
use rustc_session::RemapFileNameExt; use rustc_session::RemapFileNameExt;
let name_in_debuginfo = name_in_debuginfo.to_string_lossy(); let name_in_debuginfo = name_in_debuginfo.to_string_lossy();
let work_dir = tcx.sess.opts.working_dir.for_codegen(tcx.sess).to_string_lossy(); let work_dir = tcx.sess.opts.working_dir.for_codegen(tcx.sess).to_string_lossy();
let flags = "\0";
let output_filenames = tcx.output_filenames(()); let output_filenames = tcx.output_filenames(());
let split_name = if tcx.sess.target_can_use_split_dwarf() { let split_name = if tcx.sess.target_can_use_split_dwarf() {
output_filenames output_filenames
@ -910,7 +908,7 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
producer.as_ptr().cast(), producer.as_ptr().cast(),
producer.len(), producer.len(),
tcx.sess.opts.optimize != config::OptLevel::No, tcx.sess.opts.optimize != config::OptLevel::No,
flags.as_ptr().cast(), c"".as_ptr().cast(),
0, 0,
// NB: this doesn't actually have any perceptible effect, it seems. LLVM will instead // NB: this doesn't actually have any perceptible effect, it seems. LLVM will instead
// put the path supplied to `MCSplitDwarfFile` into the debug info of the final // put the path supplied to `MCSplitDwarfFile` into the debug info of the final
@ -940,8 +938,7 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
); );
let val = llvm::LLVMMetadataAsValue(debug_context.llcontext, gcov_metadata); let val = llvm::LLVMMetadataAsValue(debug_context.llcontext, gcov_metadata);
let llvm_gcov_ident = cstr!("llvm.gcov"); llvm::LLVMAddNamedMetadataOperand(debug_context.llmod, c"llvm.gcov".as_ptr(), val);
llvm::LLVMAddNamedMetadataOperand(debug_context.llmod, llvm_gcov_ident.as_ptr(), val);
} }
return unit_metadata; return unit_metadata;

7
compiler/rustc_codegen_llvm/src/debuginfo/mod.rs
View File

@ -112,7 +112,7 @@ impl<'ll, 'tcx> CodegenUnitDebugContext<'ll, 'tcx> {
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
self.llmod, self.llmod,
llvm::LLVMModFlagBehavior::Warning, llvm::LLVMModFlagBehavior::Warning,
"Dwarf Version\0".as_ptr().cast(), c"Dwarf Version".as_ptr().cast(),
dwarf_version, dwarf_version,
); );
} else { } else {
@ -120,17 +120,16 @@ impl<'ll, 'tcx> CodegenUnitDebugContext<'ll, 'tcx> {
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
self.llmod, self.llmod,
llvm::LLVMModFlagBehavior::Warning, llvm::LLVMModFlagBehavior::Warning,
"CodeView\0".as_ptr().cast(), c"CodeView".as_ptr().cast(),
1, 1,
) )
} }
// Prevent bitcode readers from deleting the debug info. // Prevent bitcode readers from deleting the debug info.
let ptr = "Debug Info Version\0".as_ptr();
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
self.llmod, self.llmod,
llvm::LLVMModFlagBehavior::Warning, llvm::LLVMModFlagBehavior::Warning,
ptr.cast(), c"Debug Info Version".as_ptr().cast(),
llvm::LLVMRustDebugMetadataVersion(), llvm::LLVMRustDebugMetadataVersion(),
); );
} }

1
compiler/rustc_codegen_llvm/src/lib.rs
View File

@ -8,6 +8,7 @@
#![feature(rustdoc_internals)] #![feature(rustdoc_internals)]
#![doc(rust_logo)] #![doc(rust_logo)]
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![cfg_attr(bootstrap, feature(c_str_literals))]
#![feature(exact_size_is_empty)] #![feature(exact_size_is_empty)]
#![feature(extern_types)] #![feature(extern_types)]
#![feature(hash_raw_entry)] #![feature(hash_raw_entry)]

1
library/std/src/lib.rs
View File

@ -308,6 +308,7 @@
// //
// Library features (core): // Library features (core):
// tidy-alphabetical-start // tidy-alphabetical-start
#![cfg_attr(bootstrap, feature(c_str_literals))]
#![feature(char_internals)] #![feature(char_internals)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(core_io_borrowed_buf)] #![feature(core_io_borrowed_buf)]

14
library/std/src/sys/unix/args.rs
View File

@ -244,13 +244,15 @@ mod imp {
let mut res = Vec::new(); let mut res = Vec::new();
unsafe { unsafe {
let process_info_sel = sel_registerName("processInfo\0".as_ptr()); let process_info_sel =
let arguments_sel = sel_registerName("arguments\0".as_ptr()); sel_registerName(c"processInfo".as_ptr() as *const libc::c_uchar);
let utf8_sel = sel_registerName("UTF8String\0".as_ptr()); let arguments_sel = sel_registerName(c"arguments".as_ptr() as *const libc::c_uchar);
let count_sel = sel_registerName("count\0".as_ptr()); let utf8_sel = sel_registerName(c"UTF8String".as_ptr() as *const libc::c_uchar);
let object_at_sel = sel_registerName("objectAtIndex:\0".as_ptr()); let count_sel = sel_registerName(c"count".as_ptr() as *const libc::c_uchar);
let object_at_sel =
sel_registerName(c"objectAtIndex:".as_ptr() as *const libc::c_uchar);
let klass = objc_getClass("NSProcessInfo\0".as_ptr()); let klass = objc_getClass(c"NSProcessInfo".as_ptr() as *const libc::c_uchar);
let info = objc_msgSend(klass, process_info_sel); let info = objc_msgSend(klass, process_info_sel);
let args = objc_msgSend(info, arguments_sel); let args = objc_msgSend(info, arguments_sel);

2
library/std/src/sys/unix/fs.rs
View File

@ -1140,7 +1140,7 @@ impl File {
cfg_has_statx! { cfg_has_statx! {
if let Some(ret) = unsafe { try_statx( if let Some(ret) = unsafe { try_statx(
fd, fd,
b"\0" as *const _ as *const c_char, c"".as_ptr() as *const c_char,
libc::AT_EMPTY_PATH | libc::AT_STATX_SYNC_AS_STAT, libc::AT_EMPTY_PATH | libc::AT_STATX_SYNC_AS_STAT,
libc::STATX_ALL, libc::STATX_ALL,
) } { ) } {

7
library/std/src/sys/unix/mod.rs
View File

@ -1,6 +1,5 @@
#![allow(missing_docs, nonstandard_style)] #![allow(missing_docs, nonstandard_style)]
use crate::ffi::CStr;
use crate::io::ErrorKind; use crate::io::ErrorKind;
pub use self::rand::hashmap_random_keys; pub use self::rand::hashmap_random_keys;
@ -75,7 +74,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
// thread-id for the main thread and so renaming the main thread will rename the // thread-id for the main thread and so renaming the main thread will rename the
// process and we only want to enable this on platforms we've tested. // process and we only want to enable this on platforms we've tested.
if cfg!(target_os = "macos") { if cfg!(target_os = "macos") {
thread::Thread::set_name(&CStr::from_bytes_with_nul_unchecked(b"main\0")); thread::Thread::set_name(&c"main");
} }
unsafe fn sanitize_standard_fds() { unsafe fn sanitize_standard_fds() {
@ -127,7 +126,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
if pfd.revents & libc::POLLNVAL == 0 { if pfd.revents & libc::POLLNVAL == 0 {
continue; continue;
} }
if open64("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 { if open64(c"/dev/null".as_ptr().cast(), libc::O_RDWR, 0) == -1 {
// If the stream is closed but we failed to reopen it, abort the // If the stream is closed but we failed to reopen it, abort the
// process. Otherwise we wouldn't preserve the safety of // process. Otherwise we wouldn't preserve the safety of
// operations on the corresponding Rust object Stdin, Stdout, or // operations on the corresponding Rust object Stdin, Stdout, or
@ -157,7 +156,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
use libc::open64; use libc::open64;
for fd in 0..3 { for fd in 0..3 {
if libc::fcntl(fd, libc::F_GETFD) == -1 && errno() == libc::EBADF { if libc::fcntl(fd, libc::F_GETFD) == -1 && errno() == libc::EBADF {
if open64("/dev/null\0".as_ptr().cast(), libc::O_RDWR, 0) == -1 { if open64(c"/dev/null".as_ptr().cast(), libc::O_RDWR, 0) == -1 {
// If the stream is closed but we failed to reopen it, abort the // If the stream is closed but we failed to reopen it, abort the
// process. Otherwise we wouldn't preserve the safety of // process. Otherwise we wouldn't preserve the safety of
// operations on the corresponding Rust object Stdin, Stdout, or // operations on the corresponding Rust object Stdin, Stdout, or

9
library/std/src/sys/unix/process/process_common.rs
View File

@ -24,11 +24,11 @@ cfg_if::cfg_if! {
if #[cfg(target_os = "fuchsia")] { if #[cfg(target_os = "fuchsia")] {
// fuchsia doesn't have /dev/null // fuchsia doesn't have /dev/null
} else if #[cfg(target_os = "redox")] { } else if #[cfg(target_os = "redox")] {
const DEV_NULL: &str = "null:\0"; const DEV_NULL: &CStr = c"null:";
} else if #[cfg(target_os = "vxworks")] { } else if #[cfg(target_os = "vxworks")] {
const DEV_NULL: &str = "/null\0"; const DEV_NULL: &CStr = c"/null";
} else { } else {
const DEV_NULL: &str = "/dev/null\0"; const DEV_NULL: &CStr = c"/dev/null";
} }
} }
@ -481,8 +481,7 @@ impl Stdio {
let mut opts = OpenOptions::new(); let mut opts = OpenOptions::new();
opts.read(readable); opts.read(readable);
opts.write(!readable); opts.write(!readable);
let path = unsafe { CStr::from_ptr(DEV_NULL.as_ptr() as *const _) }; let fd = File::open_c(DEV_NULL, &opts)?;
let fd = File::open_c(&path, &opts)?;
Ok((ChildStdio::Owned(fd.into_inner()), None)) Ok((ChildStdio::Owned(fd.into_inner()), None))
} }

3
library/std/src/sys/unix/thread.rs
View File

@ -163,10 +163,9 @@ impl Thread {
#[cfg(target_os = "netbsd")] #[cfg(target_os = "netbsd")]
pub fn set_name(name: &CStr) { pub fn set_name(name: &CStr) {
unsafe { unsafe {
let cname = CStr::from_bytes_with_nul_unchecked(b"%s\0".as_slice());
let res = libc::pthread_setname_np( let res = libc::pthread_setname_np(
libc::pthread_self(), libc::pthread_self(),
cname.as_ptr(), c"%s".as_ptr(),
name.as_ptr() as *mut libc::c_void, name.as_ptr() as *mut libc::c_void,
); );
debug_assert_eq!(res, 0); debug_assert_eq!(res, 0);

4
library/std/src/sys/windows/c.rs
View File

@ -324,7 +324,7 @@ pub unsafe fn NtWriteFile(
// Functions that aren't available on every version of Windows that we support, // Functions that aren't available on every version of Windows that we support,
// but we still use them and just provide some form of a fallback implementation. // but we still use them and just provide some form of a fallback implementation.
compat_fn_with_fallback! { compat_fn_with_fallback! {
pub static KERNEL32: &CStr = ansi_str!("kernel32"); pub static KERNEL32: &CStr = c"kernel32";
// >= Win10 1607 // >= Win10 1607
// https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setthreaddescription // https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-setthreaddescription
@ -357,7 +357,7 @@ compat_fn_optional! {
} }
compat_fn_with_fallback! { compat_fn_with_fallback! {
pub static NTDLL: &CStr = ansi_str!("ntdll"); pub static NTDLL: &CStr = c"ntdll";
pub fn NtCreateKeyedEvent( pub fn NtCreateKeyedEvent(
KeyedEventHandle: LPHANDLE, KeyedEventHandle: LPHANDLE,

6
library/std/src/sys/windows/compat.rs
View File

@ -225,9 +225,9 @@ macro_rules! compat_fn_optional {
/// Load all needed functions from "api-ms-win-core-synch-l1-2-0". /// Load all needed functions from "api-ms-win-core-synch-l1-2-0".
pub(super) fn load_synch_functions() { pub(super) fn load_synch_functions() {
fn try_load() -> Option<()> { fn try_load() -> Option<()> {
const MODULE_NAME: &CStr = ansi_str!("api-ms-win-core-synch-l1-2-0"); const MODULE_NAME: &CStr = c"api-ms-win-core-synch-l1-2-0";
const WAIT_ON_ADDRESS: &CStr = ansi_str!("WaitOnAddress"); const WAIT_ON_ADDRESS: &CStr = c"WaitOnAddress";
const WAKE_BY_ADDRESS_SINGLE: &CStr = ansi_str!("WakeByAddressSingle"); const WAKE_BY_ADDRESS_SINGLE: &CStr = c"WakeByAddressSingle";
// Try loading the library and all the required functions. // Try loading the library and all the required functions.
// If any step fails, then they all fail. // If any step fails, then they all fail.

4
library/std/src/sys/windows/mod.rs
View File

@ -1,6 +1,6 @@
#![allow(missing_docs, nonstandard_style)] #![allow(missing_docs, nonstandard_style)]
use crate::ffi::{CStr, OsStr, OsString}; use crate::ffi::{OsStr, OsString};
use crate::io::ErrorKind; use crate::io::ErrorKind;
use crate::mem::MaybeUninit; use crate::mem::MaybeUninit;
use crate::os::windows::ffi::{OsStrExt, OsStringExt}; use crate::os::windows::ffi::{OsStrExt, OsStringExt};
@ -63,7 +63,7 @@ pub unsafe fn init(_argc: isize, _argv: *const *const u8, _sigpipe: u8) {
// Normally, `thread::spawn` will call `Thread::set_name` but since this thread already // Normally, `thread::spawn` will call `Thread::set_name` but since this thread already
// exists, we have to call it ourselves. // exists, we have to call it ourselves.
thread::Thread::set_name(CStr::from_bytes_with_nul_unchecked(b"main\0")); thread::Thread::set_name(&c"main");
} }
// SAFETY: must be called only once during runtime cleanup. // SAFETY: must be called only once during runtime cleanup.

1
src/tools/tidy/src/deps.rs
View File

@ -211,7 +211,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"crossbeam-epoch", "crossbeam-epoch",
"crossbeam-utils", "crossbeam-utils",
"crypto-common", "crypto-common",
"cstr",
"darling", "darling",
"darling_core", "darling_core",
"darling_macro", "darling_macro",