Thanks to visit codestin.com
Credit goes to github.com

Skip to content

MIR-borrowck: augmented assignment causes duplicate errors #47607

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 7 commits into from
Feb 7, 2018
Merged

MIR-borrowck: augmented assignment causes duplicate errors #47607

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd6b005
Added test for #45697
davidtwco Jan 15, 2018
f1c1db6
Updated other affected tests.
davidtwco Jan 19, 2018
3daa4d2
Introduced a new set to stop duplicate errors from MIR passes on one …
davidtwco Jan 19, 2018
f92d679
Encompassed error deduplication of some existing sets in the ctxt.
davidtwco Jan 20, 2018
970fb1a
Added logging for error suppression.
davidtwco Jan 27, 2018
5cd4b4f
Swapped order of left/right visits to ensure consistency in read/writ…
davidtwco Feb 5, 2018
bb6e54d
Added and updated tests to enable/disable overflow checks.
davidtwco Feb 6, 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
Prev Previous commit
Next Next commit
Introduced a new set to stop duplicate errors from MIR passes on one … 
…place/span.
  • Loading branch information
@davidtwco
davidtwco committed Jan 27, 2018
commit 3daa4d255f1ecc9d0a28deb9ca3d6da79f1df438
16 changes: 16 additions & 0 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 @@ -230,6 +230,7 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
},
storage_dead_or_drop_error_reported_l: FxHashSet(),
storage_dead_or_drop_error_reported_s: FxHashSet(),
read_or_write_error_reported: FxHashSet(),
reservation_error_reported: FxHashSet(),
nonlexical_regioncx: opt_regioncx.clone(),
};
Expand Down Expand Up @@ -300,6 +301,9 @@ pub struct MirBorrowckCtxt<'cx, 'gcx: 'tcx, 'tcx: 'cx> {
storage_dead_or_drop_error_reported_l: FxHashSet<Local>,
/// Same as the above, but for statics (thread-locals)
storage_dead_or_drop_error_reported_s: FxHashSet<DefId>,
/// This field keeps track of when borrow errors are reported in read or write passes
/// so that an error is not reported in both.
read_or_write_error_reported: FxHashSet<(Place<'tcx>, Span)>,
/// This field keeps track of when borrow conflict errors are reported
/// for reservations, so that we don't report seemingly duplicate
/// errors for corresponding activations
Expand Down Expand Up @@ -739,11 +743,23 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
}
}

if self.read_or_write_error_reported.contains(&(place_span.0.clone(), place_span.1)) {
debug!("suppressing access_place write for {:?}", place_span);
return AccessErrorsReported {
mutability_error: false,
conflict_error: true,
};
}

let mutability_error =
self.check_access_permissions(place_span, rw, is_local_mutation_allowed);
let conflict_error =
self.check_access_for_conflict(context, place_span, sd, rw, flow_state);

if conflict_error {
self.read_or_write_error_reported.insert((place_span.0.clone(), place_span.1));
}

AccessErrorsReported {
mutability_error,
conflict_error,
Expand Down