Skip to content

Do not ICE in privacy when type inference fails. #126584

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

Merged
merged 1 commit into from
Jun 17, 2024
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
8 changes: 6 additions & 2 deletions compiler/rustc_privacy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -973,8 +973,12 @@ impl<'tcx> NamePrivacyVisitor<'tcx> {

impl<'tcx> Visitor<'tcx> for NamePrivacyVisitor<'tcx> {
fn visit_nested_body(&mut self, body_id: hir::BodyId) {
let old_maybe_typeck_results =
self.maybe_typeck_results.replace(self.tcx.typeck_body(body_id));
let new_typeck_results = self.tcx.typeck_body(body_id);
// Do not try reporting privacy violations if we failed to infer types.
if new_typeck_results.tainted_by_errors.is_some() {
return;
}
let old_maybe_typeck_results = self.maybe_typeck_results.replace(new_typeck_results);
self.visit_body(self.tcx.hir().body(body_id));
self.maybe_typeck_results = old_maybe_typeck_results;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//@ known-bug: #122736
fn main_ref() {
let array = [(); {
let mut x = &0;
let mut n = 0;
while n < 5 {
//~^ ERROR constant evaluation is taking a long time
x = &0;
}
0
Expand Down
27 changes: 27 additions & 0 deletions tests/ui/privacy/no-ice-on-inference-failure.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
error: constant evaluation is taking a long time
--> $DIR/no-ice-on-inference-failure.rs:5:9
|
LL | / while n < 5 {
LL | |
LL | | x = &0;
LL | | }
| |_________^
|
= note: this lint makes sure the compiler doesn't get stuck due to infinite loops in const eval.
If your compilation actually takes a long time, you can safely allow the lint.
help: the constant being evaluated
--> $DIR/no-ice-on-inference-failure.rs:2:22
|
LL | let array = [(); {
| ______________________^
LL | | let mut x = &0;
LL | | let mut n = 0;
LL | | while n < 5 {
... |
LL | | 0
LL | | }];
| |_____^
= note: `#[deny(long_running_const_eval)]` on by default

error: aborting due to 1 previous error

Loading