Skip to content

multiple Return terminators are possible#72563

Merged
bors merged 1 commit intorust-lang:masterfrom
RalfJung:multi-return
May 30, 2020
Merged

multiple Return terminators are possible#72563
bors merged 1 commit intorust-lang:masterfrom
RalfJung:multi-return

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented May 25, 2020

@ecstatic-morse mentioned in #72515 that multiple Return terminators are possible. Update the docs accordingly.

Cc @rust-lang/wg-mir-opt

@rust-highfive
Copy link
Contributor

rust-highfive commented May 25, 2020

r? @matthewjasper

(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 25, 2020
@jonas-schievink
Copy link
Contributor

jonas-schievink commented May 25, 2020

I'd say that there are no restrictions at all on this terminator, instead of tying it to generators. For example, there were discussions about adding a pass that propagates terminators backwards, I believe, which would also duplicate Return.

Is there a reason to only have a single Return?

@wesleywiser
Copy link
Member

wesleywiser commented May 25, 2020

There was some discussion about this here #72022 (comment)

@RalfJung
Copy link
Member Author

RalfJung commented May 30, 2020

I'd say that there are no restrictions at all on this terminator, instead of tying it to generators. For example, there were discussions about adding a pass that propagates terminators backwards, I believe, which would also duplicate Return.

Okay, I adjusted the comment accordingly.

@matthewjasper
Copy link
Contributor

matthewjasper commented May 30, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented May 30, 2020

📌 Commit 8ef9392 has been approved by matthewjasper

@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 30, 2020
@RalfJung
Copy link
Member Author

RalfJung commented May 30, 2020

@bors rollup

@RalfJung RalfJung mentioned this pull request May 30, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 30, 2020
@bors
Auto merge of rust-lang#72778 - RalfJung:rollup-f01z68m, r=RalfJung
74e8046 
Rollup of 9 pull requests

Successful merges:

 - rust-lang#72299 (more `LocalDefId`s)
 - rust-lang#72368 (Resolve overflow behavior for RangeFrom)
 - rust-lang#72441 (Fix ICE with explicit late-bound lifetimes)
 - rust-lang#72499 (Override Box::<[T]>::clone_from)
 - rust-lang#72521 (Properly handle InlineAsmOperand::SymFn when collecting monomorphized items)
 - rust-lang#72540 (mir: adjust conditional in recursion limit check)
 - rust-lang#72563 (multiple Return terminators are possible)
 - rust-lang#72585 (Only capture tokens for items with outer attributes)
 - rust-lang#72607 (Eagerly lower asm sub-expressions to HIR even if there is an error)

Failed merges:

r? @ghost
@bors bors merged commit 6238e79 into rust-lang:master May 30, 2020
@RalfJung RalfJung deleted the multi-return branch May 30, 2020 16:41
@nagisa nagisa mentioned this pull request Jun 4, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@matthewjasper matthewjasper

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@RalfJung @rust-highfive @jonas-schievink @wesleywiser @matthewjasper @bors