linker: Refactor library linking methods in `trait Linker` #120099

petrochenkov · 2024-01-18T15:44:15Z

Linkers are not aware of Rust libraries, they look like regular static or dynamic libraries to them, so Rust-specific methods in trait Linker do not make much sense.
They can be either removed or renamed to something more suitable.

Commits after the second one are cleanups.

rustbot · 2024-01-18T15:44:23Z

r? @WaffleLapkin

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

compiler/rustc_codegen_ssa/src/back/linker.rs

WaffleLapkin · 2024-01-19T01:43:03Z

compiler/rustc_codegen_ssa/src/back/linker.rs

        } else {
-            self.linker_args(&[OsString::from("--whole-archive"), path.into()]);
+            self.linker_arg("--whole-archive");
+            self.cmd.arg(path);


why is this not a linker arg?

For consistency with !whole_archive case above, whether -Wl, is added doesn't matter in this context.

We could probably consistently add it in all cases though, to save C compiler some work? (Looking into files and determining that they should indeed be passed through to the linker.)

We could probably consistently add it in all cases though, to save C compiler some work

This would be some larger work, so I've just reverted this change for now.

to save C compiler some work? (Looking into files and determining that they should indeed be passed through to the linker.)

Update: gcc doesn't even inspect the passed .o and .a files, it just looks at file extensions.
clang does call fstat on them, but doesn't inspect the contents either.

WaffleLapkin · 2024-01-23T19:12:36Z

@bors r+

bors · 2024-01-23T19:12:39Z

📌 Commit 42bcccc has been approved by WaffleLapkin

It is now in the queue for this repository.

linker: Refactor library linking methods in `trait Linker` Linkers are not aware of Rust libraries, they look like regular static or dynamic libraries to them, so Rust-specific methods in `trait Linker` do not make much sense. They can be either removed or renamed to something more suitable. Commits after the second one are cleanups.

Rollup of 12 pull requests Successful merges: - rust-lang#112806 (Small code improvements in `collect_intra_doc_links.rs`) - rust-lang#119460 (coverage: Never emit improperly-ordered coverage regions) - rust-lang#119766 (Split tait and impl trait in assoc items logic) - rust-lang#120062 (llvm: change data layout bug to an error and make it trigger more) - rust-lang#120099 (linker: Refactor library linking methods in `trait Linker`) - rust-lang#120139 (Do not normalize closure signature when building `FnOnce` shim) - rust-lang#120160 (Manually implement derived `NonZero` traits.) - rust-lang#120171 (Fix assume and assert in jump threading) - rust-lang#120183 (Add `#[coverage(off)]` to closures introduced by `#[test]` and `#[bench]`) - rust-lang#120195 (add several resolution test cases) - rust-lang#120259 (Split Diagnostics for Uncommon Codepoints: Add List to Display Characters Involved) - rust-lang#120261 (Provide structured suggestion to use trait objects in some cases of `if` arm type divergence) r? `@ghost` `@rustbot` modify labels: rollup

fmease · 2024-01-23T20:51:25Z

Might this have caused #120279 (comment)?

petrochenkov · 2024-01-23T20:53:16Z

Hmm, yes, quite likely.
Looks like .lib is used instead of .dll.lib somewhere.
@bors r-

Rename `link_(dylib,framework)`, remove `link_rust_dylib`.

Rename `link(_whole)(staticlib,rlib)` to something more suitable.

…ntly

petrochenkov · 2024-01-23T22:55:29Z

Fixed up the extension.
@bors r=WaffleLapkin

bors · 2024-01-23T22:55:32Z

📌 Commit 03f23c1 has been approved by WaffleLapkin

It is now in the queue for this repository.

linker: Refactor library linking methods in `trait Linker` Linkers are not aware of Rust libraries, they look like regular static or dynamic libraries to them, so Rust-specific methods in `trait Linker` do not make much sense. They can be either removed or renamed to something more suitable. Commits after the second one are cleanups.

Rollup of 8 pull requests Successful merges: - rust-lang#119305 (Add `AsyncFn` family of traits) - rust-lang#119389 (Provide more context on recursive `impl` evaluation overflow) - rust-lang#120062 (llvm: change data layout bug to an error and make it trigger more) - rust-lang#120099 (linker: Refactor library linking methods in `trait Linker`) - rust-lang#120201 (Bump some deps with syn 1.0 dependencies) - rust-lang#120230 (Assert that a single scope is passed to `for_scope`) - rust-lang#120278 (Remove --fatal-warnings on wasm targets) - rust-lang#120292 (coverage: Dismantle `Instrumentor` and flatten span refinement) r? `@ghost` `@rustbot` modify labels: rollup

linker: Refactor library linking methods in `trait Linker` Linkers are not aware of Rust libraries, they look like regular static or dynamic libraries to them, so Rust-specific methods in `trait Linker` do not make much sense. They can be either removed or renamed to something more suitable. Commits after the second one are cleanups.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#118208 (Rewrite the BTreeMap cursor API using gaps) - rust-lang#120099 (linker: Refactor library linking methods in `trait Linker`) - rust-lang#120165 (Switch `NonZero` alias direction.) - rust-lang#120288 (Bump `askama` version) - rust-lang#120306 (Clean up after clone3 removal from pidfd code (docs and tests)) - rust-lang#120316 (Don't call `walk_` functions directly if there is an equivalent `visit_` method) - rust-lang#120330 (Remove coroutine info when building coroutine drop body) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#118208 (Rewrite the BTreeMap cursor API using gaps) - rust-lang#120099 (linker: Refactor library linking methods in `trait Linker`) - rust-lang#120288 (Bump `askama` version) - rust-lang#120306 (Clean up after clone3 removal from pidfd code (docs and tests)) - rust-lang#120316 (Don't call `walk_` functions directly if there is an equivalent `visit_` method) - rust-lang#120330 (Remove coroutine info when building coroutine drop body) - rust-lang#120332 (Remove unused struct) - rust-lang#120338 (Fix links to [strict|exposed] provenance sections of `[std|core]::ptr`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#120099 - petrochenkov:linkapi, r=WaffleLapkin linker: Refactor library linking methods in `trait Linker` Linkers are not aware of Rust libraries, they look like regular static or dynamic libraries to them, so Rust-specific methods in `trait Linker` do not make much sense. They can be either removed or renamed to something more suitable. Commits after the second one are cleanups.

rustbot assigned WaffleLapkin Jan 18, 2024

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 Jan 18, 2024

petrochenkov mentioned this pull request Jan 18, 2024

LLVM Bitcode Linker: A self contained linker for nvptx and other targets #117458

Merged

WaffleLapkin reviewed Jan 19, 2024

View reviewed changes

petrochenkov force-pushed the linkapi branch from d869b0d to 42bcccc Compare January 22, 2024 22:26

WaffleLapkin approved these changes Jan 23, 2024

View reviewed changes

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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 23, 2024

fmease mentioned this pull request Jan 23, 2024

Rollup of 12 pull requests #120279

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 23, 2024

petrochenkov added 7 commits January 24, 2024 01:51

linker: Refactor APIs for linking dynamic libraries

50501c6

Rename `link_(dylib,framework)`, remove `link_rust_dylib`.

linker: Refactor APIs for linking static libraries

0e38a65

Rename `link(_whole)(staticlib,rlib)` to something more suitable.

linker: Group library linking methods together and sort them consiste…

14cd3fd

…ntly

linker: Do not collect search paths unless necessary

859f37a

linker: Merge link_staticlib_* and link_whole_staticlib_*

d15db6b

linker: Cleanup implementations of link_staticlib_*

1b8e871

linker: Fix Rust dylib crate extension on windows-msvc

03f23c1

petrochenkov force-pushed the linkapi branch from 42bcccc to 03f23c1 Compare January 23, 2024 22:54

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 23, 2024

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 23, 2024

fmease mentioned this pull request Jan 24, 2024

Rollup of 8 pull requests #120304

Closed

matthiaskrgr mentioned this pull request Jan 25, 2024

Rollup of 7 pull requests #120336

Closed

matthiaskrgr mentioned this pull request Jan 25, 2024

Rollup of 8 pull requests #120341

Merged

bors merged commit 87448be into rust-lang:master Jan 26, 2024
11 checks passed

rustbot added this to the 1.77.0 milestone Jan 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

linker: Refactor library linking methods in `trait Linker` #120099

linker: Refactor library linking methods in `trait Linker` #120099

petrochenkov commented Jan 18, 2024

rustbot commented Jan 18, 2024

WaffleLapkin Jan 19, 2024

petrochenkov Jan 19, 2024

petrochenkov Jan 22, 2024

petrochenkov Jan 25, 2024

WaffleLapkin commented Jan 23, 2024

bors commented Jan 23, 2024

fmease commented Jan 23, 2024

petrochenkov commented Jan 23, 2024 •

edited

Loading

petrochenkov commented Jan 23, 2024

bors commented Jan 23, 2024

linker: Refactor library linking methods in trait Linker #120099

linker: Refactor library linking methods in trait Linker #120099

Conversation

petrochenkov commented Jan 18, 2024

rustbot commented Jan 18, 2024

WaffleLapkin Jan 19, 2024

Choose a reason for hiding this comment

petrochenkov Jan 19, 2024

Choose a reason for hiding this comment

petrochenkov Jan 22, 2024

Choose a reason for hiding this comment

petrochenkov Jan 25, 2024

Choose a reason for hiding this comment

WaffleLapkin commented Jan 23, 2024

bors commented Jan 23, 2024

fmease commented Jan 23, 2024

petrochenkov commented Jan 23, 2024 • edited Loading

petrochenkov commented Jan 23, 2024

bors commented Jan 23, 2024

linker: Refactor library linking methods in `trait Linker` #120099

linker: Refactor library linking methods in `trait Linker` #120099

petrochenkov commented Jan 23, 2024 •

edited

Loading