Skip to content

Commit 4fa3342

Browse files
klensyklensy
committed
compiler: replace cstr macro with c str literals in compiler and few other c str replacements
1 parent 71940e0 commit 4fa3342

File tree

14 files changed

+43
-71
lines changed

14 files changed

+43
-71
lines changed

‎Cargo.lock

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -869,16 +869,6 @@ dependencies = [
869869
"typenum",
870870
]
871871

872-
[[package]]
873-
name = "cstr"
874-
version = "0.2.8"
875-
source = "registry+https://github.com/rust-lang/crates.io-index"
876-
checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
877-
dependencies = [
878-
"proc-macro2",
879-
"quote",
880-
]
881-
882872
[[package]]
883873
name = "ctrlc"
884874
version = "3.4.0"
@@ -3585,7 +3575,6 @@ name = "rustc_codegen_llvm"
35853575
version = "0.0.0"
35863576
dependencies = [
35873577
"bitflags 1.3.2",
3588-
"cstr",
35893578
"itertools",
35903579
"libc",
35913580
"measureme",

‎compiler/rustc_codegen_llvm/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ test = false
99
[dependencies]
1010
# tidy-alphabetical-start
1111
bitflags = "1.0"
12-
cstr = "0.2"
1312
itertools = "0.11"
1413
libc = "0.2"
1514
measureme = "10.0.0"

‎compiler/rustc_codegen_llvm/src/allocator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ fn create_wrapper_function(
146146
}
147147
llvm::LLVMRustSetVisibility(callee, llvm::Visibility::Hidden);
148148

149-
let llbb = llvm::LLVMAppendBasicBlockInContext(llcx, llfn, "entry\0".as_ptr().cast());
149+
let llbb = llvm::LLVMAppendBasicBlockInContext(llcx, llfn, c"entry".as_ptr().cast());
150150

151151
let llbuilder = llvm::LLVMCreateBuilderInContext(llcx);
152152
llvm::LLVMPositionBuilderAtEnd(llbuilder, llbb);

‎compiler/rustc_codegen_llvm/src/back/lto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ pub(crate) fn run_pass_manager(
631631
llvm::LLVMRustAddModuleFlag(
632632
module.module_llvm.llmod(),
633633
llvm::LLVMModFlagBehavior::Error,
634-
"LTOPostLink\0".as_ptr().cast(),
634+
c"LTOPostLink".as_ptr().cast(),
635635
1,
636636
);
637637
}

‎compiler/rustc_codegen_llvm/src/back/write.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,7 @@ fn target_is_aix(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {
916916
cgcx.opts.target_triple.triple().contains("-aix")
917917
}
918918

919+
//FIXME use c string literals here too
919920
pub(crate) fn bitcode_section_name(cgcx: &CodegenContext<LlvmCodegenBackend>) -> &'static str {
920921
if target_is_apple(cgcx) {
921922
"__LLVM,__bitcode\0"
@@ -994,7 +995,7 @@ unsafe fn embed_bitcode(
994995
let llglobal = llvm::LLVMAddGlobal(
995996
llmod,
996997
common::val_ty(llconst),
997-
"rustc.embedded.module\0".as_ptr().cast(),
998+
c"rustc.embedded.module".as_ptr().cast(),
998999
);
9991000
llvm::LLVMSetInitializer(llglobal, llconst);
10001001

@@ -1007,15 +1008,15 @@ unsafe fn embed_bitcode(
10071008
let llglobal = llvm::LLVMAddGlobal(
10081009
llmod,
10091010
common::val_ty(llconst),
1010-
"rustc.embedded.cmdline\0".as_ptr().cast(),
1011+
c"rustc.embedded.cmdline".as_ptr().cast(),
10111012
);
10121013
llvm::LLVMSetInitializer(llglobal, llconst);
10131014
let section = if is_apple {
1014-
"__LLVM,__cmdline\0"
1015+
c"__LLVM,__cmdline"
10151016
} else if is_aix {
1016-
".info\0"
1017+
c".info"
10171018
} else {
1018-
".llvmcmd\0"
1019+
c".llvmcmd"
10191020
};
10201021
llvm::LLVMSetSection(llglobal, section.as_ptr().cast());
10211022
llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage);

‎compiler/rustc_codegen_llvm/src/base.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ use crate::context::CodegenCx;
1919
use crate::llvm;
2020
use crate::value::Value;
2121

22-
use cstr::cstr;
23-
2422
use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
2523
use rustc_codegen_ssa::mono_item::MonoItemExt;
2624
use rustc_codegen_ssa::traits::*;
@@ -110,11 +108,11 @@ pub fn compile_codegen_unit(tcx: TyCtxt<'_>, cgu_name: Symbol) -> (ModuleCodegen
110108

111109
// Create the llvm.used and llvm.compiler.used variables.
112110
if !cx.used_statics.borrow().is_empty() {
113-
cx.create_used_variable_impl(cstr!("llvm.used"), &*cx.used_statics.borrow());
111+
cx.create_used_variable_impl(c"llvm.used", &*cx.used_statics.borrow());
114112
}
115113
if !cx.compiler_used_statics.borrow().is_empty() {
116114
cx.create_used_variable_impl(
117-
cstr!("llvm.compiler.used"),
115+
c"llvm.compiler.used",
118116
&*cx.compiler_used_statics.borrow(),
119117
);
120118
}

‎compiler/rustc_codegen_llvm/src/builder.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use crate::llvm_util;
77
use crate::type_::Type;
88
use crate::type_of::LayoutLlvmExt;
99
use crate::value::Value;
10-
use cstr::cstr;
1110
use libc::{c_char, c_uint};
1211
use rustc_codegen_ssa::common::{IntPredicate, RealPredicate, SynchronizationScope, TypeKind};
1312
use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
@@ -27,7 +26,6 @@ use rustc_target::abi::{self, call::FnAbi, Align, Size, WrappingRange};
2726
use rustc_target::spec::{HasTargetSpec, SanitizerSet, Target};
2827
use smallvec::SmallVec;
2928
use std::borrow::Cow;
30-
use std::ffi::CStr;
3129
use std::iter;
3230
use std::ops::Deref;
3331
use std::ptr;
@@ -47,13 +45,10 @@ impl Drop for Builder<'_, '_, '_> {
4745
}
4846
}
4947

50-
// FIXME(eddyb) use a checked constructor when they become `const fn`.
51-
const EMPTY_C_STR: &CStr = unsafe { CStr::from_bytes_with_nul_unchecked(b"\0") };
52-
5348
/// Empty string, to be used where LLVM expects an instruction name, indicating
5449
/// that the instruction is to be left unnamed (i.e. numbered, in textual IR).
5550
// FIXME(eddyb) pass `&CStr` directly to FFI once it's a thin pointer.
56-
const UNNAMED: *const c_char = EMPTY_C_STR.as_ptr();
51+
const UNNAMED: *const c_char = c"".as_ptr();
5752

5853
impl<'ll, 'tcx> BackendTypes for Builder<'_, 'll, 'tcx> {
5954
type Value = <CodegenCx<'ll, 'tcx> as BackendTypes>::Value;
@@ -1003,14 +998,13 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
1003998
}
1004999

10051000
fn cleanup_pad(&mut self, parent: Option<&'ll Value>, args: &[&'ll Value]) -> Funclet<'ll> {
1006-
let name = cstr!("cleanuppad");
10071001
let ret = unsafe {
10081002
llvm::LLVMBuildCleanupPad(
10091003
self.llbuilder,
10101004
parent,
10111005
args.as_ptr(),
10121006
args.len() as c_uint,
1013-
name.as_ptr(),
1007+
c"cleanuppad".as_ptr(),
10141008
)
10151009
};
10161010
Funclet::new(ret.expect("LLVM does not have support for cleanuppad"))
@@ -1024,14 +1018,13 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
10241018
}
10251019

