mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop referring to a region as a "row" in liveness values

Browse Source
This commit is contained in:
Rémy Rakic 2023-11-13 14:39:32 +00:00
parent 891c6eebe6
commit 4e5fe71ca6
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
compiler/rustc_borrowck/src/region_infer/values.rs
View File

@ -138,34 +138,34 @@ impl<N: Idx> LivenessValues<N> {
/// Adds the given element to the value for the given region. Returns whether /// Adds the given element to the value for the given region. Returns whether
/// the element is newly added (i.e., was not already present). /// the element is newly added (i.e., was not already present).
pub(crate) fn add_element(&mut self, row: N, location: Location) -> bool { pub(crate) fn add_element(&mut self, region: N, location: Location) -> bool {
debug!("LivenessValues::add(r={:?}, location={:?})", row, location); debug!("LivenessValues::add_element(region={:?}, location={:?})", region, location);
let index = self.elements.point_from_location(location); let index = self.elements.point_from_location(location);
self.points.insert(row, index) self.points.insert(region, index)
} }
/// Adds all the elements in the given bit array into the given /// Adds all the elements in the given bit array into the given
/// region. Returns whether any of them are newly added. /// region. Returns whether any of them are newly added.
pub(crate) fn add_elements(&mut self, row: N, locations: &IntervalSet<PointIndex>) -> bool { pub(crate) fn add_elements(&mut self, region: N, locations: &IntervalSet<PointIndex>) -> bool {
debug!("LivenessValues::add_elements(row={:?}, locations={:?})", row, locations); debug!("LivenessValues::add_elements(region={:?}, locations={:?})", region, locations);
self.points.union_row(row, locations) self.points.union_row(region, locations)
} }
/// Adds all the control-flow points to the values for `r`. /// Records `region` as being live at all the control-flow points.
pub(crate) fn add_all_points(&mut self, row: N) { pub(crate) fn add_all_points(&mut self, region: N) {
self.points.insert_all_into_row(row); self.points.insert_all_into_row(region);
} }
/// Returns `true` if the region `r` contains the given element. /// Returns `true` if the region `region` contains the given element.
pub(crate) fn contains(&self, row: N, location: Location) -> bool { pub(crate) fn contains(&self, region: N, location: Location) -> bool {
let index = self.elements.point_from_location(location); let index = self.elements.point_from_location(location);
self.points.row(row).is_some_and(|r| r.contains(index)) self.points.row(region).is_some_and(|r| r.contains(index))
} }
/// Returns an iterator of all the elements contained by the region `r` /// Returns an iterator of all the elements contained by `region`.
pub(crate) fn get_elements(&self, row: N) -> impl Iterator<Item = Location> + '_ { pub(crate) fn get_elements(&self, region: N) -> impl Iterator<Item = Location> + '_ {
self.points self.points
.row(row) .row(region)
.into_iter() .into_iter()
.flat_map(|set| set.iter()) .flat_map(|set| set.iter())
.take_while(move |&p| self.elements.point_in_range(p)) .take_while(move |&p| self.elements.point_in_range(p))
@ -173,8 +173,8 @@ impl<N: Idx> LivenessValues<N> {
} }
/// Returns a "pretty" string value of the region. Meant for debugging. /// Returns a "pretty" string value of the region. Meant for debugging.
pub(crate) fn region_value_str(&self, r: N) -> String { pub(crate) fn region_value_str(&self, region: N) -> String {
region_value_str(self.get_elements(r).map(RegionElement::Location)) region_value_str(self.get_elements(region).map(RegionElement::Location))
} }
#[inline] #[inline]