Skip to content

Fix #[thread_local] statics as asm! sym operands - #73033

Merged
bors merged 1 commit into
rust-lang:masterfrom
Amanieu:asm-tls
Jun 12, 2020
Merged

Fix #[thread_local] statics as asm! sym operands#73033
bors merged 1 commit into
rust-lang:masterfrom
Amanieu:asm-tls

Conversation

@Amanieu

Copy link
Copy Markdown
Member

The asm! RFC specifies that #[thread_local] statics may be used as sym operands for inline assembly.

This also fixes a regression in the handling of #[thread_local] during monomorphization which caused link-time errors with multiple codegen units, most likely introduced by #71192.

r? @oli-obk

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 5, 2020
Comment threadsrc/test/ui/asm/sym.rs Outdated
Comment threadsrc/librustc_mir/monomorphize/collector.rs Outdated
@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 8, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 74befd9 has been approved by oli-obk

@borsbors 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 8, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 11, 2020
Fix #[thread_local] statics as asm! sym operands
The `asm!` RFC specifies that `#[thread_local]` statics may be used as `sym` operands for inline assembly.
This also fixes a regression in the handling of `#[thread_local]` during monomorphization which caused link-time errors with multiple codegen units, most likely introduced by rust-lang#71192.
r? @oli-obk
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2020
Rollup of 7 pull requests
Successful merges:
- rust-lang#73033 (Fix #[thread_local] statics as asm! sym operands)
- rust-lang#73036 (std: Enable atomic.fence emission on wasm32)
- rust-lang#73163 (Add long error explanation for E0724)
- rust-lang#73187 (Remove missed `cfg(bootstrap)`)
- rust-lang#73195 (Provide suggestion to convert numeric op LHS rather than unwrapping RHS)
- rust-lang#73247 (Add various Zulip notifications for prioritization)
- rust-lang#73254 (Add comment about LocalDefId -> DefId)
Failed merges:
r? @ghost
@bors
bors merged commit 2e42476 into rust-lang:masterJun 12, 2020
@cuvipercuviper added this to the 1.46 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@Amanieu@oli-obk@bors@cuviper@rust-highfive