Skip to content
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.

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

[beta] backport fix for #94502 #94552

Merged
merged 1 commit into from
Mar 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,6 @@ impl OutlivesSuggestionBuilder {
diag.sort_span = mir_span.shrink_to_hi();

// Buffer the diagnostic
mbcx.buffer_error(diag);
mbcx.buffer_non_error_diag(diag);
}
}
11 changes: 10 additions & 1 deletion compiler/rustc_borrowck/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ fn do_mir_borrowck<'a, 'tcx>(
diag.message = initial_diag.styled_message().clone();
diag.span = initial_diag.span.clone();

mbcx.buffer_error(diag);
mbcx.buffer_non_error_diag(diag);
},
);
initial_diag.cancel();
Expand Down Expand Up @@ -2317,6 +2317,11 @@ mod error {
t.buffer(&mut self.buffered);
}

// For diagnostics we must not set `tainted_by_errors`.
pub fn buffer_non_error_diag(&mut self, t: DiagnosticBuilder<'_>) {
t.buffer(&mut self.buffered);
}

pub fn set_tainted_by_errors(&mut self) {
self.tainted_by_errors = Some(ErrorReported {});
}
Expand All @@ -2327,6 +2332,10 @@ mod error {
self.errors.buffer_error(t);
}

pub fn buffer_non_error_diag(&mut self, t: DiagnosticBuilder<'_>) {
self.errors.buffer_non_error_diag(t);
}

pub fn buffer_move_error(
&mut self,
move_out_indices: Vec<MoveOutIndex>,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_borrowck/src/nll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ pub(super) fn dump_annotation<'a, 'tcx>(
err.note(&format!("Inferred opaque type values:\n{:#?}", opaque_type_values));
}

errors.buffer_error(err);
errors.buffer_non_error_diag(err);
}

fn for_each_region_constraint(
Expand Down
28 changes: 28 additions & 0 deletions src/test/ui/nll/lint-no-err.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// check-pass

// mir borrowck previously incorrectly set `tainted_by_errors`
// when buffering lints, which resulted in ICE later on,
// see #94502.
Comment on lines +1 to +5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we would want to land this on nightly as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already planned to do that 😆 #94553


// Errors with `nll` which is already tested in enough other tests,
// so we ignore it here.
//
// ignore-compare-mode-nll

struct Repro;
impl Repro {
fn get(&self) -> &i32 {
&3
}

fn insert(&mut self, _: i32) {}
}

fn main() {
let x = &0;
let mut conflict = Repro;
let prev = conflict.get();
conflict.insert(*prev + *x);
//~^ WARN cannot borrow `conflict` as mutable because it is also borrowed as immutable
//~| WARN this borrowing pattern was not meant to be accepted
}
17 changes: 17 additions & 0 deletions src/test/ui/nll/lint-no-err.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
warning: cannot borrow `conflict` as mutable because it is also borrowed as immutable
--> $DIR/lint-no-err.rs:25:5
|
LL | let prev = conflict.get();
| -------------- immutable borrow occurs here
LL | conflict.insert(*prev + *x);
| ^^^^^^^^^^^^^^^^-----^^^^^^
| | |
| | immutable borrow later used here
| mutable borrow occurs here
|
= note: `#[warn(mutable_borrow_reservation_conflict)]` on by default
= warning: this borrowing pattern was not meant to be accepted, and may become a hard error in the future
= note: for more information, see issue #59159 <https://github.com/rust-lang/rust/issues/59159>

warning: 1 warning emitted