10261020
fn catch_pad(&mut self, parent: &'ll Value, args: &[&'ll Value]) -> Funclet<'ll> {
1027-
let name = cstr!("catchpad");
10281021
let ret = unsafe {
10291022
llvm::LLVMBuildCatchPad(
10301023
self.llbuilder,
10311024
parent,
10321025
args.as_ptr(),
10331026
args.len() as c_uint,
1034-
name.as_ptr(),
1027+
c"catchpad".as_ptr(),
10351028
)
10361029
};
10371030
Funclet::new(ret.expect("LLVM does not have support for catchpad"))
@@ -1043,14 +1036,13 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
10431036
unwind: Option<&'ll BasicBlock>,
10441037
handlers: &[&'ll BasicBlock],
10451038
) -> &'ll Value {
1046-
let name = cstr!("catchswitch");
10471039
let ret = unsafe {
10481040
llvm::LLVMBuildCatchSwitch(
10491041
self.llbuilder,
10501042
parent,
10511043
unwind,
10521044
handlers.len() as c_uint,
1053-
name.as_ptr(),
1045+
c"catchswitch".as_ptr(),
10541046
)
10551047
};
10561048
let ret = ret.expect("LLVM does not have support for catchswitch");

‎compiler/rustc_codegen_llvm/src/consts.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use crate::llvm::{self, True};
88
use crate::type_::Type;
99
use crate::type_of::LayoutLlvmExt;
1010
use crate::value::Value;
11-
use cstr::cstr;
1211
use rustc_codegen_ssa::traits::*;
1312
use rustc_hir::def_id::DefId;
1413
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
@@ -476,9 +475,9 @@ impl<'ll> StaticMethods for CodegenCx<'ll, '_> {
476475
.all(|&byte| byte == 0);
477476

