Avoid .to_string() for symbol names where possible

diff --git a/src/abi/mod.rs b/src/abi/mod.rs
index f450f366787136ff1896ebc78bef58a66596299f..54c8fb0e7b80be401a13d87c8de39e46bd9ebc99 100644 (file)
--- a/src/abi/mod.rs
+++ b/src/abi/mod.rs
@@ -63,9 +63,9 @@ pub(crate) fn import_function<'tcx>(
     module: &mut dyn Module,
     inst: Instance<'tcx>,
 ) -> FuncId {
-    let name = tcx.symbol_name(inst).name.to_string();
+    let name = tcx.symbol_name(inst).name;
     let sig = get_function_sig(tcx, module.isa().triple(), inst);
-    module.declare_function(&name, Linkage::Import, &sig).unwrap()
+    module.declare_function(name, Linkage::Import, &sig).unwrap()
 }
 
 impl<'tcx> FunctionCx<'_, '_, 'tcx> {
@@ -89,7 +89,7 @@ pub(crate) fn lib_call(
         args: &[Value],
     ) -> &[Value] {
         let sig = Signature { params, returns, call_conv: CallConv::triple_default(self.triple()) };
-        let func_id = self.module.declare_function(&name, Linkage::Import, &sig).unwrap();
+        let func_id = self.module.declare_function(name, Linkage::Import, &sig).unwrap();
         let func_ref = self.module.declare_func_in_func(func_id, &mut self.bcx.func);
         let call_inst = self.bcx.ins().call(func_ref, args);
         if self.clif_comments.enabled() {

diff --git a/src/driver/jit.rs b/src/driver/jit.rs
index 63ac02f83b92c4c137f5b7e8a3c2f4529369a642..526caeb4f03f53e3354cf78441253f230cf0ba88 100644 (file)
--- a/src/driver/jit.rs
+++ b/src/driver/jit.rs
@@ -156,9 +156,9 @@ extern "C" fn __clif_jit_fn(instance_ptr: *const Instance<'static>) -> *const u8
             let jit_module = &mut lazy_jit_state.jit_module;
             let backend_config = lazy_jit_state.backend_config.clone();
 
-            let name = tcx.symbol_name(instance).name.to_string();
+            let name = tcx.symbol_name(instance).name;
             let sig = crate::abi::get_function_sig(tcx, jit_module.isa().triple(), instance);
-            let func_id = jit_module.declare_function(&name, Linkage::Export, &sig).unwrap();
+            let func_id = jit_module.declare_function(name, Linkage::Export, &sig).unwrap();
             jit_module.prepare_for_function_redefine(func_id).unwrap();
 
             let mut cx = crate::CodegenCx::new(tcx, backend_config, jit_module.isa(), false);
@@ -241,9 +241,9 @@ fn codegen_shim<'tcx>(cx: &mut CodegenCx<'tcx>, module: &mut JITModule, inst: In
 
     let pointer_type = module.target_config().pointer_type();
 
-    let name = tcx.symbol_name(inst).name.to_string();
+    let name = tcx.symbol_name(inst).name;
     let sig = crate::abi::get_function_sig(tcx, module.isa().triple(), inst);
-    let func_id = module.declare_function(&name, Linkage::Export, &sig).unwrap();
+    let func_id = module.declare_function(name, Linkage::Export, &sig).unwrap();
 
     let instance_ptr = Box::into_raw(Box::new(inst));
 

diff --git a/src/driver/mod.rs b/src/driver/mod.rs
index 393cde3e9ad27b66944aa468843b68907ec1cba8..8f5714ecb417704e446edda114f65b4966facb66 100644 (file)
--- a/src/driver/mod.rs
+++ b/src/driver/mod.rs
@@ -22,7 +22,7 @@ fn predefine_mono_items<'tcx>(
         for &(mono_item, (linkage, visibility)) in mono_items {
             match mono_item {
                 MonoItem::Fn(instance) => {
-                    let name = tcx.symbol_name(instance).name.to_string();
+                    let name = tcx.symbol_name(instance).name;
                     let _inst_guard = crate::PrintOnPanic(|| format!("{:?} {}", instance, name));
                     let sig = get_function_sig(tcx, module.isa().triple(), instance);
                     let linkage = crate::linkage::get_clif_linkage(
@@ -31,7 +31,7 @@ fn predefine_mono_items<'tcx>(
                         visibility,
                         is_compiler_builtins,
                     );
-                    module.declare_function(&name, linkage, &sig).unwrap();
+                    module.declare_function(name, linkage, &sig).unwrap();
                 }
                 MonoItem::Static(_) | MonoItem::GlobalAsm(_) => {}
             }

diff --git a/src/main_shim.rs b/src/main_shim.rs
index 4924c4e8923cc51aad42c38b0c62dba6ae9d63cf..3305ca6f6eb9de9fcfe3fd80274279fe5e39d3db 100644 (file)
--- a/src/main_shim.rs
+++ b/src/main_shim.rs
@@ -62,9 +62,9 @@ fn create_entry_fn(
 
         let instance = Instance::mono(tcx, rust_main_def_id).polymorphize(tcx);
 
-        let main_name = tcx.symbol_name(instance).name.to_string();
+        let main_name = tcx.symbol_name(instance).name;
         let main_sig = get_function_sig(tcx, m.isa().triple(), instance);
-        let main_func_id = m.declare_function(&main_name, Linkage::Import, &main_sig).unwrap();
+        let main_func_id = m.declare_function(main_name, Linkage::Import, &main_sig).unwrap();
 
         let mut ctx = Context::new();
         ctx.func = Function::with_name_signature(ExternalName::user(0, 0), cmain_sig);