Add `--no-undefined-version` link flag and fix associated breakage #108017

chbaker0 · 2023-02-13T23:54:11Z

LLVM upstream sets --no-undefined-version by default in lld: https://reviews.llvm.org/D135402.

Due to a bug in how version scripts are generated, this breaks the dylib output type for most crates. See #105967 (comment) for details.

This PR adds the flag to gcc flavor linkers in anticipation of this LLVM change rolling in, and patches rustc to not attempt to export __rust_* allocator symbols when they weren't generated.

Fixes #105967

rustbot · 2023-02-13T23:54:18Z

r? @oli-obk

(rustbot has picked a reviewer for you, use r? to override)

chbaker0 · 2023-02-13T23:54:57Z

r? @bjorn3 since we discussed this issue already

Noratrieb · 2023-02-14T06:34:02Z

compiler/rustc_middle/src/query/mod.rs

+    /// `allocator_kind`, but it may return `None` in more cases (e.g. if using
+    /// allocator definitions from a dylib dependency).
+    query codegen_allocator_kind(_: ()) -> Option<AllocatorKind> {
+        eval_always


This eval_always can be removed as the query doesn't depend on untracked state but only on other queries (dependency_formats and allocator_kind). I'm not sure whether this makes sense to have as a query in the first place or whether it should just be a normal helper function. I think a normal function would make more sense as the output of this will usually change when the inputs (dependency_formats and allocator_kind) change and it's also pretty cheap to compute and only called twice.

re: eval_always: got it, I'm still getting to understand the query system.

A normal function would be fine, but there's some benefit of it being next to allocator_kind too to potentially avoid similar mistakes in the future. Up to you though.

Any suggestion for where's a good place to put the helper function?

Maybe compiler/rustc_codegen_ssa/src/base.rs? It doesn't quite fit, but I don't know a better place.

OK, I moved the logic to a function there

chbaker0

Sorry for the delay, I replied but didn't submit it

chbaker0 · 2023-02-14T19:25:44Z

compiler/rustc_middle/src/query/mod.rs

+    /// `allocator_kind`, but it may return `None` in more cases (e.g. if using
+    /// allocator definitions from a dylib dependency).
+    query codegen_allocator_kind(_: ()) -> Option<AllocatorKind> {
+        eval_always


re: eval_always: got it, I'm still getting to understand the query system.

A normal function would be fine, but there's some benefit of it being next to allocator_kind too to potentially avoid similar mistakes in the future. Up to you though.

Any suggestion for where's a good place to put the helper function?

chbaker0 · 2023-02-21T19:52:01Z

Hi, just checking in again

chbaker0 · 2023-02-24T21:21:13Z

Ready for another review

bjorn3

LGTM, thanks! I got a minor request to avoid some code duplication, but r=me either way.

compiler/rustc_codegen_ssa/src/base.rs

tmandry · 2023-02-27T19:44:52Z

@rustbot author

tmandry · 2023-02-27T19:45:53Z

@bors delegate+

bors · 2023-02-27T19:45:55Z

✌️ @chbaker0 can now approve this pull request

rustbot · 2023-03-06T22:21:43Z

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

chbaker0 · 2023-03-06T22:28:19Z

Thanks!

@bors r+

extra changes are exactly as requested

bors · 2023-03-06T22:28:21Z

📌 Commit 33e8820 has been approved by chbaker0

It is now in the queue for this repository.

chbaker0 · 2023-03-10T00:30:10Z

Makes sense; I guess --no-undefined-version only makes sense for a linker that calls this a "version script"

I moved it under the appropriate condition.

Not sure if the delegate earlier is sticky, but I'll try:

@bors r+

bors · 2023-03-10T00:30:13Z

📌 Commit cb41803 has been approved by chbaker0

It is now in the queue for this repository.

bors · 2023-03-10T00:30:14Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

Add `--no-undefined-version` link flag and fix associated breakage LLVM upstream sets `--no-undefined-version` by default in lld: https://reviews.llvm.org/D135402. Due to a bug in how version scripts are generated, this breaks the `dylib` output type for most crates. See rust-lang#105967 (comment) for details. This PR adds the flag to gcc flavor linkers in anticipation of this LLVM change rolling in, and patches `rustc` to not attempt to export `__rust_*` allocator symbols when they weren't generated. Fixes rust-lang#105967

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#105798 (Relax ordering rules for `asm!` operands) - rust-lang#105962 (Stabilize path_as_mut_os_str) - rust-lang#106085 (use problem matchers for tidy CI) - rust-lang#107711 (Stabilize movbe target feature) - rust-lang#108017 (Add `--no-undefined-version` link flag and fix associated breakage) - rust-lang#108891 (Remove an extraneous include) - rust-lang#108902 (no more do while :<) - rust-lang#108912 (Document tool lints) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Add `--no-undefined-version` link flag and fix associated breakage LLVM upstream sets `--no-undefined-version` by default in lld: https://reviews.llvm.org/D135402. Due to a bug in how version scripts are generated, this breaks the `dylib` output type for most crates. See rust-lang#105967 (comment) for details. This PR adds the flag to gcc flavor linkers in anticipation of this LLVM change rolling in, and patches `rustc` to not attempt to export `__rust_*` allocator symbols when they weren't generated. Fixes rust-lang#105967

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#105798 (Relax ordering rules for `asm!` operands) - rust-lang#105962 (Stabilize path_as_mut_os_str) - rust-lang#106085 (use problem matchers for tidy CI) - rust-lang#107711 (Stabilize movbe target feature) - rust-lang#108017 (Add `--no-undefined-version` link flag and fix associated breakage) - rust-lang#108891 (Remove an extraneous include) - rust-lang#108902 (no more do while :<) - rust-lang#108912 (Document tool lints) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…proc-macros-issue-99978, r=bjorn3 Restrict linker version script of proc-macro crates to just its two symbols Restrict linker version script of proc-macro crates to just the two symbols of each proc-macro crate. The main known effect of doing this is to stop including `#[no_mangle]` symbols in the linker version script. Background: The combination of a proc-macro crate with an import of another crate that itself exports a no_mangle function was broken for a period of time, because: * In PR rust-lang#99944 we stopped exporting no_mangle symbols from proc-macro crates; proc-macro crates have a very limited interface and are meant to be treated as a blackbox to everything except rustc itself. However: he constructed linker version script still referred to them, but resolving that discrepancy was left as a FIXME in the code, tagged with issue rust-lang#99978. * In PR rust-lang#108017 we started telling the linker to check (via the`--no-undefined-version` linker invocation flag) that every symbol referenced in the "linker version script" is provided as linker input. So the unresolved discrepancy from rust-lang#99978 started surfacing as a compile-time error (e.g. rust-lang#111888). Fix rust-lang#111888 Fix rust-lang#99978.

rustbot assigned oli-obk Feb 13, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 13, 2023

rustbot assigned bjorn3 and unassigned oli-obk Feb 13, 2023

chbaker0 marked this pull request as ready for review February 13, 2023 23:55

Noratrieb reviewed Feb 14, 2023

View reviewed changes

chbaker0 commented Feb 16, 2023

View reviewed changes

nikic mentioned this pull request Feb 17, 2023

Upgrade to LLVM 16 #107224

Merged

chbaker0 force-pushed the fix-105967 branch 2 times, most recently from b732615 to 332afdb Compare February 24, 2023 21:18

bjorn3 approved these changes Feb 25, 2023

View reviewed changes

compiler/rustc_codegen_ssa/src/base.rs Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 27, 2023

nikic mentioned this pull request Mar 6, 2023

Update host compiler to LLVM 16 #108802

Merged

chbaker0 force-pushed the fix-105967 branch 2 times, most recently from ac58c9c to 33e8820 Compare March 6, 2023 22:21

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2023

matthiaskrgr mentioned this pull request Mar 10, 2023

Rollup of 10 pull requests #108982

Closed

matthiaskrgr mentioned this pull request Mar 10, 2023

Rollup of 9 pull requests #108989

Closed

matthiaskrgr mentioned this pull request Mar 10, 2023

Rollup of 8 pull requests #109001

Merged

bors merged commit 342ca46 into rust-lang:master Mar 11, 2023

rustbot added this to the 1.70.0 milestone Mar 11, 2023

messense mentioned this pull request Mar 12, 2023

Fix build on zig 0.11 with Rust nightly rust-cross/cargo-zigbuild#110

Merged

fmorency mentioned this pull request Mar 23, 2023

build: bump rules_rust and rustc liftedinit/many-rs#339

Closed

saethlin mentioned this pull request Jun 10, 2023

regression - nightly 2023-03-30 -> 2023-03-31 causes linker error when importing wasm_bindgen::JsValue in a proc_macro #111888

Closed

pnkfelix mentioned this pull request Aug 4, 2023

Restrict linker version script of proc-macro crates to just its two symbols #114470

Merged

DavidZbarsky-at mentioned this pull request Aug 16, 2023

unsupported linker arg: --no-undefined-version ziglang/zig#16855

Closed

briansmith mentioned this pull request Nov 21, 2023

Linking error on Rust 1.70 aarch64-unknown-linux-musl toolchain #113104

Closed

Add --no-undefined-version link flag and fix associated breakage #108017

Add --no-undefined-version link flag and fix associated breakage #108017

Uh oh!

Conversation

chbaker0 commented Feb 13, 2023

Uh oh!

rustbot commented Feb 13, 2023

Uh oh!

chbaker0 commented Feb 13, 2023

Uh oh!

Noratrieb Feb 14, 2023

Choose a reason for hiding this comment

Uh oh!

chbaker0 Feb 14, 2023

Choose a reason for hiding this comment

Uh oh!

bjorn3 Feb 21, 2023

Choose a reason for hiding this comment

Uh oh!

chbaker0 Feb 24, 2023

Choose a reason for hiding this comment

Uh oh!

chbaker0 left a comment

Choose a reason for hiding this comment

Uh oh!

chbaker0 Feb 14, 2023

Choose a reason for hiding this comment

Uh oh!

chbaker0 commented Feb 21, 2023

Uh oh!

chbaker0 commented Feb 24, 2023

Uh oh!

bjorn3 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tmandry commented Feb 27, 2023

Uh oh!

tmandry commented Feb 27, 2023

Uh oh!

bors commented Feb 27, 2023

Uh oh!

rustbot commented Mar 6, 2023

Uh oh!

chbaker0 commented Mar 6, 2023

Uh oh!

bors commented Mar 6, 2023

Uh oh!

chbaker0 commented Mar 10, 2023

Uh oh!

bors commented Mar 10, 2023

Uh oh!

bors commented Mar 10, 2023

Uh oh!

Uh oh!

Add `--no-undefined-version` link flag and fix associated breakage #108017

Add `--no-undefined-version` link flag and fix associated breakage #108017