478477
let sect_name = if all_bytes_are_zero {
479-
cstr!("__DATA,__thread_bss")
478+
c"__DATA,__thread_bss"
480479
} else {
481-
cstr!("__DATA,__thread_data")
480+
c"__DATA,__thread_data"
482481
};
483482
llvm::LLVMSetSection(g, sect_name.as_ptr());
484483
}
@@ -507,7 +506,7 @@ impl<'ll> StaticMethods for CodegenCx<'ll, '_> {
507506
let val = llvm::LLVMMetadataAsValue(self.llcx, meta);
508507
llvm::LLVMAddNamedMetadataOperand(
509508
self.llmod,
510-
"wasm.custom_sections\0".as_ptr().cast(),
509+
c"wasm.custom_sections".as_ptr().cast(),
511510
val,
512511
);
513512
}

‎compiler/rustc_codegen_llvm/src/context.rs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use crate::llvm_util;
88
use crate::type_::Type;
99
use crate::value::Value;
1010

11-
use cstr::cstr;
1211
use rustc_codegen_ssa::base::{wants_msvc_seh, wants_wasm_eh};
1312
use rustc_codegen_ssa::errors as ssa_errors;
1413
use rustc_codegen_ssa::traits::*;
@@ -214,13 +213,13 @@ pub unsafe fn create_module<'ll>(
214213
// If skipping the PLT is enabled, we need to add some module metadata
215214
// to ensure intrinsic calls don't use it.
216215
if !sess.needs_plt() {
217-
let avoid_plt = "RtLibUseGOT\0".as_ptr().cast();
216+
let avoid_plt = c"RtLibUseGOT".as_ptr().cast();
218217
llvm::LLVMRustAddModuleFlag(llmod, llvm::LLVMModFlagBehavior::Warning, avoid_plt, 1);
219218
}
220219

