Rename static_addr_of_impl

Author: oli-obk

compiler/rustc_codegen_gcc/src/common.rs

@@ -261,7 +261,7 @@ impl<'gcc, 'tcx> ConstCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
         self.context.new_cast(None, val, ty)
     }
 
-    fn static_addr_of_impl(
+    fn static_addr_of_const(
         &self,
         cv: Self::Value,
         align: Align,

compiler/rustc_codegen_llvm/src/common.rs

@@ -279,13 +279,13 @@ impl<'ll, 'tcx> ConstCodegenMethods<'tcx> for CodegenCx<'ll, 'tcx> {
         unsafe { llvm::LLVMConstPtrToInt(val, ty) }
     }
 
-    fn static_addr_of_impl(
+    fn static_addr_of_const(
         &self,
         cv: Self::Value,
         align: Align,
         kind: Option<&str>,
     ) -> Self::Value {
-        self.static_addr_of_impl(cv, align, kind)
+        self.static_addr_of_const(cv, align, kind)
     }
 
     fn static_addr_of_mut(&self, cv: Self::Value, align: Align, kind: Option<&str>) -> Self::Value {

compiler/rustc_codegen_llvm/src/consts.rs

@@ -244,7 +244,7 @@ impl<'ll> CodegenCx<'ll, '_> {
     /// Create a global constant.
     ///
     /// The returned global variable is a pointer in the default address space for globals.
-    pub(crate) fn static_addr_of_impl(
+    pub(crate) fn static_addr_of_const(
         &self,
         cv: &'ll Value,
         align: Align,
@@ -552,8 +552,8 @@ impl<'ll> StaticCodegenMethods for CodegenCx<'ll, '_> {
     /// The pointer will always be in the default address space. If global variables default to a
     /// different address space, an addrspacecast is inserted.
     fn static_addr_of(&self, cv: &'ll Value, align: Align, kind: Option<&str>) -> &'ll Value {
-        let gv = self.static_addr_of_impl(cv, align, kind);
-        // static_addr_of_impl returns the bare global variable, which might not be in the default
+        let gv = self.static_addr_of_const(cv, align, kind);
+        // static_addr_of_const returns the bare global variable, which might not be in the default
         // address space. Cast to the default address space if necessary.
         self.const_pointercast(gv, self.type_ptr())
     }

compiler/rustc_codegen_ssa/src/traits/consts.rs

@@ -58,10 +58,14 @@ pub trait ConstCodegenMethods<'tcx>:
     /// Create a global constant.
     ///
     /// The returned global variable is a pointer in the default address space for globals.
-    fn static_addr_of_impl(&self, cv: Self::Value, align: Align, kind: Option<&str>)
-    -> Self::Value;
+    fn static_addr_of_const(
+        &self,
+        cv: Self::Value,
+        align: Align,
+        kind: Option<&str>,
+    ) -> Self::Value;
 
-    /// Same as `static_addr_of_impl`, but does not mark the static as immutable
+    /// Same as `static_addr_of_const`, but does not mark the static as immutable
     fn static_addr_of_mut(&self, cv: Self::Value, align: Align, kind: Option<&str>) -> Self::Value;
 
     fn scalar_to_backend(&self, cv: Scalar, layout: abi::Scalar, llty: Self::Type) -> Self::Value {
@@ -97,7 +101,7 @@ pub trait ConstCodegenMethods<'tcx>:
                             let alloc = alloc.inner();
                             let value = match alloc.mutability {
                                 Mutability::Mut => self.static_addr_of_mut(init, alloc.align, None),
-                                _ => self.static_addr_of_impl(init, alloc.align, None),
+                                _ => self.static_addr_of_const(init, alloc.align, None),
                             };
                             if !self.tcx().sess.fewer_names()
                                 && self.get_value_name(value).is_empty()
@@ -124,7 +128,7 @@ pub trait ConstCodegenMethods<'tcx>:
                             )))
                             .unwrap_memory();
                         let init = self.const_data_from_alloc(alloc);
-                        let value = self.static_addr_of_impl(init, alloc.inner().align, None);
+                        let value = self.static_addr_of_const(init, alloc.inner().align, None);
                         value
                     }
                     GlobalAlloc::Static(def_id) => {