Skip to content

Commit 0e682e9

Browse files
committed
Auto merge of rust-lang#123347 - saethlin:only-allow-upstream-llvm-calls, r=Nilstrieb
Only allow compiler_builtins to call LLVM intrinsics, not any link_name function This is another case of accidental reliance on `inline(never)` like I rooted out in rust-lang#118770. Without this PR, attempting to build some large programs with `-Zcross-crate-inline-threshold=yes` with a sysroot also compiled with that flag will result in linker errors like this: ``` = note: /usr/bin/ld: /tmp/cargo-installNrfN4T/x86_64-unknown-linux-gnu/release/deps/libcompiler_builtins-d2a9b69f4e45b883.rlib(compiler_builtins-d2a9b69f4e45b883.compiler_builtins.dbbc6c2ca970faa4-cgu.0.rcgu.o): in function `core::panicking::panic_fmt': /home/ben/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/panicking.rs:72:(.text.unlikely._ZN4core9panicking9panic_fmt17ha407cc99e97c942fE+0x31): undefined reference to `rust_begin_unwind' ``` With `-Zcross-crate-inline-threshold=yes` we can inline `panic_fmt` into `compiler_builtins`. Then we end up with a call to an upstream monomorphization, but one that has a `link_name` set. But unlike LLVM's magic intrinsic names, this link name is going to make it to the linker, and then we have a problem. This logic looks scuffed, but also we're doing this in 4 other places. Don't know if that means it's good or bad. https://github.com/rust-lang/rust/blob/1684a753dbca5d23b2e03568e6fbbb48eb72d0e6/compiler/rustc_codegen_cranelift/src/abi/mod.rs#L386 https://github.com/rust-lang/rust/blob/1684a753dbca5d23b2e03568e6fbbb48eb72d0e6/compiler/rustc_ast_passes/src/feature_gate.rs#L306 https://github.com/rust-lang/rust/blob/1684a753dbca5d23b2e03568e6fbbb48eb72d0e6/compiler/rustc_codegen_ssa/src/codegen_attrs.rs#L609 https://github.com/rust-lang/rust/blob/1684a753dbca5d23b2e03568e6fbbb48eb72d0e6/compiler/rustc_codegen_gcc/src/declare.rs#L170
2 parents 2531d08 + 748dba2 commit 0e682e9

File tree

1 file changed

+14
-2
lines changed
  • compiler/rustc_monomorphize/src

1 file changed

+14
-2
lines changed

compiler/rustc_monomorphize/src/lib.rs

+14-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use rustc_middle::ty::adjustment::CustomCoerceUnsized;
1414
use rustc_middle::ty::Instance;
1515
use rustc_middle::ty::TyCtxt;
1616
use rustc_middle::ty::{self, Ty};
17+
use rustc_span::def_id::DefId;
1718
use rustc_span::def_id::LOCAL_CRATE;
1819
use rustc_span::ErrorGuaranteed;
1920

@@ -57,13 +58,24 @@ fn custom_coerce_unsize_info<'tcx>(
5758
/// linkers will optimize such that dead calls to unresolved symbols are not an error, but this is
5859
/// not guaranteed. So we used this function in codegen backends to ensure we do not generate any
5960
/// unlinkable calls.
61+
///
62+
/// Note that calls to LLVM intrinsics are uniquely okay because they won't make it to the linker.
6063
pub fn is_call_from_compiler_builtins_to_upstream_monomorphization<'tcx>(
6164
tcx: TyCtxt<'tcx>,
6265
instance: Instance<'tcx>,
6366
) -> bool {
64-
!instance.def_id().is_local()
67+
fn is_llvm_intrinsic(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
68+
if let Some(name) = tcx.codegen_fn_attrs(def_id).link_name {
69+
name.as_str().starts_with("llvm.")
70+
} else {
71+
false
72+
}
73+
}
74+
75+
let def_id = instance.def_id();
76+
!def_id.is_local()
6577
&& tcx.is_compiler_builtins(LOCAL_CRATE)
66-
&& tcx.codegen_fn_attrs(instance.def_id()).link_name.is_none()
78+
&& !is_llvm_intrinsic(tcx, def_id)
6779
&& !should_codegen_locally(tcx, instance)
6880
}
6981

0 commit comments

Comments
 (0)