Skip to content

Refactor NLL constraint generation and most of polonius fact generation #118216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 1, 2023
Merged

Refactor NLL constraint generation and most of polonius fact generation #118216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eca2789
remove useless local variables
lqd Nov 23, 2023
3de68e0
extract polonius move fact generation
lqd Nov 23, 2023
459a616
extract polonius universal regions fact generation
lqd Nov 23, 2023
16a5da7
extract polonius loan invalidations fact generation
lqd Nov 23, 2023
4901083
another trivial cleanup
lqd Nov 23, 2023
9f14698
extract polonius "constraint generation"
lqd Nov 23, 2023
f53412a
remove NLL liveness from polonius constraint generation
lqd Nov 23, 2023
bfd88b0
simplify polonius constraint generation
lqd Nov 23, 2023
951901b
rename polonius constraint generation to what it actually does: emit …
lqd Nov 23, 2023
c976bc1
small polish of loan invalidations fact generation
lqd Nov 23, 2023
626289a
remove polonius fact generation from NLL constraint generation
lqd Nov 23, 2023
96042bc
merge NLL "constraint generation" into liveness
lqd Nov 23, 2023
f969af2
move remaining legacy polonius fact generation out of NLL module
lqd Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 0 additions & 248 deletions compiler/rustc_borrowck/src/constraint_generation.rs
View file
Open in desktop

This file was deleted.

22 changes: 9 additions & 13 deletions compiler/rustc_borrowck/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,18 @@ use self::path_utils::*;

pub mod borrow_set;
mod borrowck_errors;
mod constraint_generation;
mod constraints;
mod dataflow;
mod def_use;
mod diagnostics;
mod facts;
mod invalidation;
mod location;
mod member_constraints;
mod nll;
mod path_utils;
mod place_ext;
mod places_conflict;
mod polonius;
mod prefixes;
mod region_infer;
mod renumber;
Expand Down Expand Up @@ -215,8 +214,7 @@ fn do_mir_borrowck<'tcx>(
nll::replace_regions_in_mir(&infcx, param_env, &mut body_owned, &mut promoted);
let body = &body_owned; // no further changes

let location_table_owned = LocationTable::new(body);
let location_table = &location_table_owned;
let location_table = LocationTable::new(body);

let move_data = MoveData::gather_moves(body, tcx, param_env, |_| true);
let promoted_move_data = promoted
Expand Down Expand Up @@ -248,7 +246,7 @@ fn do_mir_borrowck<'tcx>(
free_regions,
body,
&promoted,
location_table,
&location_table,
param_env,
&mut flow_inits,
&mdpe.move_data,
Expand Down Expand Up @@ -312,7 +310,7 @@ fn do_mir_borrowck<'tcx>(
param_env,
body: promoted_body,
move_data: &move_data,
location_table, // no need to create a real one for the promoted, it is not used
location_table: &location_table, // no need to create a real one for the promoted, it is not used
movable_coroutine,
fn_self_span_reported: Default::default(),
locals_are_invalidated_at_exit,
Expand Down Expand Up @@ -353,7 +351,7 @@ fn do_mir_borrowck<'tcx>(
param_env,
body,
move_data: &mdpe.move_data,
location_table,
location_table: &location_table,
movable_coroutine,
locals_are_invalidated_at_exit,
fn_self_span_reported: Default::default(),
Expand Down Expand Up @@ -455,7 +453,7 @@ fn do_mir_borrowck<'tcx>(
promoted,
borrow_set,
region_inference_context: regioncx,
location_table: polonius_input.as_ref().map(|_| location_table_owned),
location_table: polonius_input.as_ref().map(|_| location_table),
input_facts: polonius_input,
output_facts,
}))
Expand Down Expand Up @@ -1040,9 +1038,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
flow_state: &Flows<'cx, 'tcx>,
) -> bool {
let mut error_reported = false;
let tcx = self.infcx.tcx;
let body = self.body;
let borrow_set = self.borrow_set.clone();
let borrow_set = Rc::clone(&self.borrow_set);

// Use polonius output if it has been enabled.
let mut polonius_output;
Expand All @@ -1059,8 +1055,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {

each_borrow_involving_path(
self,
tcx,
body,
self.infcx.tcx,
self.body,
location,
(sd, place_span.0),
&borrow_set,
Expand Down
Loading