Skip to content

Fix linker failures when #[global_allocator] is used in a dependency #112794

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jun 20, 2023

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jun 19, 2023

Fixes #112715

@bjorn3 bjorn3 added the A-allocators Area: Custom and system allocators label Jun 19, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jun 19, 2023

r? @oli-obk

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

@rustbot 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 Jun 19, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Jun 19, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 19, 2023

📌 Commit b374b20 has been approved by oli-obk

It is now in the queue for this repository.

@bors 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 Jun 19, 2023
@bjorn3 bjorn3 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 19, 2023
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 19, 2023

Nominating for a beta backport as this fixes a regression from stable to beta.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 19, 2023
…-obk

Fix linker failures when #[global_allocator] is used in a dependency

Fixes rust-lang#112715
@matthiaskrgr
Copy link
Member

@bors r-
#112801 (comment)

@bors 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 Jun 19, 2023
@bjorn3 bjorn3 force-pushed the fix_lib_global_alloc branch from b374b20 to 206b951 Compare June 19, 2023 17:32
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 19, 2023

Added # ignore-cross-compile to the test.

@bjorn3 bjorn3 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 19, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Jun 20, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 20, 2023

📌 Commit 206b951 has been approved by oli-obk

It is now in the queue for this repository.

@bors 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 Jun 20, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2023
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#112464 (Fix windows `Socket::connect_timeout` overflow)
 - rust-lang#112720 (Rustdoc: search: color item type and reduce size to avoid clashing)
 - rust-lang#112762 (Sort the errors from arguments checking so that suggestions are handled properly)
 - rust-lang#112786 (change binders from tuple structs to named fields)
 - rust-lang#112794 (Fix linker failures when #[global_allocator] is used in a dependency)
 - rust-lang#112819 (Disable feature(unboxed_closures, fn_traits) in weird-exprs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0688182 into rust-lang:master Jun 20, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 20, 2023
@apiraino
Copy link
Contributor

apiraino commented Jun 22, 2023

Beta backport withhold until next week

@bjorn3 bjorn3 deleted the fix_lib_global_alloc branch June 22, 2023 14:17
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 29, 2023
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 8, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.72.0, 1.71.0 Jul 8, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2023
…k-Simulacrum

[beta] backport

This PR backports:
- rust-lang#113334: Revert the lexing of `c"…"` string literals
- rust-lang#113231: Fix `dropping_copy_types` lint from linting in match-arm with side-effects
- rust-lang#112794: Fix linker failures when #[global_allocator] is used in a dependency

r? `@Mark-Simulacrum`
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-allocators Area: Custom and system allocators beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Linker failure when global allocator overridden in lib.rs
7 participants