221220
// Enable canonical jump tables if CFI is enabled. (See https://reviews.llvm.org/D65629.)
222221
if sess.is_sanitizer_cfi_canonical_jump_tables_enabled() && sess.is_sanitizer_cfi_enabled() {
223-
let canonical_jump_tables = "CFI Canonical Jump Tables\0".as_ptr().cast();
222+
let canonical_jump_tables = c"CFI Canonical Jump Tables".as_ptr().cast();
224223
llvm::LLVMRustAddModuleFlag(
225224
llmod,
226225
llvm::LLVMModFlagBehavior::Override,
@@ -231,7 +230,7 @@ pub unsafe fn create_module<'ll>(
231230

232231
// Enable LTO unit splitting if specified or if CFI is enabled. (See https://reviews.llvm.org/D53891.)
233232
if sess.is_split_lto_unit_enabled() || sess.is_sanitizer_cfi_enabled() {
234-
let enable_split_lto_unit = "EnableSplitLTOUnit\0".as_ptr().cast();
233+
let enable_split_lto_unit = c"EnableSplitLTOUnit".as_ptr().cast();
235234
llvm::LLVMRustAddModuleFlag(
236235
llmod,
237236
llvm::LLVMModFlagBehavior::Override,
@@ -242,7 +241,7 @@ pub unsafe fn create_module<'ll>(
242241

243242
// Add "kcfi" module flag if KCFI is enabled. (See https://reviews.llvm.org/D119296.)
244243
if sess.is_sanitizer_kcfi_enabled() {
245-
let kcfi = "kcfi\0".as_ptr().cast();
244+
let kcfi = c"kcfi".as_ptr().cast();
246245
llvm::LLVMRustAddModuleFlag(llmod, llvm::LLVMModFlagBehavior::Override, kcfi, 1);
247246
}
248247

@@ -255,7 +254,7 @@ pub unsafe fn create_module<'ll>(
255254
llvm::LLVMRustAddModuleFlag(
256255
llmod,
257256
llvm::LLVMModFlagBehavior::Warning,
258-
"cfguard\0".as_ptr() as *const _,
257+
c"cfguard".as_ptr() as *const _,
259258
1,
260259
)
261260
}
@@ -264,7 +263,7 @@ pub unsafe fn create_module<'ll>(
264263
llvm::LLVMRustAddModuleFlag(
265264
llmod,
266265
llvm::LLVMModFlagBehavior::Warning,
267-
"cfguard\0".as_ptr() as *const _,
266+
c"cfguard".as_ptr() as *const _,
268267
2,
269268
)
270269
}
@@ -282,26 +281,26 @@ pub unsafe fn create_module<'ll>(
282281
llvm::LLVMRustAddModuleFlag(
283282
llmod,
284283
behavior,
285-
"branch-target-enforcement\0".as_ptr().cast(),
284+
c"branch-target-enforcement".as_ptr().cast(),
286285
bti.into(),
287286
);
288287
llvm::LLVMRustAddModuleFlag(
289288
llmod,
290289
behavior,
291-
"sign-return-address\0".as_ptr().cast(),
290+
c"sign-return-address".as_ptr().cast(),
292291
pac_ret.is_some().into(),
293292
);
294293
let pac_opts = pac_ret.unwrap_or(PacRet { leaf: false, key: PAuthKey::A });
295294
llvm::LLVMRustAddModuleFlag(
296295
llmod,
297296
behavior,
298-
"sign-return-address-all\0".as_ptr().cast(),
297+
c"sign-return-address-all".as_ptr().cast(),
299298
pac_opts.leaf.into(),
300299
);
301300
llvm::LLVMRustAddModuleFlag(
302301
llmod,
303302
behavior,
304-
"sign-return-address-with-bkey\0".as_ptr().cast(),
303+
c"sign-return-address-with-bkey".as_ptr().cast(),
305304
u32::from(pac_opts.key == PAuthKey::B),
306305
);
307306
} else {
@@ -317,15 +316,15 @@ pub unsafe fn create_module<'ll>(
317316
llvm::LLVMRustAddModuleFlag(
318317
llmod,
319318
llvm::LLVMModFlagBehavior::Override,
320-
"cf-protection-branch\0".as_ptr().cast(),
319+
c"cf-protection-branch".as_ptr().cast(),
321320
1,
322321
)
323322
}
324323
if let CFProtection::Return | CFProtection::Full = sess.opts.unstable_opts.cf_protection {
325324
llvm::LLVMRustAddModuleFlag(
326325
llmod,
327326
llvm::LLVMModFlagBehavior::Override,
328-
"cf-protection-return\0".as_ptr().cast(),
327+
c"cf-protection-return".as_ptr().cast(),
329328
1,
330329
)
331330
}
@@ -334,7 +333,7 @@ pub unsafe fn create_module<'ll>(
334333
llvm::LLVMRustAddModuleFlag(
335334
llmod,
336335
llvm::LLVMModFlagBehavior::Error,
337-
"Virtual Function Elim\0".as_ptr().cast(),
336+
c"Virtual Function Elim".as_ptr().cast(),
338337
1,
339338
);
340339
}
@@ -344,7 +343,7 @@ pub unsafe fn create_module<'ll>(
344343
llvm::LLVMRustAddModuleFlag(
345344
llmod,
346345
llvm::LLVMModFlagBehavior::Warning,
347-
"ehcontguard\0".as_ptr() as *const _,
346+
c"ehcontguard".as_ptr() as *const _,
348347
1,
349348
)
350349
}
@@ -362,7 +361,7 @@ pub unsafe fn create_module<'ll>(
362361
);
363362
llvm::LLVMAddNamedMetadataOperand(
364363
llmod,
365-
cstr!("llvm.ident").as_ptr(),
364+
c"llvm.ident".as_ptr(),
366365
llvm::LLVMMDNodeInContext(llcx, &name_metadata, 1),
367366
);
368367

