Skip to content

Commit

Permalink
Unrolled build for rust-lang#129079
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#129079 - Zoxc:thinlto_imp_symbols, r=wesleywiser

Create `_imp__` symbols also when doing ThinLTO

When generating a rlib crate on Windows we create `dllimport` / `_imp__` symbols for each global. This effectively makes the rlib contain an import library for itself and allows them to both be dynamically and statically linked. However when doing ThinLTO we do not generate these and thus we end up with missing symbols. Microsoft's `link` can fix these up (and emits warnings), but `lld` seems to currently be unable to.

This PR also does this generation for ThinLTO avoiding those issues with `lld` and also avoids the warnings on `link`.

This is an workaround for rust-lang#81408.

cc `@lqd`
  • Loading branch information
rust-timer authored Oct 11, 2024
2 parents f496659 + 562c0d1 commit 6b1bf00
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 1 deletion.
8 changes: 7 additions & 1 deletion compiler/rustc_codegen_ssa/src/back/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2164,8 +2164,14 @@ fn msvc_imps_needed(tcx: TyCtxt<'_>) -> bool {
&& tcx.sess.opts.cg.prefer_dynamic)
);

// We need to generate _imp__ symbol if we are generating an rlib or we include one
// indirectly from ThinLTO. In theory these are not needed as ThinLTO could resolve
// these, but it currently does not do so.
let can_have_static_objects =
tcx.sess.lto() == Lto::Thin || tcx.crate_types().iter().any(|ct| *ct == CrateType::Rlib);

tcx.sess.target.is_like_windows &&
tcx.crate_types().iter().any(|ct| *ct == CrateType::Rlib) &&
can_have_static_objects &&
// ThinLTO can't handle this workaround in all cases, so we don't
// emit the `__imp_` symbols. Instead we make them unnecessary by disallowing
// dynamic linking when linker plugin LTO is enabled.
Expand Down
13 changes: 13 additions & 0 deletions tests/run-make/msvc-lld-thinlto-imp-symbols/issue_81408.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
use std::sync::atomic::{AtomicPtr, Ordering};

#[inline(always)]
pub fn memrchr() {
fn detect() {}

static CROSS_CRATE_STATIC_ITEM: AtomicPtr<()> = AtomicPtr::new(detect as *mut ());

unsafe {
let fun = CROSS_CRATE_STATIC_ITEM.load(Ordering::SeqCst);
std::mem::transmute::<*mut (), fn()>(fun)()
}
}
5 changes: 5 additions & 0 deletions tests/run-make/msvc-lld-thinlto-imp-symbols/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
extern crate issue_81408;

fn main() {
issue_81408::memrchr();
}
33 changes: 33 additions & 0 deletions tests/run-make/msvc-lld-thinlto-imp-symbols/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// This is a non-regression test for issue #81408 involving an lld bug and ThinLTO, on windows.
// MSVC's link.exe doesn't need any workarounds in rustc, but lld does, so we'll check that the
// binary runs successfully instead of using a codegen test.

//@ only-x86_64-pc-windows-msvc
//@ needs-rust-lld
//@ ignore-cross-compile: the built binary is executed

use run_make_support::{run, rustc};

fn test_with_linker(linker: &str) {
rustc().input("issue_81408.rs").crate_name("issue_81408").crate_type("lib").opt().run();
rustc()
.input("main.rs")
.crate_type("bin")
.arg("-Clto=thin")
.opt()
.arg(&format!("-Clinker={linker}"))
.extern_("issue_81408", "libissue_81408.rlib")
.run();

// To make possible failures clearer, print an intro that will only be shown if the test does
// fail when running the binary.
eprint!("Running binary linked with {linker}... ");
run("main");
eprintln!("ok");
}

fn main() {
// We want the reproducer to work when linked with both linkers.
test_with_linker("link");
test_with_linker("rust-lld");
}

0 comments on commit 6b1bf00

Please sign in to comment.