Skip to content

Conversation

@Aaron1011
Copy link
Contributor

Fixes #72386

These types also need to get allocated on the librustc_middle arena
when we deserialize MIR.

@Amanieu: If we end up using your approach in #72392 instead, feel free to copy the test I added over to your PR.

@rust-highfive
Copy link
Contributor

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 20, 2020
@Amanieu
Copy link
Member

Amanieu commented May 22, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 22, 2020

📌 Commit 0ef565e has been approved by Amanieu

@bors
Copy link
Collaborator

bors commented May 22, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@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 May 22, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request May 23, 2020
Add missing ASM arena declarations to librustc_middle Fixes rust-lang#72386 These types also need to get allocated on the `librustc_middle` arena when we deserialize MIR. @Amanieu: If we end up using your approach in rust-lang#72392 instead, feel free to copy the test I added over to your PR.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 23, 2020
Add missing ASM arena declarations to librustc_middle Fixes rust-lang#72386 These types also need to get allocated on the `librustc_middle` arena when we deserialize MIR. @Amanieu: If we end up using your approach in rust-lang#72392 instead, feel free to copy the test I added over to your PR.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 23, 2020
Add missing ASM arena declarations to librustc_middle Fixes rust-lang#72386 These types also need to get allocated on the `librustc_middle` arena when we deserialize MIR. @Amanieu: If we end up using your approach in rust-lang#72392 instead, feel free to copy the test I added over to your PR.
@RalfJung
Copy link
Member

@bors r-
Failed in #72490 (comment) (asm! not available on wasm)

@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 May 23, 2020
Fixes rust-lang#72386 This type also needs to get allocated on the `librustc_middle` arena when we deserialize MIR.
@Aaron1011
Copy link
Contributor Author

@Amanieu: Fixed

@Amanieu
Copy link
Member

Amanieu commented May 23, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented May 23, 2020

📌 Commit 8da4942 has been approved by Amanieu

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 23, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 23, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2020
Rollup of 5 pull requests Successful merges: - rust-lang#71618 (Preserve substitutions when making trait obligations for suggestions) - rust-lang#72092 (Unblock font loading in rustdoc.css) - rust-lang#72400 (Add missing ASM arena declarations to librustc_middle) - rust-lang#72489 (Fix ice-72487) - rust-lang#72502 (fix discriminant type in generator transform) Failed merges: r? @ghost
@bors bors merged commit 3948e60 into rust-lang:master May 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

6 participants