commit 8d69a1e69e61fe71b1672950ffc6bb28269c314d
author dianqk <dianqk@dianqk.net> Thu Nov 02 23:13:12 2023 +0800
committer DianQK <dianqk@dianqk.net> Fri Nov 03 08:29:15 2023 +0800
tree d84ff199feb167741d81700cb43f0d9e7690298a
parent d047968462d3800b31606db911b60cdcd895b9d2

Add crate `compiler_builtins` to LTO even if the `Linkage` is `IncludedFromDylib`

compiler/rustc_codegen_ssa/src/back/link.rs

diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 535b594..586bcaa 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -268,8 +268,14 @@ pub fn each_linked_rlib(
 
     for &cnum in crates {
         match fmts.get(cnum.as_usize() - 1) {
-            Some(&Linkage::NotLinked | &Linkage::Dynamic | &Linkage::IncludedFromDylib) => continue,
-            Some(_) => {}
+            Some(&Linkage::NotLinked | &Linkage::Dynamic) => continue,
+            Some(&Linkage::IncludedFromDylib) => {
+                // We always link crate `compiler_builtins` statically. When enabling LTO, we include it as well.
+                if info.compiler_builtins != Some(cnum) {
+                    continue;
+                }
+            }
+            Some(&Linkage::Static) => {}
             None => return Err(errors::LinkRlibError::MissingFormat),
         }
         let crate_name = info.crate_name[&cnum];