Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

inliner: Emit storage markers for introduced arg temporaries #76123

Merged
merged 1 commit into from
Sep 14, 2020

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Aug 30, 2020

When introducing argument temporaries during inlining, emit storage
marker statements just before the assignment and in the beginning of
the return block.

This ensures that such temporaries will not be considered live across
yield points after inlining inside a generator.

Fixes #71793.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Aug 30, 2020
@tmiasko tmiasko force-pushed the inline-args-storage branch from 34f5bff to d3749cc Compare August 31, 2020 08:40
@bors
Copy link
Contributor

bors commented Sep 3, 2020

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

When introducing argument temporaries during inlining, emit storage
marker statements just before the assignment and in the beginning of
the return block.

This ensures that such temporaries will not be considered live across
yield points after inlining inside a generator.
@tmiasko tmiasko force-pushed the inline-args-storage branch from d3749cc to 9daf8fd Compare September 3, 2020 15:04
@tmiasko
Copy link
Contributor Author

tmiasko commented Sep 5, 2020

r? @tmandry

@rust-highfive rust-highfive assigned tmandry and unassigned nikomatsakis Sep 5, 2020
@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Sep 13, 2020

📌 Commit 9daf8fd has been approved by wesleywiser

@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 Sep 13, 2020
@bors
Copy link
Contributor

bors commented Sep 14, 2020

⌛ Testing commit 9daf8fd with merge 0b65a3d...

@bors
Copy link
Contributor

bors commented Sep 14, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: wesleywiser
Pushing 0b65a3d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 14, 2020
@bors bors merged commit 0b65a3d into rust-lang:master Sep 14, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 14, 2020
@tmiasko tmiasko deleted the inline-args-storage branch September 14, 2020 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
7 participants