Always unwind through a Resume and other fixes by arielb1 · Pull Request #46320 · rust-lang/rust

arielb1 · 2017-11-27T23:46:43Z

Should fix most of the small MIR borrowck issues.

bors · 2017-11-28T08:06:44Z

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

arielb1 · 2017-11-29T21:22:14Z

Ready for review

bors · 2017-11-30T08:03:49Z

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

nikomatsakis

Found the tests after all.

nikomatsakis · 2017-11-30T19:43:00Z

nikomatsakis · 2017-11-30T19:59:11Z

r=me post rebase

arielb1 · 2017-11-30T22:51:55Z

@bors r=nikomatsakis

bors · 2017-11-30T22:51:56Z

📌 Commit 5da76cc has been approved by nikomatsakis

bors · 2017-12-01T21:31:35Z

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

Fixesrust-lang#46159.

Region inference can create borrows for an empty region if the borrow is dead. In that case, there's no reason to track the borrow, but because there's no such thing as an EndRegion(ReEmpty) these borrows used to live for the entire function. Fixesrust-lang#46161.

This simplifies analysis and borrow-checking because liveness at the resume point can always be simply propagated. Later on, the "dead" Resumes are removed.

arielb1 · 2017-12-03T01:13:30Z

@bors r=nikomatsakis

bors · 2017-12-03T01:13:31Z

📌 Commit 6594799 has been approved by nikomatsakis

bors · 2017-12-03T03:24:39Z

⌛ Testing commit 6594799 with merge 036469c...

@nikomatsakis

Always unwind through a Resume and other fixes Should fix most of the small MIR borrowck issues. r? @nikomatsakis

bors · 2017-12-03T05:08:08Z

💔 Test failed - status-travis

kennytm · 2017-12-03T08:33:14Z

Two of the new tests failed with WASM.

[01:38:26] ---- [mir-opt] mir-opt/match_false_edges.rs stdout ----
[01:38:26] thread '[mir-opt] mir-opt/match_false_edges.rs' panicked at 'Did not find expected line, error: Mismatch in lines
[01:38:26] Currnt block: bb9: { // binding1 and guard
[01:38:26] Expected Line: " _6 = const guard() -> bb10; // scope 2 at /checkout/src/test/mir-opt/match_false_edges.rs:25:20: 25:27"
[01:38:26] Actual Line: " _6 = const guard() -> [return: bb10, unwind: bb1];"
...
[01:38:26] ---- [mir-opt] mir-opt/validate_2.rs stdout ----
[01:38:26] thread '[mir-opt] mir-opt/validate_2.rs' panicked at 'Did not find expected line, error: Mismatch in lines
[01:38:26] Currnt block: None
[01:38:26] Expected Line: " drop(_1) -> bb2; // scope 0 at /checkout/src/test/mir-opt/validate_2.rs:16:2: 16:2"
[01:38:26] Actual Line: " drop(_1) -> [return: bb2, unwind: bb3];"

arielb1 · 2017-12-03T12:51:05Z

@bors r=nikomatsakis

bors · 2017-12-03T12:51:05Z

📌 Commit ff0b84d has been approved by nikomatsakis

bors · 2017-12-03T13:01:53Z

⌛ Testing commit ff0b84d with merge 9da2112...

@nikomatsakis

Always unwind through a Resume and other fixes Should fix most of the small MIR borrowck issues. r? @nikomatsakis

bors · 2017-12-03T15:31:27Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 9da2112 to master...

rust-highfive assigned nikomatsakis Nov 27, 2017

kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 28, 2017

arielb1 force-pushed the always-resume branch from f44b4d4 to 3ef4f0aCompare November 29, 2017 21:20

arielb1 changed the title ~~[WIP] Always unwind through a Resume and other fixes~~Always unwind through a Resume and other fixesNov 29, 2017

nikomatsakis approved these changes Nov 30, 2017
View reviewed changes

Comment threadsrc/librustc_mir/borrow_check.rs Outdated
nikomatsakisNov 30, 2017
Copy link
Copy Markdown
Contributor
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests?

arielb1 force-pushed the always-resume branch from dd2aaf5 to 5da76ccCompare November 30, 2017 22:51

arielb1 added 6 commits December 3, 2017 02:21

fix handling of borrows at a function's end
af8c233

initialize the destination in unit statements
a6e24fc
Fixesrust-lang#46159.

add a pass to remove no-op landing pads
485476c

funnel all unwind paths through a single Resume block
9dc3967
This simplifies analysis and borrow-checking because liveness at the resume point can always be simply propagated. Later on, the "dead" Resumes are removed.

add and unignore tests
6594799

arielb1 force-pushed the always-resume branch from 5da76cc to 6594799Compare December 3, 2017 01:13

bors added a commit that referenced this pull request Dec 3, 2017
Auto merge of#46320- arielb1:always-resume, r=nikomatsakis
036469c
Always unwind through a Resume and other fixes Should fix most of the small MIR borrowck issues. r? @nikomatsakis

fix tests in wasm
ff0b84d

bors added a commit that referenced this pull request Dec 3, 2017
Auto merge of#46320- arielb1:always-resume, r=nikomatsakis
9da2112
Always unwind through a Resume and other fixes Should fix most of the small MIR borrowck issues. r? @nikomatsakis

bors merged commit ff0b84d into rust-lang:masterDec 3, 2017

bors mentioned this pull request Dec 3, 2017
NLL: improve inference with flow results, represent regions with bitsets, and more #46319
Merged

matthewjasper mentioned this pull request Aug 3, 2018
region-liveness-drop-no-may-dangle.rs compilation failure on MIR borrowck #46267
Closed

Uh oh!

Uh oh!

Conversation

arielb1 commented Nov 27, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Nov 28, 2017

Uh oh!

arielb1 commented Nov 29, 2017

Uh oh!

bors commented Nov 30, 2017

Uh oh!

nikomatsakis left a comment

Choose a reason for hiding this comment

Uh oh!

nikomatsakisNov 30, 2017

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Nov 30, 2017

Uh oh!

arielb1 commented Nov 30, 2017

Uh oh!

bors commented Nov 30, 2017

Uh oh!

bors commented Dec 1, 2017

Uh oh!

arielb1 commented Dec 3, 2017

Uh oh!

bors commented Dec 3, 2017

Uh oh!

bors commented Dec 3, 2017

Uh oh!

bors commented Dec 3, 2017

Uh oh!

kennytm commented Dec 3, 2017

Uh oh!

arielb1 commented Dec 3, 2017

Uh oh!

bors commented Dec 3, 2017

Uh oh!

bors commented Dec 3, 2017

Uh oh!

bors commented Dec 3, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

arielb1 commented Nov 27, 2017•
edited
Loading