bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Introduce const_cstr!() macro and use it where applicable.

Browse source
This commit is contained in:
Michael Woerister 2018-08-07 16:03:57 +02:00
parent f6d43ed842
commit 9585c5dc1f
7 changed files with 56 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_codegen_llvm/builder.rs
View file

@ -975,7 +975,7 @@ impl Builder<'a, 'll, 'tcx> {
parent: Option<&'ll Value>,
args: &[&'ll Value]) -> &'ll Value {
self.count_insn("cleanuppad");
let name = CString::new("cleanuppad").unwrap();
let name = const_cstr!("cleanuppad");
let ret = unsafe {
llvm::LLVMRustBuildCleanupPad(self.llbuilder,
parent,
@ -1001,7 +1001,7 @@ impl Builder<'a, 'll, 'tcx> {
parent: &'ll Value,
args: &[&'ll Value]) -> &'ll Value {
self.count_insn("catchpad");
let name = CString::new("catchpad").unwrap();
let name = const_cstr!("catchpad");
let ret = unsafe {
llvm::LLVMRustBuildCatchPad(self.llbuilder, parent,
args.len() as c_uint, args.as_ptr(),
@ -1025,7 +1025,7 @@ impl Builder<'a, 'll, 'tcx> {
num_handlers: usize,
) -> &'ll Value {
self.count_insn("catchswitch");
let name = CString::new("catchswitch").unwrap();
let name = const_cstr!("catchswitch");
let ret = unsafe {
llvm::LLVMRustBuildCatchSwitch(self.llbuilder, parent, unwind,
num_handlers as c_uint,