Code

[MIR-borrowck] Two phase borrows#46537

Code

Merged

bors merged 23 commits intorust-lang:masterrust-lang/rust:masterfrom

pnkfelix:two-phase-borrowspnkfelix/rust:two-phase-borrowsCopy head branch name to clipboard

Dec 15, 2017

Commits

Commits on Dec 13, 2017

• Revised graphviz rendering API to avoid requiring borrowed state.

  Show description for 93c4ffe
  pnkfelix

  committed
  93c4ffe

  Copy full SHA for 93c4ffe

• Expanded HIR `--unpretty hir,identified` to include HIR local id.

  Show description for 171c2ae
  pnkfelix

  committed
  171c2ae

  Copy full SHA for 171c2ae

• Refactoring: pull bitvector initialization out from other parts of dataflow.

  Show description for d4add5d
  pnkfelix

  committed
  d4add5d

  Copy full SHA for d4add5d

• Refactoring: Allow `BlockSets.on_entry` to denote locally accumulated intrablock state.

  Show description for e123117
  pnkfelix

  committed
  e123117

  Copy full SHA for e123117

• Refactoring alpha-rename `place` (`BorrowData` field) to `borrowed_place`.

  pnkfelix

  committed
  39e126c

  Copy full SHA for 39e126c

• Implement Borrow/BorrowMut/ToOwned relationships betweed IdxSetBuf and IdxSet.

  pnkfelix

  committed
  e437e49

  Copy full SHA for e437e49

• Allow `mir::Place` to be used as a key in hashtables.

  pnkfelix

  committed
  ef64ace

  Copy full SHA for ef64ace

• New `ActiveBorrows` dataflow for two-phase `&mut`; not yet borrowed-checked.

  Show description for ced5a70
  pnkfelix

  committed
  ced5a70

  Copy full SHA for ced5a70

• Add some doc to `each_borrow_involving_path` iteration function.

  pnkfelix

  committed
  658ed79

  Copy full SHA for 658ed79

• Add some doc to `struct Borrows`.

  pnkfelix

  committed
  1334638

  Copy full SHA for 1334638

• Incorporate active-borrows dataflow into MIR borrow check, yielding

  Show description for 3621645
  pnkfelix

  committed
  3621645

  Copy full SHA for 3621645

• the minimal test for two-phase borrows: the core example from niko's blog post on it.

  pnkfelix

  committed
  5f759a9

  Copy full SHA for 5f759a9

• tests transcribed from nikos blog post.

  pnkfelix

  committed
  dbbec4d

  Copy full SHA for dbbec4d

• test describing a currently unsupported corner case.

  pnkfelix

  committed
  db5420b

  Copy full SHA for db5420b

• two-phase-reservation-sharing-interference.rs variant that is perhaps more surprising.

  pnkfelix

  committed
  9cb92ac

  Copy full SHA for 9cb92ac

• Sidestep ICE from `MirBorrowckCtxt::find_closure_span`.

  pnkfelix

  committed
  18aedf6

  Copy full SHA for 18aedf6

• Check activation points as the place where mutable borrows become relevant.

  Show description for 5cae7a0
  pnkfelix

  committed
  5cae7a0

  Copy full SHA for 5cae7a0

Commits on Dec 14, 2017

• Address review comment: use `.get` instead of indexing to cope w/ terminators.

  Show description for 3c7d9ff
  pnkfelix

  committed
  3c7d9ff

  Copy full SHA for 3c7d9ff

• After discussion with ariel, replacing a guard within kill_loans_out_of_scope_at_location.

  Show description for f96777c
  pnkfelix

  committed
  f96777c

  Copy full SHA for f96777c

• Address review note: `AccessErrorsReported` meant to track whether error reported at *any* point in past.

  pnkfelix

  committed
  b75248e

  Copy full SHA for b75248e

• Address review feedback: don't bother skipping reservations paired with activations.

  pnkfelix

  committed
  b0421fa

  Copy full SHA for b0421fa

• Review feedback: Added test with control flow merge of two borrows "before activation"

  Show description for d654cd3
  pnkfelix

  committed
  d654cd3

  Copy full SHA for d654cd3

• Address review feedback: don't treat "first" activation special.

  Show description for 159037e
  pnkfelix

  committed
  159037e

  Copy full SHA for 159037e