Ensure we emit an allocator shim when only some crate types need one by bjorn3 · Pull Request #145962 · rust-lang/rust

bjorn3 · 2025-08-28T15:13:46Z

Found this while trying to write a test for #145955.

rustbot · 2025-08-28T15:13:51Z

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-08-28T15:13:53Z

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

bors · 2025-08-29T00:27:01Z

☔ The latest upstream changes (presumably #145970) made this pull request unmergeable. Please resolve the merge conflicts.

…him is exported Previously it would attempt to export the allocator shim even linking for a crate type which pulls in the allocator shim from a dylib rather than locally defining it.

rustbot · 2025-08-29T08:41:05Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

WaffleLapkin · 2025-08-31T16:37:32Z

r? WaffleLapkin
@bors r+

bors · 2025-08-31T16:37:35Z

📌 Commit f4888c2 has been approved by WaffleLapkin

It is now in the queue for this repository.

bors · 2025-08-31T19:29:29Z

⌛ Testing commit f4888c2 with merge c37dd0d...

Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for #145955.

bors · 2025-08-31T20:27:28Z

💔 Test failed - checks-actions

bjorn3 · 2025-08-31T20:43:55Z

@bors try jobs=test-various

Ensure we emit an allocator shim when only some crate types need one try-job: test-various

Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for rust-lang#145955.

Rollup of 8 pull requests Successful merges: - #139113 (unstable book: in a sanitizer example, check the code) - #145823 (editorconfig: don't use nonexistent syntax) - #145962 (Ensure we emit an allocator shim when only some crate types need one) - #146032 (Explicity disable LSX feature for `loongarch64-unknown-none` target) - #146090 (Derive `PartialEq` for `InvisibleOrigin`) - #146120 (Correct typo in `rustc_errors` comment) - #146121 (fix: Filter suggestion parts that match existing code) - #146134 (llvm: nvptx: Layout update to match LLVM) r? `@ghost` `@rustbot` modify labels: rollup

Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for rust-lang#145955.

Rollup of 9 pull requests Successful merges: - #143725 (core: add Peekable::next_if_map) - #145209 (Stabilize `path_add_extension`) - #145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - #145962 (Ensure we emit an allocator shim when only some crate types need one) - #145963 (Add LSX accelerated implementation for source file analysis) - #146054 (add `#[must_use]` to `array::repeat`) - #146090 (Derive `PartialEq` for `InvisibleOrigin`) - #146120 (Correct typo in `rustc_errors` comment) - #146131 (rustdoc-search: add test case for indexing every item type) r? `@ghost` `@rustbot` modify labels: rollup

Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for rust-lang#145955.

Rollup of 15 pull requests Successful merges: - #143725 (core: add Peekable::next_if_map) - #145209 (Stabilize `path_add_extension`) - #145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - #145962 (Ensure we emit an allocator shim when only some crate types need one) - #145963 (Add LSX accelerated implementation for source file analysis) - #146054 (add `#[must_use]` to `array::repeat`) - #146090 (Derive `PartialEq` for `InvisibleOrigin`) - #146120 (Correct typo in `rustc_errors` comment) - #146127 (Rename `ToolRustc` to `ToolRustcPrivate`) - #146131 (rustdoc-search: add test case for indexing every item type) - #146133 (Revert "Make `lto` and `linker-plugin-lto` work the same for `compiler_builtins`) - #146134 (llvm: nvptx: Layout update to match LLVM) - #146136 (docs(std): add missing closing code block fences in doc comments) - #146137 (Disallow frontmatter in `--cfg` and `--check-cfg` arguments) - #146140 (compiletest: cygwin follows windows in using PATH for dynamic libraries) r? `@ghost` `@rustbot` modify labels: rollup

Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for rust-lang#145955.

Rollup of 16 pull requests Successful merges: - #143725 (core: add Peekable::next_if_map) - #145209 (Stabilize `path_add_extension`) - #145342 (fix drop scope for `super let` bindings within `if let`) - #145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - #145962 (Ensure we emit an allocator shim when only some crate types need one) - #145963 (Add LSX accelerated implementation for source file analysis) - #146054 (add `#[must_use]` to `array::repeat`) - #146090 (Derive `PartialEq` for `InvisibleOrigin`) - #146120 (Correct typo in `rustc_errors` comment) - #146127 (Rename `ToolRustc` to `ToolRustcPrivate`) - #146133 (Revert "Make `lto` and `linker-plugin-lto` work the same for `compiler_builtins`) - #146134 (llvm: nvptx: Layout update to match LLVM) - #146136 (docs(std): add missing closing code block fences in doc comments) - #146137 (Disallow frontmatter in `--cfg` and `--check-cfg` arguments) - #146140 (compiletest: cygwin follows windows in using PATH for dynamic libraries) - #146156 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for rust-lang#145955.

Rollup of 24 pull requests Successful merges: - #140459 (Add `read_buf` equivalents for positioned reads) - #143725 (core: add Peekable::next_if_map) - #145209 (Stabilize `path_add_extension`) - #145342 (fix drop scope for `super let` bindings within `if let`) - #145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - #145827 (On unused binding or binding not present in all patterns, suggest potential typo of unit struct/variant or const) - #145932 (Allow `inline(always)` with a target feature behind a unstable feature `target_feature_inline_always`.) - #145962 (Ensure we emit an allocator shim when only some crate types need one) - #145963 (Add LSX accelerated implementation for source file analysis) - #146054 (add `#[must_use]` to `array::repeat`) - #146090 (Derive `PartialEq` for `InvisibleOrigin`) - #146112 (don't uppercase error messages) - #146120 (Correct typo in `rustc_errors` comment) - #146124 (Test `rustc-dev` in `distcheck`) - #146127 (Rename `ToolRustc` to `ToolRustcPrivate`) - #146131 (rustdoc-search: add test case for indexing every item type) - #146134 (llvm: nvptx: Layout update to match LLVM) - #146136 (docs(std): add missing closing code block fences in doc comments) - #146137 (Disallow frontmatter in `--cfg` and `--check-cfg` arguments) - #146140 (compiletest: cygwin follows windows in using PATH for dynamic libraries) - #146150 (fix(rustdoc): match rustc `--emit` precedence ) - #146155 (Make bootstrap self test parallel) - #146161 ([rustdoc] Uncomment code to add scraped rustdoc examples in loaded paths) - #146172 (triagebot: configure some pings when certain attributes are used) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #145962 - bjorn3:linkage_fixes, r=WaffleLapkin Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for #145955.

Rollup of 24 pull requests Successful merges: - rust-lang/rust#140459 (Add `read_buf` equivalents for positioned reads) - rust-lang/rust#143725 (core: add Peekable::next_if_map) - rust-lang/rust#145209 (Stabilize `path_add_extension`) - rust-lang/rust#145342 (fix drop scope for `super let` bindings within `if let`) - rust-lang/rust#145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - rust-lang/rust#145827 (On unused binding or binding not present in all patterns, suggest potential typo of unit struct/variant or const) - rust-lang/rust#145932 (Allow `inline(always)` with a target feature behind a unstable feature `target_feature_inline_always`.) - rust-lang/rust#145962 (Ensure we emit an allocator shim when only some crate types need one) - rust-lang/rust#145963 (Add LSX accelerated implementation for source file analysis) - rust-lang/rust#146054 (add `#[must_use]` to `array::repeat`) - rust-lang/rust#146090 (Derive `PartialEq` for `InvisibleOrigin`) - rust-lang/rust#146112 (don't uppercase error messages) - rust-lang/rust#146120 (Correct typo in `rustc_errors` comment) - rust-lang/rust#146124 (Test `rustc-dev` in `distcheck`) - rust-lang/rust#146127 (Rename `ToolRustc` to `ToolRustcPrivate`) - rust-lang/rust#146131 (rustdoc-search: add test case for indexing every item type) - rust-lang/rust#146134 (llvm: nvptx: Layout update to match LLVM) - rust-lang/rust#146136 (docs(std): add missing closing code block fences in doc comments) - rust-lang/rust#146137 (Disallow frontmatter in `--cfg` and `--check-cfg` arguments) - rust-lang/rust#146140 (compiletest: cygwin follows windows in using PATH for dynamic libraries) - rust-lang/rust#146150 (fix(rustdoc): match rustc `--emit` precedence ) - rust-lang/rust#146155 (Make bootstrap self test parallel) - rust-lang/rust#146161 ([rustdoc] Uncomment code to add scraped rustdoc examples in loaded paths) - rust-lang/rust#146172 (triagebot: configure some pings when certain attributes are used) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 24 pull requests Successful merges: - rust-lang#140459 (Add `read_buf` equivalents for positioned reads) - rust-lang#143725 (core: add Peekable::next_if_map) - rust-lang#145209 (Stabilize `path_add_extension`) - rust-lang#145342 (fix drop scope for `super let` bindings within `if let`) - rust-lang#145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - rust-lang#145827 (On unused binding or binding not present in all patterns, suggest potential typo of unit struct/variant or const) - rust-lang#145932 (Allow `inline(always)` with a target feature behind a unstable feature `target_feature_inline_always`.) - rust-lang#145962 (Ensure we emit an allocator shim when only some crate types need one) - rust-lang#145963 (Add LSX accelerated implementation for source file analysis) - rust-lang#146054 (add `#[must_use]` to `array::repeat`) - rust-lang#146090 (Derive `PartialEq` for `InvisibleOrigin`) - rust-lang#146112 (don't uppercase error messages) - rust-lang#146120 (Correct typo in `rustc_errors` comment) - rust-lang#146124 (Test `rustc-dev` in `distcheck`) - rust-lang#146127 (Rename `ToolRustc` to `ToolRustcPrivate`) - rust-lang#146131 (rustdoc-search: add test case for indexing every item type) - rust-lang#146134 (llvm: nvptx: Layout update to match LLVM) - rust-lang#146136 (docs(std): add missing closing code block fences in doc comments) - rust-lang#146137 (Disallow frontmatter in `--cfg` and `--check-cfg` arguments) - rust-lang#146140 (compiletest: cygwin follows windows in using PATH for dynamic libraries) - rust-lang#146150 (fix(rustdoc): match rustc `--emit` precedence ) - rust-lang#146155 (Make bootstrap self test parallel) - rust-lang#146161 ([rustdoc] Uncomment code to add scraped rustdoc examples in loaded paths) - rust-lang#146172 (triagebot: configure some pings when certain attributes are used) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 24 pull requests Successful merges: - rust-lang/rust#140459 (Add `read_buf` equivalents for positioned reads) - rust-lang/rust#143725 (core: add Peekable::next_if_map) - rust-lang/rust#145209 (Stabilize `path_add_extension`) - rust-lang/rust#145342 (fix drop scope for `super let` bindings within `if let`) - rust-lang/rust#145750 (raw_vec.rs: Remove superfluous fn alloc_guard) - rust-lang/rust#145827 (On unused binding or binding not present in all patterns, suggest potential typo of unit struct/variant or const) - rust-lang/rust#145932 (Allow `inline(always)` with a target feature behind a unstable feature `target_feature_inline_always`.) - rust-lang/rust#145962 (Ensure we emit an allocator shim when only some crate types need one) - rust-lang/rust#145963 (Add LSX accelerated implementation for source file analysis) - rust-lang/rust#146054 (add `#[must_use]` to `array::repeat`) - rust-lang/rust#146090 (Derive `PartialEq` for `InvisibleOrigin`) - rust-lang/rust#146112 (don't uppercase error messages) - rust-lang/rust#146120 (Correct typo in `rustc_errors` comment) - rust-lang/rust#146124 (Test `rustc-dev` in `distcheck`) - rust-lang/rust#146127 (Rename `ToolRustc` to `ToolRustcPrivate`) - rust-lang/rust#146131 (rustdoc-search: add test case for indexing every item type) - rust-lang/rust#146134 (llvm: nvptx: Layout update to match LLVM) - rust-lang/rust#146136 (docs(std): add missing closing code block fences in doc comments) - rust-lang/rust#146137 (Disallow frontmatter in `--cfg` and `--check-cfg` arguments) - rust-lang/rust#146140 (compiletest: cygwin follows windows in using PATH for dynamic libraries) - rust-lang/rust#146150 (fix(rustdoc): match rustc `--emit` precedence ) - rust-lang/rust#146155 (Make bootstrap self test parallel) - rust-lang/rust#146161 ([rustdoc] Uncomment code to add scraped rustdoc examples in loaded paths) - rust-lang/rust#146172 (triagebot: configure some pings when certain attributes are used) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned BoxyUwU Aug 28, 2025

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 Aug 28, 2025

This comment has been minimized.

Sign in to view

bjorn3 mentioned this pull request Aug 28, 2025

Rework how the codegen coordinator code handles the allocator shim #145955

Merged

bjorn3 added 3 commits August 29, 2025 08:39

Ensure we emit an allocator shim when only some crate types need one

fc7de99

Fix typo in comment

1d30900

Correctly handle different crate types disagreeing if the allocator s…

f4888c2

…him is exported Previously it would attempt to export the allocator shim even linking for a crate type which pulls in the allocator shim from a dylib rather than locally defining it.

bjorn3 force-pushed the linkage_fixes branch from 9866540 to f4888c2 Compare August 29, 2025 08:41

bjorn3 force-pushed the linkage_fixes branch from f4888c2 to 1d30900 Compare August 29, 2025 13:52

WaffleLapkin approved these changes Aug 31, 2025

View reviewed changes

rustbot assigned WaffleLapkin Aug 31, 2025

rustbot unassigned BoxyUwU Aug 31, 2025

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 Aug 31, 2025

bors added a commit that referenced this pull request Aug 31, 2025

Auto merge of #145962 - bjorn3:linkage_fixes, r=WaffleLapkin

c37dd0d

Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for #145955.

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 31, 2025

Ignore test when dylibs are not supported

0711bba

rust-bors bot added a commit that referenced this pull request Aug 31, 2025

Auto merge of #145962 - bjorn3:linkage_fixes, r=<try>

bdfc441

Ensure we emit an allocator shim when only some crate types need one try-job: test-various

GuillaumeGomez mentioned this pull request Sep 2, 2025

Rollup of 8 pull requests #146139

Closed

tgross35 mentioned this pull request Sep 3, 2025

Rollup of 9 pull requests #146142

Closed

tgross35 mentioned this pull request Sep 3, 2025

Rollup of 9 pull requests #146147

Closed

jhpratt mentioned this pull request Sep 3, 2025

Rollup of 15 pull requests #146153

Closed

Zalathar mentioned this pull request Sep 3, 2025

Rollup of 16 pull requests #146158

Closed

Zalathar mentioned this pull request Sep 4, 2025

Rollup of 24 pull requests #146185

Merged

bors merged commit 6c77c4c into rust-lang:master Sep 4, 2025
11 checks passed

rustbot added this to the 1.91.0 milestone Sep 4, 2025

rust-timer added a commit that referenced this pull request Sep 4, 2025

Unrolled build for #145962

4ecbd4f

Rollup merge of #145962 - bjorn3:linkage_fixes, r=WaffleLapkin Ensure we emit an allocator shim when only some crate types need one Found this while trying to write a test for #145955.

bjorn3 deleted the linkage_fixes branch September 4, 2025 08:00

bjorn3 mentioned this pull request Sep 5, 2025

Move LTO from the codegen coordinator thread to link_binary rust-lang/compiler-team#908

Closed

10 tasks

tgross35 mentioned this pull request Sep 7, 2025

hidden symbol `_RNvCsi3tQlMvAKpb_7___rustc8___rg_oom' isn't defined #146287

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Ensure we emit an allocator shim when only some crate types need one#145962

Ensure we emit an allocator shim when only some crate types need one#145962
bors merged 4 commits intorust-lang:masterfrom
bjorn3:linkage_fixes

bjorn3 commented Aug 28, 2025

Uh oh!

rustbot commented Aug 28, 2025

Uh oh!

rustbot commented Aug 28, 2025

Uh oh!

This comment has been minimized.

bors commented Aug 29, 2025

Uh oh!

rustbot commented Aug 29, 2025

Uh oh!

WaffleLapkin commented Aug 31, 2025

Uh oh!

bors commented Aug 31, 2025

Uh oh!

bors commented Aug 31, 2025

Uh oh!

This comment has been minimized.

bors commented Aug 31, 2025

Uh oh!

bjorn3 commented Aug 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

bjorn3 commented Aug 28, 2025

Uh oh!

rustbot commented Aug 28, 2025

Uh oh!

rustbot commented Aug 28, 2025

Uh oh!

This comment has been minimized.

bors commented Aug 29, 2025

Uh oh!

rustbot commented Aug 29, 2025

Uh oh!

WaffleLapkin commented Aug 31, 2025

Uh oh!

bors commented Aug 31, 2025

Uh oh!

bors commented Aug 31, 2025

Uh oh!

This comment has been minimized.

bors commented Aug 31, 2025

Uh oh!

bjorn3 commented Aug 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants