Rollup merge of #135250 - lqd:simple-cleanups, r=matthewjasper

A couple simple borrowck cleanups
This PR has a couple simple renamings:
- it's been a long time since the mapping from `Location`s to `PointIndex`es was extracted from `RegionElements` into the `DenseLocationMap`, but only the types were renamed at the time. borrowck still refers to this map as `elements`. That's confusing, especially since sometimes we also use the mapping via `LivenessValues`, and makes more sense as `location_map` instead.
- to clarify `LocationTable` is not as general as it sounds, and is only for datalog polonius. In this branch I didn't rename the handful of `location_table` fields and params to `polonius_table`, but can do that to differentiate it even more from `location_map`. I did try it locally and it looks worthwhile, so if you'd prefer I can also push it here. (Or we could even switch these datalog types and fields to even more explicit names)
- to clarify the incomprehensible `AllFacts`, it is renamed to `PoloniusFacts`. These can be referred to as `facts` within the legacy polonius module, but as `polonius_facts` outside of it to make it clear that they're not about NLLs (nor are they about in-tree polonius but that'll be magically fixed when they're removed in the future)
r? `@matthewjasper`

Author: matthiaskrgr

compiler/rustc_borrowck/src/consumers.rs

@@ -11,8 +11,8 @@ pub use super::dataflow::{BorrowIndex, Borrows, calculate_borrows_out_of_scope_a
 pubusesuper::place_ext::PlaceExt;
 pubusesuper::places_conflict::{PlaceConflictBias, places_conflict};
 pubusesuper::polonius::legacy::{
-AllFactsasPoloniusInput,LocationTable,PoloniusOutput,PoloniusRegionVid,RichLocation,
-RustcFacts,
+PoloniusFactsasPoloniusInput,PoloniusLocationTable,PoloniusOutput,PoloniusRegionVid,
+RichLocation,RustcFacts,
 };
 pubusesuper::region_infer::RegionInferenceContext;
 
@@ -33,7 +33,7 @@ pub enum ConsumerOptions {
 /// without significant slowdowns.
 ///
 /// Implies [`RegionInferenceContext`](ConsumerOptions::RegionInferenceContext),
-/// and additionally retrieve the [`LocationTable`] and [`PoloniusInput`] that
+/// and additionally retrieve the [`PoloniusLocationTable`] and [`PoloniusInput`] that
 /// would be given to Polonius. Critically, this does not run Polonius, which
 /// one may want to avoid due to performance issues on large bodies.
 PoloniusInputFacts,
@@ -71,7 +71,7 @@ pub struct BodyWithBorrowckFacts<'tcx> {
 /// The table that maps Polonius points to locations in the table.
 /// Populated when using [`ConsumerOptions::PoloniusInputFacts`]
 /// or [`ConsumerOptions::PoloniusOutputFacts`].
-publocation_table:Option<LocationTable>,
+publocation_table:Option<PoloniusLocationTable>,
 /// Polonius input facts.
 /// Populated when using [`ConsumerOptions::PoloniusInputFacts`]
 /// or [`ConsumerOptions::PoloniusOutputFacts`].

compiler/rustc_borrowck/src/lib.rs

@@ -57,7 +57,7 @@ use crate::diagnostics::{
 usecrate::path_utils::*;
 usecrate::place_ext::PlaceExt;
 usecrate::places_conflict::{PlaceConflictBias, places_conflict};
-usecrate::polonius::legacy::{LocationTable,PoloniusOutput};
+usecrate::polonius::legacy::{PoloniusLocationTable,PoloniusOutput};
 usecrate::prefixes::PrefixSet;
 usecrate::region_infer::RegionInferenceContext;
 usecrate::renumber::RegionCtxt;
@@ -176,7 +176,7 @@ fn do_mir_borrowck<'tcx>(
  infcx.register_predefined_opaques_for_next_solver(def);
 }
 
-let location_table = LocationTable::new(body);
+let location_table = PoloniusLocationTable::new(body);
 
 let move_data = MoveData::gather_moves(body, tcx, |_| true);
 let promoted_move_data = promoted
@@ -247,7 +247,8 @@ fn do_mir_borrowck<'tcx>(
 infcx:&infcx,
 body: promoted_body,
 move_data:&move_data,
-location_table:&location_table,// no need to create a real one for the promoted, it is not used
+// no need to create a real location table for the promoted, it is not used
+location_table:&location_table,
  movable_coroutine,
 fn_self_span_reported:Default::default(),
  locals_are_invalidated_at_exit,
@@ -513,7 +514,7 @@ struct MirBorrowckCtxt<'a, 'infcx, 'tcx> {
 
 /// Map from MIR `Location` to `LocationIndex`; created
 /// when MIR borrowck begins.
-location_table:&'aLocationTable,
+location_table:&'aPoloniusLocationTable,
 
 movable_coroutine:bool,
 /// This keeps track of whether local variables are free-ed when the function

compiler/rustc_borrowck/src/nll.rs

@@ -28,7 +28,9 @@ use crate::borrow_set::BorrowSet;
 usecrate::consumers::ConsumerOptions;
 usecrate::diagnostics::{BorrowckDiagnosticsBuffer,RegionErrors};
 usecrate::polonius::LocalizedOutlivesConstraintSet;
-usecrate::polonius::legacy::{AllFacts,AllFactsExt,LocationTable,PoloniusOutput};
+usecrate::polonius::legacy::{
+PoloniusFacts,PoloniusFactsExt,PoloniusLocationTable,PoloniusOutput,
+};
 usecrate::region_infer::RegionInferenceContext;
 usecrate::type_check::{self,MirTypeckResults};
 usecrate::universal_regions::UniversalRegions;
@@ -39,7 +41,7 @@ use crate::{BorrowckInferCtxt, polonius, renumber};
 pub(crate)structNllOutput<'tcx>{
 pubregioncx:RegionInferenceContext<'tcx>,
 pubopaque_type_values:FxIndexMap<LocalDefId,OpaqueHiddenType<'tcx>>,
-pubpolonius_input:Option<Box<AllFacts>>,
+pubpolonius_input:Option<Box<PoloniusFacts>>,
 pubpolonius_output:Option<Box<PoloniusOutput>>,
 pubopt_closure_req:Option<ClosureRegionRequirements<'tcx>>,
 pubnll_errors:RegionErrors<'tcx>,
@@ -80,7 +82,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 universal_regions:UniversalRegions<'tcx>,
 body:&Body<'tcx>,
 promoted:&IndexSlice<Promoted,Body<'tcx>>,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 flow_inits:ResultsCursor<'a,'tcx,MaybeInitializedPlaces<'a,'tcx>>,
 move_data:&MoveData<'tcx>,
 borrow_set:&BorrowSet<'tcx>,
@@ -91,10 +93,10 @@ pub(crate) fn compute_regions<'a, 'tcx>(
  || is_polonius_legacy_enabled;
 let polonius_output = consumer_options.map(|c| c.polonius_output()).unwrap_or_default()
  || is_polonius_legacy_enabled;
-letmutall_facts =
-(polonius_input || AllFacts::enabled(infcx.tcx)).then_some(AllFacts::default());
+letmutpolonius_facts =
+(polonius_input || PoloniusFacts::enabled(infcx.tcx)).then_some(PoloniusFacts::default());
 
-letelements = Rc::new(DenseLocationMap::new(body));
+letlocation_map = Rc::new(DenseLocationMap::new(body));
 
 // Run the MIR type-checker.
 letMirTypeckResults{
@@ -109,10 +111,10 @@ pub(crate) fn compute_regions<'a, 'tcx>(
  universal_regions,
  location_table,
  borrow_set,
-&mutall_facts,
+&mutpolonius_facts,
  flow_inits,
  move_data,
-Rc::clone(&elements),
+Rc::clone(&location_map),
 );
 
 // Create the region inference context, taking ownership of the
@@ -122,7 +124,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 
 // If requested, emit legacy polonius facts.
  polonius::legacy::emit_facts(
-&mutall_facts,
+&mutpolonius_facts,
  infcx.tcx,
  location_table,
  body,
@@ -137,7 +139,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
  var_infos,
  constraints,
  universal_region_relations,
-elements,
+location_map,
 );
 
 // If requested for `-Zpolonius=next`, convert NLL constraints to localized outlives
@@ -147,13 +149,13 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 });
 
 // If requested: dump NLL facts, and run legacy polonius analysis.
-let polonius_output = all_facts.as_ref().and_then(|all_facts| {
+let polonius_output = polonius_facts.as_ref().and_then(|polonius_facts| {
 if infcx.tcx.sess.opts.unstable_opts.nll_facts{
 let def_id = body.source.def_id();
 let def_path = infcx.tcx.def_path(def_id);
 let dir_path = PathBuf::from(&infcx.tcx.sess.opts.unstable_opts.nll_facts_dir)
 .join(def_path.to_filename_friendly_no_crate());
-all_facts.write_to_dir(dir_path, location_table).unwrap();
+polonius_facts.write_to_dir(dir_path, location_table).unwrap();
 }
 
 if polonius_output {
@@ -162,7 +164,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 let algorithm = Algorithm::from_str(&algorithm).unwrap();
 debug!("compute_regions: using polonius algorithm {:?}", algorithm);
 let _prof_timer = infcx.tcx.prof.generic_activity("polonius_analysis");
-Some(Box::new(Output::compute(all_facts, algorithm,false)))
+Some(Box::new(Output::compute(polonius_facts, algorithm,false)))
 }else{
 None
 }
@@ -182,7 +184,7 @@ pub(crate) fn compute_regions<'a, 'tcx>(
 NllOutput{
  regioncx,
 opaque_type_values: remapped_opaque_tys,
-polonius_input:all_facts.map(Box::new),
+polonius_input:polonius_facts.map(Box::new),
  polonius_output,
 opt_closure_req: closure_region_requirements,
  nll_errors,

compiler/rustc_borrowck/src/polonius/legacy/accesses.rs

@@ -4,16 +4,16 @@ use rustc_middle::ty::TyCtxt;
 use rustc_mir_dataflow::move_paths::{LookupResult,MoveData};
 use tracing::debug;
 
-usesuper::{AllFacts,LocationIndex,LocationTable};
+usesuper::{LocationIndex,PoloniusFacts,PoloniusLocationTable};
 usecrate::def_use::{self,DefUse};
 usecrate::universal_regions::UniversalRegions;
 
 /// Emit polonius facts for variable defs, uses, drops, and path accesses.
 pub(crate)fnemit_access_facts<'tcx>(
 tcx:TyCtxt<'tcx>,
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 body:&Body<'tcx>,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 move_data:&MoveData<'tcx>,
 universal_regions:&UniversalRegions<'tcx>,
 ){
@@ -31,9 +31,9 @@ pub(crate) fn emit_access_facts<'tcx>(
 
 /// MIR visitor extracting point-wise facts about accesses.
 structAccessFactsExtractor<'a,'tcx>{
-facts:&'amutAllFacts,
+facts:&'amutPoloniusFacts,
 move_data:&'aMoveData<'tcx>,
-location_table:&'aLocationTable,
+location_table:&'aPoloniusLocationTable,
 }
 
 impl<'tcx>AccessFactsExtractor<'_,'tcx>{

compiler/rustc_borrowck/src/polonius/legacy/facts.rs

@@ -4,13 +4,13 @@ use std::fs::{self, File};
 use std::io::Write;
 use std::path::Path;
 
-use polonius_engine::{AllFactsasPoloniusFacts,Atom,Output};
+use polonius_engine::{AllFacts,Atom,Output};
 use rustc_macros::extension;
 use rustc_middle::mir::Local;
 use rustc_middle::ty::{RegionVid,TyCtxt};
 use rustc_mir_dataflow::move_paths::MovePathIndex;
 
-usesuper::{LocationIndex,LocationTable};
+usesuper::{LocationIndex,PoloniusLocationTable};
 usecrate::BorrowIndex;
 
 #[derive(Copy,Clone,Debug)]
@@ -49,11 +49,11 @@ impl polonius_engine::FactTypes for RustcFacts {
 typePath = MovePathIndex;
 }
 
-pubtypeAllFacts = PoloniusFacts<RustcFacts>;
+pubtypePoloniusFacts = AllFacts<RustcFacts>;
 
-#[extension(pub(crate)traitAllFactsExt)]
-implAllFacts{
-/// Returns `true` if there is a need to gather `AllFacts` given the
+#[extension(pub(crate)traitPoloniusFactsExt)]
+implPoloniusFacts{
+/// Returns `true` if there is a need to gather `PoloniusFacts` given the
 /// current `-Z` flags.
 fnenabled(tcx:TyCtxt<'_>) -> bool{
  tcx.sess.opts.unstable_opts.nll_facts
@@ -63,7 +63,7 @@ impl AllFacts {
 fnwrite_to_dir(
 &self,
 dir:implAsRef<Path>,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 ) -> Result<(),Box<dynError>>{
 let dir:&Path = dir.as_ref();
  fs::create_dir_all(dir)?;
@@ -119,7 +119,7 @@ impl Atom for LocationIndex {
 }
 
 structFactWriter<'w>{
-location_table:&'wLocationTable,
+location_table:&'wPoloniusLocationTable,
 dir:&'wPath,
 }
 
@@ -141,15 +141,15 @@ trait FactRow {
 fnwrite(
 &self,
 out:&mutdynWrite,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 ) -> Result<(),Box<dynError>>;
 }
 
 implFactRowforPoloniusRegionVid{
 fnwrite(
 &self,
 out:&mutdynWrite,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 ) -> Result<(),Box<dynError>>{
 write_row(out, location_table,&[self])
 }
@@ -163,7 +163,7 @@ where
 fnwrite(
 &self,
 out:&mutdynWrite,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 ) -> Result<(),Box<dynError>>{
 write_row(out, location_table,&[&self.0,&self.1])
 }
@@ -178,7 +178,7 @@ where
 fnwrite(
 &self,
 out:&mutdynWrite,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 ) -> Result<(),Box<dynError>>{
 write_row(out, location_table,&[&self.0,&self.1,&self.2])
 }
@@ -194,15 +194,15 @@ where
 fnwrite(
 &self,
 out:&mutdynWrite,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 ) -> Result<(),Box<dynError>>{
 write_row(out, location_table,&[&self.0,&self.1,&self.2,&self.3])
 }
 }
 
 fnwrite_row(
 out:&mutdynWrite,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 columns:&[&dynFactCell],
 ) -> Result<(),Box<dynError>>{
 for(index, c)in columns.iter().enumerate(){
@@ -213,41 +213,41 @@ fn write_row(
 }
 
 traitFactCell{
-fnto_string(&self,location_table:&LocationTable) -> String;
+fnto_string(&self,location_table:&PoloniusLocationTable) -> String;
 }
 
 implFactCellforBorrowIndex{
-fnto_string(&self,_location_table:&LocationTable) -> String{
+fnto_string(&self,_location_table:&PoloniusLocationTable) -> String{
 format!("{self:?}")
 }
 }
 
 implFactCellforLocal{
-fnto_string(&self,_location_table:&LocationTable) -> String{
+fnto_string(&self,_location_table:&PoloniusLocationTable) -> String{
 format!("{self:?}")
 }
 }
 
 implFactCellforMovePathIndex{
-fnto_string(&self,_location_table:&LocationTable) -> String{
+fnto_string(&self,_location_table:&PoloniusLocationTable) -> String{
 format!("{self:?}")
 }
 }
 
 implFactCellforPoloniusRegionVid{
-fnto_string(&self,_location_table:&LocationTable) -> String{
+fnto_string(&self,_location_table:&PoloniusLocationTable) -> String{
 format!("{self:?}")
 }
 }
 
 implFactCellforRegionVid{
-fnto_string(&self,_location_table:&LocationTable) -> String{
+fnto_string(&self,_location_table:&PoloniusLocationTable) -> String{
 format!("{self:?}")
 }
 }
 
 implFactCellforLocationIndex{
-fnto_string(&self,location_table:&LocationTable) -> String{
+fnto_string(&self,location_table:&PoloniusLocationTable) -> String{
 format!("{:?}", location_table.to_rich_location(*self))
 }
 }

compiler/rustc_borrowck/src/polonius/legacy/loan_invalidations.rs

@@ -11,7 +11,7 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyCtxt;
 use tracing::debug;
 
-usesuper::{AllFacts,LocationTable};
+usesuper::{PoloniusFacts,PoloniusLocationTable};
 usecrate::borrow_set::BorrowSet;
 usecrate::path_utils::*;
 usecrate::{
@@ -22,9 +22,9 @@ use crate::{
 /// Emit `loan_invalidated_at` facts.
 pub(super)fnemit_loan_invalidations<'tcx>(
 tcx:TyCtxt<'tcx>,
-facts:&mutAllFacts,
+facts:&mutPoloniusFacts,
 body:&Body<'tcx>,
-location_table:&LocationTable,
+location_table:&PoloniusLocationTable,
 borrow_set:&BorrowSet<'tcx>,
 ){
 let dominators = body.basic_blocks.dominators();
@@ -35,9 +35,9 @@ pub(super) fn emit_loan_invalidations<'tcx>(
 
 structLoanInvalidationsGenerator<'a,'tcx>{
 tcx:TyCtxt<'tcx>,
-facts:&'amutAllFacts,
+facts:&'amutPoloniusFacts,
 body:&'aBody<'tcx>,
-location_table:&'aLocationTable,
+location_table:&'aPoloniusLocationTable,
 dominators:&'aDominators<BasicBlock>,
 borrow_set:&'aBorrowSet<'tcx>,
 }