rustc_codegen_llvm: rework internal API per review

Author: durin42

compiler/rustc_codegen_llvm/src/back/lto.rs

@@ -1,6 +1,5 @@
 use crate::back::write::{
-    self, bitcode_section_name, save_temp_bitcode, target_is_aix, target_is_apple,
-    CodegenDiagnosticsStage, DiagnosticHandlers,
+    self, bitcode_section_name, save_temp_bitcode, CodegenDiagnosticsStage, DiagnosticHandlers,
 };
 use crate::errors::{
     DynamicLinkingWithLTO, LlvmError, LtoBitcodeFromRlib, LtoDisallowed, LtoDylib,
@@ -124,12 +123,9 @@ fn prepare_lto(
                 .filter(|&(name, _)| looks_like_rust_object_file(name));
             for (name, child) in obj_files {
                 info!("adding bitcode from {}", name);
-                let is_apple = target_is_apple(cgcx);
-                let is_aix = target_is_aix(cgcx);
                 match get_bitcode_slice_from_object_data(
                     child.data(&*archive_data).expect("corrupt rlib"),
-                    is_apple,
-                    is_aix,
+                    cgcx,
                 ) {
                     Ok(data) => {
                         let module = SerializedModule::FromRlib(data.to_vec());
@@ -151,17 +147,16 @@ fn prepare_lto(
     Ok((symbols_below_threshold, upstream_modules))
 }
 
-fn get_bitcode_slice_from_object_data(
-    obj: &[u8],
-    is_apple: bool,
-    is_aix: bool,
-) -> Result<&[u8], LtoBitcodeFromRlib> {
+fn get_bitcode_slice_from_object_data<'a>(
+    obj: &'a [u8],
+    cgcx: &CodegenContext<LlvmCodegenBackend>,
+) -> Result<&'a [u8], LtoBitcodeFromRlib> {
     // The object crate doesn't understand bitcode files, but we can just sniff for the possible
     // magic strings here and return the whole slice directly.
     if obj.starts_with(b"\xDE\xC0\x17\x0B") || obj.starts_with(b"BC\xC0\xDE") {
         return Ok(obj);
     }
-    let section = bitcode_section_name(is_apple, is_aix).trim_end_matches('\0');
+    let section = bitcode_section_name(cgcx).trim_end_matches('\0');
     match object::read::File::parse(obj) {
         Ok(f) => match f.section_by_name(section) {
             Some(d) => Ok(d.data().unwrap()),

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -853,27 +853,27 @@ fn create_section_with_flags_asm(section_name: &str, section_flags: &str, data:
     asm
 }
 
-pub(crate) fn bitcode_section_name(is_apple: bool, is_aix: bool) -> &'static str {
-    if is_apple {
-        "__LLVM,__bitcode\0"
-    } else if is_aix {
-        ".ipa\0"
-    } else {
-        ".llvmbc\0"
-    }
-}
-
-pub(crate) fn target_is_apple(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {
+fn target_is_apple(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {
     cgcx.opts.target_triple.triple().contains("-ios")
         || cgcx.opts.target_triple.triple().contains("-darwin")
         || cgcx.opts.target_triple.triple().contains("-tvos")
         || cgcx.opts.target_triple.triple().contains("-watchos")
 }
 
-pub(crate) fn target_is_aix(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {
+fn target_is_aix(cgcx: &CodegenContext<LlvmCodegenBackend>) -> bool {
     cgcx.opts.target_triple.triple().contains("-aix")
 }
 
+pub(crate) fn bitcode_section_name(cgcx: &CodegenContext<LlvmCodegenBackend>) -> &'static str {
+    if target_is_apple(cgcx) {
+        "__LLVM,__bitcode\0"
+    } else if target_is_aix(cgcx) {
+        ".ipa\0"
+    } else {
+        ".llvmbc\0"
+    }
+}
+
 /// Embed the bitcode of an LLVM module in the LLVM module itself.
 ///
 /// This is done primarily for iOS where it appears to be standard to compile C
@@ -950,7 +950,7 @@ unsafe fn embed_bitcode(
         );
         llvm::LLVMSetInitializer(llglobal, llconst);
 
-        let section = bitcode_section_name(is_apple, is_aix);
+        let section = bitcode_section_name(cgcx);
         llvm::LLVMSetSection(llglobal, section.as_ptr().cast());
         llvm::LLVMRustSetLinkage(llglobal, llvm::Linkage::PrivateLinkage);
         llvm::LLVMSetGlobalConstant(llglobal, llvm::True);