@@ -510,14 +509,13 @@ impl<'ll, 'tcx> CodegenCx<'ll, 'tcx> {
510509
}
511510

512511
pub(crate) fn create_used_variable_impl(&self, name: &'static CStr, values: &[&'ll Value]) {
513-
let section = cstr!("llvm.metadata");
514512
let array = self.const_array(self.type_ptr(), values);
515513

516514
unsafe {
517515
let g = llvm::LLVMAddGlobal(self.llmod, self.val_ty(array), name.as_ptr());
518516
llvm::LLVMSetInitializer(g, array);
519517
llvm::LLVMRustSetLinkage(g, llvm::Linkage::AppendingLinkage);
520-
llvm::LLVMSetSection(g, section.as_ptr());
518+
llvm::LLVMSetSection(g, c"llvm.metadata".as_ptr());
521519
}
522520
}
523521
}

‎compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@ pub fn insert_reference_to_gdb_debug_scripts_section_global(bx: &mut Builder<'_,
3030
/// Allocates the global variable responsible for the .debug_gdb_scripts binary
3131
/// section.
3232
pub fn get_or_insert_gdb_debug_scripts_section_global<'ll>(cx: &CodegenCx<'ll, '_>) -> &'ll Value {
33-
let c_section_var_name = "__rustc_debug_gdb_scripts_section__\0";
34-
let section_var_name = &c_section_var_name[..c_section_var_name.len() - 1];
33+
let c_section_var_name = c"__rustc_debug_gdb_scripts_section__";
34+
let section_var_name = c_section_var_name.to_str().unwrap();
3535

3636
let section_var =
3737
unsafe { llvm::LLVMGetNamedGlobal(cx.llmod, c_section_var_name.as_ptr().cast()) };
3838

3939
section_var.unwrap_or_else(|| {
40-
let section_name = b".debug_gdb_scripts\0";
4140
let mut section_contents = Vec::new();
4241

4342
// 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, '
7069
let section_var = cx
7170
.define_global(section_var_name, llvm_type)
7271
.unwrap_or_else(|| bug!("symbol `{}` is already defined", section_var_name));
73-
llvm::LLVMSetSection(section_var, section_name.as_ptr().cast());
72+
llvm::LLVMSetSection(section_var, c".debug_gdb_scripts".as_ptr().cast());
7473
llvm::LLVMSetInitializer(section_var, cx.const_bytes(section_contents));
7574
llvm::LLVMSetGlobalConstant(section_var, llvm::True);
7675
llvm::LLVMSetUnnamedAddress(section_var, llvm::UnnamedAddr::Global);

0 commit comments

Comments
 (0)