address a few nits

Author: qaijuang

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -76,18 +76,14 @@ fn eii_impl_crate_name(crate_info: &CrateInfo, cnum: CrateNum) -> Symbol {
 }
 
 fn check_externally_implementable_item_linkage(sess: &Session, crate_info: &CrateInfo) {
-    let Some(eii_linkage) = &crate_info.eii_linkage else {
-        return;
-    };
-
     // A crate can request multiple linked outputs with overlapping dependency
     // formats, so report each underlying conflict once.
     let mut emitted = FxHashSet::default();
 
     // This needs the dependency formats selected for the final artifact. The
     // earlier EII pass still handles missing impls and duplicate explicit impls.
     for dependency_formats in crate_info.dependency_formats.values() {
-        for (eii_index, eii) in eii_linkage.iter().enumerate() {
+        for (eii_index, eii) in crate_info.eii_linkage.iter().enumerate() {
             let mut explicit_impls =
                 eii.impls.iter().enumerate().filter(|(_, imp)| !imp.is_default);
             let Some((explicit_index, explicit_impl)) = explicit_impls.next() else {
@@ -152,7 +148,14 @@ pub fn link_binary(
     let _timer = sess.timer("link_binary");
     let output_metadata = sess.opts.output_types.contains_key(&OutputType::Metadata);
     let mut tempfiles_for_stdout_output: Vec<PathBuf> = Vec::new();
-    let mut checked_eii_linkage = false;
+
+    if outputs.outputs.should_link() {
+        sess.time("check_externally_implementable_item_linkage", || {
+            check_externally_implementable_item_linkage(sess, &crate_info);
+        });
+        sess.dcx().abort_if_errors();
+    }
+
     for &crate_type in &crate_info.crate_types {
         // Ignore executable crates if we have -Z no-codegen, as they will error.
         if (sess.opts.unstable_opts.no_codegen || !sess.opts.output_types.should_codegen())
@@ -173,14 +176,6 @@ pub fn link_binary(
         });
 
         if outputs.outputs.should_link() {
-            if !checked_eii_linkage {
-                sess.time("check_externally_implementable_item_linkage", || {
-                    check_externally_implementable_item_linkage(sess, &crate_info);
-                });
-                sess.dcx().abort_if_errors();
-                checked_eii_linkage = true;
-            }
-
             let output = out_filename(sess, crate_type, outputs, crate_info.local_crate_name);
             let tmpdir = TempDirBuilder::new()
                 .prefix("rustc")

compiler/rustc_codegen_ssa/src/base.rs

@@ -968,10 +968,9 @@ impl CrateInfo {
         let windows_subsystem = find_attr!(tcx, crate, WindowsSubsystem(kind) => *kind);
         let dependency_formats = Arc::clone(tcx.dependency_formats(()));
         let eii_linkage = if eii_linkage_needed(&dependency_formats) {
-            let eii_linkage = collect_eii_linkage(tcx);
-            (!eii_linkage.is_empty()).then_some(eii_linkage)
+            collect_eii_linkage(tcx)
         } else {
-            None
+            Vec::new()
         };
 
         // This list is used when generating the command line to pass through to

compiler/rustc_codegen_ssa/src/lib.rs

@@ -236,7 +236,7 @@ pub struct CrateInfo {
     pub dependency_formats: Arc<Dependencies>,
     /// EII implementations used by the link-time duplicate check, so `-Zno-link` can serialize the data needed by a
     /// later `-Zlink-only` invocation.
-    pub eii_linkage: Option<Vec<EiiLinkageInfo>>,
+    pub eii_linkage: Vec<EiiLinkageInfo>,
     pub windows_subsystem: Option<WindowsSubsystemKind>,
     pub natvis_debugger_visualizers: BTreeSet<DebuggerVisualizerFile>,
     pub lint_level_specs: CodegenLintLevelSpecs,