High-level picture: The old `Borrows` analysis is now called `Reservations` (implemented as a newtype wrapper around `Borrows`); this continues to compute whether a `Rvalue::Ref` can reach a statement without an intervening `EndRegion`. In addition, we also track what `Place` each such `Rvalue::Ref` was immediately assigned to in a given borrow (yay for MIR-structural properties!). The new `ActiveBorrows` analysis then tracks the initial use of any of those assigned `Places` for a given borrow. I.e. a borrow becomes "active" immediately after it starts being "used" in some way. (This is conservative in the sense that we will treat a copy `x = y;` as a use of `y`; in principle one might further delay activation in such cases.) The new `ActiveBorrows` analysis needs to take the `Reservations` results as an initial input, because the reservation state influences the gen/kill sets for `ActiveBorrows`. In particular, a use of `a` activates a borrow `a = &b` if and only if there exists a path (in the control flow graph) from the borrow to that use. So we need to know if the borrow reaches a given use to know if it really gets a gen-bit or not. * Incorporating the output from one dataflow analysis into the input of another required more changes to the infrastructure than I had expected, and even after those changes, the resulting code is still a bit subtle. * In particular, Since we need to know the intrablock reservation state, we need to dynamically update a bitvector for the reservations as we are also trying to compute the gen/kills bitvector for the active borrows. * The way I ended up deciding to do this (after also toying with at least two other designs) is to put both the reservation state and the active borrow state into a single bitvector. That is why we now have separate (but related) `BorrowIndex` and `ReserveOrActivateIndex`: each borrow index maps to a pair of neighboring reservation and activation indexes. As noted above, these changes are solely adding the active borrows dataflow analysis (and updating the existing code to cope with the switch from `Borrows` to `Reservations`). The code to process the bitvector in the borrow checker currently just skips over all of the active borrow bits. But atop this commit, one *can* observe the analysis results by looking at the graphviz output, e.g. via ```rust #[rustc_mir(borrowck_graphviz_preflow="pre_two_phase.dot", borrowck_graphviz_postflow="post_two_phase.dot")] ``` Includes doc for `FindPlaceUses`, as well as `Reservations` and `ActiveBorrows` structs, which are wrappers are the `Borrows` struct that dictate which flow analysis should be performed.
160 lines
5.4 KiB
Rust
160 lines
5.4 KiB
Rust
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
//! Manages the dataflow bits required for borrowck.
|
|
//!
|
|
//! FIXME: this might be better as a "generic" fixed-point combinator,
|
|
//! but is not as ugly as it is right now.
|
|
|
|
use rustc::mir::{BasicBlock, Location};
|
|
|
|
use dataflow::{MaybeInitializedLvals, MaybeUninitializedLvals};
|
|
use dataflow::{EverInitializedLvals, MovingOutStatements};
|
|
use dataflow::{ActiveBorrows, FlowAtLocation, FlowsAtLocation};
|
|
use dataflow::move_paths::HasMoveData;
|
|
use std::fmt;
|
|
|
|
// (forced to be `pub` due to its use as an associated type below.)
|
|
pub(crate) struct Flows<'b, 'gcx: 'tcx, 'tcx: 'b> {
|
|
pub borrows: FlowAtLocation<ActiveBorrows<'b, 'gcx, 'tcx>>,
|
|
pub inits: FlowAtLocation<MaybeInitializedLvals<'b, 'gcx, 'tcx>>,
|
|
pub uninits: FlowAtLocation<MaybeUninitializedLvals<'b, 'gcx, 'tcx>>,
|
|
pub move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,
|
|
pub ever_inits: FlowAtLocation<EverInitializedLvals<'b, 'gcx, 'tcx>>,
|
|
}
|
|
|
|
impl<'b, 'gcx, 'tcx> Flows<'b, 'gcx, 'tcx> {
|
|
pub fn new(
|
|
borrows: FlowAtLocation<ActiveBorrows<'b, 'gcx, 'tcx>>,
|
|
inits: FlowAtLocation<MaybeInitializedLvals<'b, 'gcx, 'tcx>>,
|
|
uninits: FlowAtLocation<MaybeUninitializedLvals<'b, 'gcx, 'tcx>>,
|
|
move_outs: FlowAtLocation<MovingOutStatements<'b, 'gcx, 'tcx>>,
|
|
ever_inits: FlowAtLocation<EverInitializedLvals<'b, 'gcx, 'tcx>>,
|
|
) -> Self {
|
|
Flows {
|
|
borrows,
|
|
inits,
|
|
uninits,
|
|
move_outs,
|
|
ever_inits,
|
|
}
|
|
}
|
|
}
|
|
|
|
macro_rules! each_flow {
|
|
($this:ident, $meth:ident($arg:ident)) => {
|
|
FlowAtLocation::$meth(&mut $this.borrows, $arg);
|
|
FlowAtLocation::$meth(&mut $this.inits, $arg);
|
|
FlowAtLocation::$meth(&mut $this.uninits, $arg);
|
|
FlowAtLocation::$meth(&mut $this.move_outs, $arg);
|
|
FlowAtLocation::$meth(&mut $this.ever_inits, $arg);
|
|
}
|
|
}
|
|
|
|
impl<'b, 'gcx, 'tcx> FlowsAtLocation for Flows<'b, 'gcx, 'tcx> {
|
|
fn reset_to_entry_of(&mut self, bb: BasicBlock) {
|
|
each_flow!(self, reset_to_entry_of(bb));
|
|
}
|
|
|
|
fn reconstruct_statement_effect(&mut self, location: Location) {
|
|
each_flow!(self, reconstruct_statement_effect(location));
|
|
}
|
|
|
|
fn reconstruct_terminator_effect(&mut self, location: Location) {
|
|
each_flow!(self, reconstruct_terminator_effect(location));
|
|
}
|
|
|
|
fn apply_local_effect(&mut self, location: Location) {
|
|
each_flow!(self, apply_local_effect(location));
|
|
}
|
|
}
|
|
|
|
impl<'b, 'gcx, 'tcx> fmt::Display for Flows<'b, 'gcx, 'tcx> {
|
|
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
|
|
let mut s = String::new();
|
|
|
|
s.push_str("borrows in effect: [");
|
|
let mut saw_one = false;
|
|
self.borrows.each_state_bit(|borrow| {
|
|
if saw_one {
|
|
s.push_str(", ");
|
|
};
|
|
saw_one = true;
|
|
let borrow_data = &self.borrows.operator().borrows()[borrow.borrow_index()];
|
|
s.push_str(&format!("{}", borrow_data));
|
|
});
|
|
s.push_str("] ");
|
|
|
|
s.push_str("borrows generated: [");
|
|
let mut saw_one = false;
|
|
self.borrows.each_gen_bit(|borrow| {
|
|
if saw_one {
|
|
s.push_str(", ");
|
|
};
|
|
saw_one = true;
|
|
let borrow_data = &self.borrows.operator().borrows()[borrow.borrow_index()];
|
|
s.push_str(&format!("{}", borrow_data));
|
|
});
|
|
s.push_str("] ");
|
|
|
|
s.push_str("inits: [");
|
|
let mut saw_one = false;
|
|
self.inits.each_state_bit(|mpi_init| {
|
|
if saw_one {
|
|
s.push_str(", ");
|
|
};
|
|
saw_one = true;
|
|
let move_path = &self.inits.operator().move_data().move_paths[mpi_init];
|
|
s.push_str(&format!("{}", move_path));
|
|
});
|
|
s.push_str("] ");
|
|
|
|
s.push_str("uninits: [");
|
|
let mut saw_one = false;
|
|
self.uninits.each_state_bit(|mpi_uninit| {
|
|
if saw_one {
|
|
s.push_str(", ");
|
|
};
|
|
saw_one = true;
|
|
let move_path =
|
|
&self.uninits.operator().move_data().move_paths[mpi_uninit];
|
|
s.push_str(&format!("{}", move_path));
|
|
});
|
|
s.push_str("] ");
|
|
|
|
s.push_str("move_out: [");
|
|
let mut saw_one = false;
|
|
self.move_outs.each_state_bit(|mpi_move_out| {
|
|
if saw_one {
|
|
s.push_str(", ");
|
|
};
|
|
saw_one = true;
|
|
let move_out = &self.move_outs.operator().move_data().moves[mpi_move_out];
|
|
s.push_str(&format!("{:?}", move_out));
|
|
});
|
|
s.push_str("] ");
|
|
|
|
s.push_str("ever_init: [");
|
|
let mut saw_one = false;
|
|
self.ever_inits.each_state_bit(|mpi_ever_init| {
|
|
if saw_one {
|
|
s.push_str(", ");
|
|
};
|
|
saw_one = true;
|
|
let ever_init =
|
|
&self.ever_inits.operator().move_data().inits[mpi_ever_init];
|
|
s.push_str(&format!("{:?}", ever_init));
|
|
});
|
|
s.push_str("]");
|
|
|
|
fmt::Display::fmt(&s, fmt)
|
|
}
|
|
}
|