move add_objc_module_flags call closer to define_objc_module_info

Author: jbatez

compiler/rustc_codegen_llvm/src/base.rs

@@ -109,16 +109,17 @@ pub(crate) fn compile_codegen_unit(
                 attributes::apply_to_llfn(entry, llvm::AttributePlace::Function, &attrs);
             }
 
-            // Define Objective-C module info for 32-bit x86 macOS. Note, this generates a global
-            // that gets added to the `llvm.compiler.used` variable, created later.
+            // Define Objective-C module info and module flags. Note, the module info will
+            // also be added to the `llvm.compiler.used` variable, created later.
             //
-            // This is only necessary when we need the linker to do its Objective-C-specific magic.
-            // We could theoretically do it unconditionally, but at a slight cost to linker
+            // These are only necessary when we need the linker to do its Objective-C-specific
+            // magic. We could theoretically do it unconditionally, but at a slight cost to linker
             // performance in the common case where it's unnecessary.
-            let uses_objc =
-                !cx.objc_classrefs.borrow().is_empty() || !cx.objc_selrefs.borrow().is_empty();
-            if uses_objc && cx.tcx.sess.target.arch == "x86" && cx.tcx.sess.target.os == "macos" {
-                cx.define_objc_module_info();
+            if !cx.objc_classrefs.borrow().is_empty() || !cx.objc_selrefs.borrow().is_empty() {
+                if cx.tcx.sess.target.arch == "x86" && cx.tcx.sess.target.os == "macos" {
+                    cx.define_objc_module_info();
+                }
+                cx.add_objc_module_flags();
             }
 
             // Finalize code coverage by injecting the coverage map. Note, the coverage map will
@@ -149,15 +150,6 @@ pub(crate) fn compile_codegen_unit(
                 }
             }
 
-            // Add Objective-C module flags.
-            //
-            // This is only necessary when we need the linker to do its Objective-C-specific magic.
-            // We could theoretically do it unconditionally, but at a slight cost to linker
-            // performance in the common case where it's unnecessary.
-            if uses_objc {
-                cx.add_objc_module_flags();
-            }
-
             // Finalize debuginfo
             if cx.sess().opts.debuginfo != DebugInfo::None {
                 cx.debuginfo_finalize();