Skip to content

Commit 3a1a621

Browse files
lqdlqd
committed
rename LocationTable to PoloniusLocationTable
Its original naming hides the fact that it's related to datalog polonius, and bound to be deleted in the near future. It also conflicts with the expected name for the actual NLL location map, and prefixing it with its use will make the differentiation possible.
1 parent 6f1c417 commit 3a1a621

File tree

10 files changed

+47
-46
lines changed

10 files changed

+47
-46
lines changed

Diff for: ‎compiler/rustc_borrowck/src/consumers.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub use super::dataflow::{BorrowIndex, Borrows, calculate_borrows_out_of_scope_a
1111
pub use super::place_ext::PlaceExt;
1212
pub use super::places_conflict::{PlaceConflictBias, places_conflict};
1313
pub use super::polonius::legacy::{
14-
AllFacts as PoloniusInput, LocationTable, PoloniusOutput, PoloniusRegionVid, RichLocation,
15-
RustcFacts,
14+
AllFacts as PoloniusInput, PoloniusLocationTable, PoloniusOutput, PoloniusRegionVid,
15+
RichLocation, RustcFacts,
1616
};
1717
pub use super::region_infer::RegionInferenceContext;
1818

@@ -33,7 +33,7 @@ pub enum ConsumerOptions {
3333
/// without significant slowdowns.
3434
///
3535
/// Implies [`RegionInferenceContext`](ConsumerOptions::RegionInferenceContext),
36-
/// and additionally retrieve the [`LocationTable`] and [`PoloniusInput`] that
36+
/// and additionally retrieve the [`PoloniusLocationTable`] and [`PoloniusInput`] that
3737
/// would be given to Polonius. Critically, this does not run Polonius, which
3838
/// one may want to avoid due to performance issues on large bodies.
3939
PoloniusInputFacts,
@@ -71,7 +71,7 @@ pub struct BodyWithBorrowckFacts<'tcx> {
7171
/// The table that maps Polonius points to locations in the table.
7272
/// Populated when using [`ConsumerOptions::PoloniusInputFacts`]
7373
/// or [`ConsumerOptions::PoloniusOutputFacts`].
74-
pub location_table: Option<LocationTable>,
74+
pub location_table: Option<PoloniusLocationTable>,
7575
/// Polonius input facts.
7676
/// Populated when using [`ConsumerOptions::PoloniusInputFacts`]
7777
/// or [`ConsumerOptions::PoloniusOutputFacts`].

Diff for: ‎compiler/rustc_borrowck/src/lib.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ use crate::diagnostics::{
5656
use crate::path_utils::*;
5757
use crate::place_ext::PlaceExt;
5858
use crate::places_conflict::{PlaceConflictBias, places_conflict};
59-
use crate::polonius::legacy::{LocationTable, PoloniusOutput};
59+
use crate::polonius::legacy::{PoloniusLocationTable, PoloniusOutput};
6060
use crate::prefixes::PrefixSet;
6161
use crate::region_infer::RegionInferenceContext;
6262
use crate::renumber::RegionCtxt;
@@ -175,7 +175,7 @@ fn do_mir_borrowck<'tcx>(
175175
infcx.register_predefined_opaques_for_next_solver(def);
176176
}
177177

178-
let location_table = LocationTable::new(body);
178+
let location_table = PoloniusLocationTable::new(body);
179179

180180
let move_data = MoveData::gather_moves(body, tcx, |_| true);
181181
let promoted_move_data = promoted
@@ -246,7 +246,8 @@ fn do_mir_borrowck<'tcx>(
246246
infcx: &infcx,
247247
body: promoted_body,
248248
move_data: &move_data,
249-
location_table: &location_table, // no need to create a real one for the promoted, it is not used
249+
// no need to create a real location table for the promoted, it is not used
250+
location_table: &location_table,
250251
movable_coroutine,
251252
fn_self_span_reported: Default::default(),
252253
locals_are_invalidated_at_exit,
@@ -512,7 +513,7 @@ struct MirBorrowckCtxt<'a, 'infcx, 'tcx> {
512513

513514
/// Map from MIR `Location` to `LocationIndex`; created
514515
/// when MIR borrowck begins.
515-
location_table: &'a LocationTable,
516+
location_table: &'a PoloniusLocationTable,
516517

517518
movable_coroutine: bool,
518519
/// This keeps track of whether local variables are free-ed when the function

Diff for: ‎compiler/rustc_borrowck/src/nll.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::borrow_set::BorrowSet;
2828
use crate::consumers::ConsumerOptions;
2929
use crate::diagnostics::{BorrowckDiagnosticsBuffer, RegionErrors};
3030
use crate::polonius::LocalizedOutlivesConstraintSet;
31-
use crate::polonius::legacy::{AllFacts, AllFactsExt, LocationTable, PoloniusOutput};
31+
use crate::polonius::legacy::{AllFacts, AllFactsExt, PoloniusLocationTable, PoloniusOutput};
3232
use crate::region_infer::RegionInferenceContext;
3333
use crate::type_check::{self, MirTypeckResults};
3434
use crate::universal_regions::UniversalRegions;
@@ -80,7 +80,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
8080
universal_regions: UniversalRegions<'tcx>,
8181
body: &Body<'tcx>,
8282
promoted: &IndexSlice<Promoted, Body<'tcx>>,
83-
location_table: &LocationTable,
83+
location_table: &PoloniusLocationTable,
8484
flow_inits: ResultsCursor<'a, 'tcx, MaybeInitializedPlaces<'a, 'tcx>>,
8585
move_data: &MoveData<'tcx>,
8686
borrow_set: &BorrowSet<'tcx>,

Diff for: ‎compiler/rustc_borrowck/src/polonius/legacy/accesses.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use rustc_middle::ty::TyCtxt;
44
use rustc_mir_dataflow::move_paths::{LookupResult, MoveData};
55
use tracing::debug;
66

7-
use super::{AllFacts, LocationIndex, LocationTable};
7+
use super::{AllFacts, LocationIndex, PoloniusLocationTable};
88
use crate::def_use::{self, DefUse};
99
use crate::universal_regions::UniversalRegions;
1010

@@ -13,7 +13,7 @@ pub(crate) fn emit_access_facts<'tcx>(
1313
tcx: TyCtxt<'tcx>,
1414
facts: &mut AllFacts,
1515
body: &Body<'tcx>,
16-
location_table: &LocationTable,
16+
location_table: &PoloniusLocationTable,
1717
move_data: &MoveData<'tcx>,
1818
universal_regions: &UniversalRegions<'tcx>,
1919
) {
@@ -33,7 +33,7 @@ pub(crate) fn emit_access_facts<'tcx>(
3333
struct AccessFactsExtractor<'a, 'tcx> {
3434
facts: &'a mut AllFacts,
3535
move_data: &'a MoveData<'tcx>,
36-
location_table: &'a LocationTable,
36+
location_table: &'a PoloniusLocationTable,
3737
}
3838

3939
impl<'tcx> AccessFactsExtractor<'_, 'tcx> {

Diff for: ‎compiler/rustc_borrowck/src/polonius/legacy/facts.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_middle::mir::Local;
1010
use rustc_middle::ty::{RegionVid, TyCtxt};
1111
use rustc_mir_dataflow::move_paths::MovePathIndex;
1212

13-
use super::{LocationIndex, LocationTable};
13+
use super::{LocationIndex, PoloniusLocationTable};
1414
use crate::BorrowIndex;
1515

1616
#[derive(Copy, Clone, Debug)]
@@ -63,7 +63,7 @@ impl AllFacts {
6363
fn write_to_dir(
6464
&self,
6565
dir: impl AsRef<Path>,
66-
location_table: &LocationTable,
66+
location_table: &PoloniusLocationTable,
6767
) -> Result<(), Box<dyn Error>> {
6868
let dir: &Path = dir.as_ref();
6969
fs::create_dir_all(dir)?;
@@ -119,7 +119,7 @@ impl Atom for LocationIndex {
119119
}
120120

121121
struct FactWriter<'w> {
122-
location_table: &'w LocationTable,
122+
location_table: &'w PoloniusLocationTable,
123123
dir: &'w Path,
124124
}
125125

@@ -141,15 +141,15 @@ trait FactRow {
141141
fn write(
142142
&self,
143143
out: &mut dyn Write,
144-
location_table: &LocationTable,
144+
location_table: &PoloniusLocationTable,
145145
) -> Result<(), Box<dyn Error>>;
146146
}
147147

148148
impl FactRow for PoloniusRegionVid {
149149
fn write(
150150
&self,
151151
out: &mut dyn Write,
152-
location_table: &LocationTable,
152+
location_table: &PoloniusLocationTable,
153153
) -> Result<(), Box<dyn Error>> {
154154
write_row(out, location_table, &[self])
155155
}
@@ -163,7 +163,7 @@ where
163163
fn write(
164164
&self,
165165
out: &mut dyn Write,
166-
location_table: &LocationTable,
166+
location_table: &PoloniusLocationTable,
167167
) -> Result<(), Box<dyn Error>> {
168168
write_row(out, location_table, &[&self.0, &self.1])
169169
}
@@ -178,7 +178,7 @@ where
178178
fn write(
179179
&self,
180180
out: &mut dyn Write,
181-
location_table: &LocationTable,
181+
location_table: &PoloniusLocationTable,
182182
) -> Result<(), Box<dyn Error>> {
183183
write_row(out, location_table, &[&self.0, &self.1, &self.2])
184184
}
@@ -194,15 +194,15 @@ where
194194
fn write(
195195
&self,
196196
out: &mut dyn Write,
197-
location_table: &LocationTable,
197+
location_table: &PoloniusLocationTable,
198198
) -> Result<(), Box<dyn Error>> {
199199
write_row(out, location_table, &[&self.0, &self.1, &self.2, &self.3])
200200
}
201201
}
202202

203203
fn write_row(
204204
out: &mut dyn Write,
205-
location_table: &LocationTable,
205+
location_table: &PoloniusLocationTable,
206206
columns: &[&dyn FactCell],
207207
) -> Result<(), Box<dyn Error>> {
208208
for (index, c) in columns.iter().enumerate() {
@@ -213,41 +213,41 @@ fn write_row(
213213
}
214214

215215
trait FactCell {
216-
fn to_string(&self, location_table: &LocationTable) -> String;
216+
fn to_string(&self, location_table: &PoloniusLocationTable) -> String;
217217
}
218218

219219
impl FactCell for BorrowIndex {
220-
fn to_string(&self, _location_table: &LocationTable) -> String {
220+
fn to_string(&self, _location_table: &PoloniusLocationTable) -> String {
221221
format!("{self:?}")
222222
}
223223
}
224224

225225
impl FactCell for Local {
226-
fn to_string(&self, _location_table: &LocationTable) -> String {
226+
fn to_string(&self, _location_table: &PoloniusLocationTable) -> String {
227227
format!("{self:?}")
228228
}
229229
}
230230

231231
impl FactCell for MovePathIndex {
232-
fn to_string(&self, _location_table: &LocationTable) -> String {
232+
fn to_string(&self, _location_table: &PoloniusLocationTable) -> String {
233233
format!("{self:?}")
234234
}
235235
}
236236

237237
impl FactCell for PoloniusRegionVid {
238-
fn to_string(&self, _location_table: &LocationTable) -> String {
238+
fn to_string(&self, _location_table: &PoloniusLocationTable) -> String {
239239
format!("{self:?}")
240240
}
241241
}
242242

243243
impl FactCell for RegionVid {
244-
fn to_string(&self, _location_table: &LocationTable) -> String {
244+
fn to_string(&self, _location_table: &PoloniusLocationTable) -> String {
245245
format!("{self:?}")
246246
}
247247
}
248248

249249
impl FactCell for LocationIndex {
250-
fn to_string(&self, location_table: &LocationTable) -> String {
250+
fn to_string(&self, location_table: &PoloniusLocationTable) -> String {
251251
format!("{:?}", location_table.to_rich_location(*self))
252252
}
253253
}

Diff for: ‎compiler/rustc_borrowck/src/polonius/legacy/loan_invalidations.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_middle::mir::{
1111
use rustc_middle::ty::TyCtxt;
1212
use tracing::debug;
1313

14-
use super::{AllFacts, LocationTable};
14+
use super::{AllFacts, PoloniusLocationTable};
1515
use crate::borrow_set::BorrowSet;
1616
use crate::path_utils::*;
1717
use crate::{
@@ -24,7 +24,7 @@ pub(super) fn emit_loan_invalidations<'tcx>(
2424
tcx: TyCtxt<'tcx>,
2525
facts: &mut AllFacts,
2626
body: &Body<'tcx>,
27-
location_table: &LocationTable,
27+
location_table: &PoloniusLocationTable,
2828
borrow_set: &BorrowSet<'tcx>,
2929
) {
3030
let dominators = body.basic_blocks.dominators();
@@ -37,7 +37,7 @@ struct LoanInvalidationsGenerator<'a, 'tcx> {
3737
tcx: TyCtxt<'tcx>,
3838
facts: &'a mut AllFacts,
3939
body: &'a Body<'tcx>,
40-
location_table: &'a LocationTable,
40+
location_table: &'a PoloniusLocationTable,
4141
dominators: &'a Dominators<BasicBlock>,
4242
borrow_set: &'a BorrowSet<'tcx>,
4343
}

Diff for: ‎compiler/rustc_borrowck/src/polonius/legacy/loan_kills.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_middle::mir::{
66
use rustc_middle::ty::TyCtxt;
77
use tracing::debug;
88

9-
use super::{AllFacts, LocationTable};
9+
use super::{AllFacts, PoloniusLocationTable};
1010
use crate::borrow_set::BorrowSet;
1111
use crate::places_conflict;
1212

@@ -15,7 +15,7 @@ pub(super) fn emit_loan_kills<'tcx>(
1515
tcx: TyCtxt<'tcx>,
1616
facts: &mut AllFacts,
1717
body: &Body<'tcx>,
18-
location_table: &LocationTable,
18+
location_table: &PoloniusLocationTable,
1919
borrow_set: &BorrowSet<'tcx>,
2020
) {
2121
let mut visitor = LoanKillsGenerator { borrow_set, tcx, location_table, facts, body };
@@ -27,7 +27,7 @@ pub(super) fn emit_loan_kills<'tcx>(
2727
struct LoanKillsGenerator<'a, 'tcx> {
2828
tcx: TyCtxt<'tcx>,
2929
facts: &'a mut AllFacts,
30-
location_table: &'a LocationTable,
30+
location_table: &'a PoloniusLocationTable,
3131
borrow_set: &'a BorrowSet<'tcx>,
3232
body: &'a Body<'tcx>,
3333
}

Diff for: ‎compiler/rustc_borrowck/src/polonius/legacy/location.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use tracing::debug;
1313
/// granularity through outlives relations; however, the rich location
1414
/// table serves another purpose: it compresses locations from
1515
/// multiple words into a single u32.
16-
pub struct LocationTable {
16+
pub struct PoloniusLocationTable {
1717
num_points: usize,
1818
statements_before_block: IndexVec<BasicBlock, usize>,
1919
}
@@ -30,7 +30,7 @@ pub enum RichLocation {
3030
Mid(Location),
3131
}
3232

33-
impl LocationTable {
33+
impl PoloniusLocationTable {
3434
pub(crate) fn new(body: &Body<'_>) -> Self {
3535
let mut num_points = 0;
3636
let statements_before_block = body
@@ -43,8 +43,8 @@ impl LocationTable {
4343
})
4444
.collect();
4545

46-
debug!("LocationTable(statements_before_block={:#?})", statements_before_block);
47-
debug!("LocationTable: num_points={:#?}", num_points);
46+
debug!("PoloniusLocationTable(statements_before_block={:#?})", statements_before_block);
47+
debug!("PoloniusLocationTable: num_points={:#?}", num_points);
4848

4949
Self { num_points, statements_before_block }
5050
}

Diff for: ‎compiler/rustc_borrowck/src/polonius/legacy/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub use self::facts::*;
3838
pub(crate) fn emit_facts<'tcx>(
3939
all_facts: &mut Option<AllFacts>,
4040
tcx: TyCtxt<'tcx>,
41-
location_table: &LocationTable,
41+
location_table: &PoloniusLocationTable,
4242
body: &Body<'tcx>,
4343
borrow_set: &BorrowSet<'tcx>,
4444
move_data: &MoveData<'tcx>,
@@ -69,7 +69,7 @@ pub(crate) fn emit_facts<'tcx>(
6969
fn emit_move_facts(
7070
facts: &mut AllFacts,
7171
body: &Body<'_>,
72-
location_table: &LocationTable,
72+
location_table: &PoloniusLocationTable,
7373
move_data: &MoveData<'_>,
7474
) {
7575
facts.path_is_var.extend(move_data.rev_lookup.iter_locals_enumerated().map(|(l, r)| (r, l)));
@@ -202,7 +202,7 @@ pub(crate) fn emit_drop_facts<'tcx>(
202202
/// closure.
203203
fn emit_outlives_facts<'tcx>(
204204
facts: &mut AllFacts,
205-
location_table: &LocationTable,
205+
location_table: &PoloniusLocationTable,
206206
constraints: &MirTypeckRegionConstraints<'tcx>,
207207
) {
208208
facts.subset_base.extend(constraints.outlives_constraints.outlives().iter().flat_map(

Diff for: ‎compiler/rustc_borrowck/src/type_check/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ use crate::constraints::{OutlivesConstraint, OutlivesConstraintSet};
4949
use crate::diagnostics::UniverseInfo;
5050
use crate::member_constraints::MemberConstraintSet;
5151
use crate::polonius::PoloniusContext;
52-
use crate::polonius::legacy::{AllFacts, LocationTable};
52+
use crate::polonius::legacy::{AllFacts, PoloniusLocationTable};
5353
use crate::region_infer::TypeTest;
5454
use crate::region_infer::values::{LivenessValues, PlaceholderIndex, PlaceholderIndices};
5555
use crate::renumber::RegionCtxt;
@@ -98,7 +98,7 @@ mod relate_tys;
9898
/// - `body` -- MIR body to type-check
9999
/// - `promoted` -- map of promoted constants within `body`
100100
/// - `universal_regions` -- the universal regions from `body`s function signature
101-
/// - `location_table` -- MIR location map of `body`
101+
/// - `location_table` -- for datalog polonius, the map between `Location`s and `RichLocation`s
102102
/// - `borrow_set` -- information about borrows occurring in `body`
103103
/// - `all_facts` -- when using Polonius, this is the generated set of Polonius facts
104104
/// - `flow_inits` -- results of a maybe-init dataflow analysis
@@ -109,7 +109,7 @@ pub(crate) fn type_check<'a, 'tcx>(
109109
body: &Body<'tcx>,
110110
promoted: &IndexSlice<Promoted, Body<'tcx>>,
111111
universal_regions: UniversalRegions<'tcx>,
112-
location_table: &LocationTable,
112+
location_table: &PoloniusLocationTable,
113113
borrow_set: &BorrowSet<'tcx>,
114114
all_facts: &mut Option<AllFacts>,
115115
flow_inits: ResultsCursor<'a, 'tcx, MaybeInitializedPlaces<'a, 'tcx>>,
@@ -560,7 +560,7 @@ struct TypeChecker<'a, 'tcx> {
560560
implicit_region_bound: ty::Region<'tcx>,
561561
reported_errors: FxIndexSet<(Ty<'tcx>, Span)>,
562562
universal_regions: &'a UniversalRegions<'tcx>,
563-
location_table: &'a LocationTable,
563+
location_table: &'a PoloniusLocationTable,
564564
all_facts: &'a mut Option<AllFacts>,
565565
borrow_set: &'a BorrowSet<'tcx>,
566566
constraints: &'a mut MirTypeckRegionConstraints<'tcx>,

0 commit comments

Comments
 (0)