Skip to content

optimize places_conflict to avoid complex vectors etc #51849

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 5 commits into from
Jun 30, 2018
Merged

optimize places_conflict to avoid complex vectors etc #51849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
edf14d1
extract `places_conflict` into its own module
nikomatsakis Jun 27, 2018
e10414e
avoid use of vectors etc
nikomatsakis Jun 27, 2018
4972736
don't use Iterator and zip but just invoke `next` manually
nikomatsakis Jun 27, 2018
5c06b23
run rustfmt
nikomatsakis Jun 27, 2018
cb34989
add explanatory comment
nikomatsakis Jun 28, 2018
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
5 changes: 3 additions & 2 deletions src/librustc_mir/borrow_check/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ mod flows;
mod location;
mod path_utils;
crate mod place_ext;
mod places_conflict;
mod prefixes;
mod used_muts;

Expand Down Expand Up @@ -1307,7 +1308,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
// that is merged.
let sd = if might_be_alive { Deep } else { Shallow(None) };

if places_conflict(self.tcx, self.mir, place, root_place, sd) {
if places_conflict::places_conflict(self.tcx, self.mir, place, root_place, sd) {
debug!("check_for_invalidation_at_exit({:?}): INVALID", place);
// FIXME: should be talking about the region lifetime instead
// of just a span here.
Expand Down Expand Up @@ -1398,7 +1399,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
for i in flow_state.ever_inits.iter_incoming() {
let init = self.move_data.inits[i];
let init_place = &self.move_data.move_paths[init.path].place;
if places_conflict(self.tcx, self.mir, &init_place, place, Deep) {
if places_conflict::places_conflict(self.tcx, self.mir, &init_place, place, Deep) {
self.report_illegal_reassignment(context, (place, span), init.span, err_place);
break;
}
Expand Down
Loading