mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #120616 - fmease:fix-ice-const-eval-fail-undef-field-access, r=compiler-errors

Browse Source 
Fix ICE on field access on a tainted type after const-eval failure

Fixes #120615.

r? oli-obk or compiler
This commit is contained in:
Matthias Krüger 2024-02-03 21:29:45 +01:00 committed by GitHub
commit 326839bf7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_passes/src/dead.rs
View File

@ -464,7 +464,11 @@ impl<'tcx> Visitor<'tcx> for MarkSymbolVisitor<'tcx> {
self.lookup_and_handle_method(expr.hir_id); self.lookup_and_handle_method(expr.hir_id);
} }
hir::ExprKind::Field(ref lhs, ..) => { hir::ExprKind::Field(ref lhs, ..) => {
if self.typeck_results().opt_field_index(expr.hir_id).is_some() {
self.handle_field_access(lhs, expr.hir_id); self.handle_field_access(lhs, expr.hir_id);
} else {
self.tcx.dcx().span_delayed_bug(expr.span, "couldn't resolve index for field");
}
} }
hir::ExprKind::Struct(qpath, fields, _) => { hir::ExprKind::Struct(qpath, fields, _) => {
let res = self.typeck_results().qpath_res(qpath, expr.hir_id); let res = self.typeck_results().qpath_res(qpath, expr.hir_id);

5
tests/ui/consts/const-eval/field-access-after-const-eval-fail-in-ty.rs Normal file
View File

@ -0,0 +1,5 @@
// Regression test for issue #120615.
fn main() {
[(); loop {}].field; //~ ERROR constant evaluation is taking a long time
}

17
tests/ui/consts/const-eval/field-access-after-const-eval-fail-in-ty.stderr Normal file
View File

@ -0,0 +1,17 @@
error: constant evaluation is taking a long time
--> $DIR/field-access-after-const-eval-fail-in-ty.rs:4:10
|
LL | [(); loop {}].field;
| ^^^^^^^
|
= 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/field-access-after-const-eval-fail-in-ty.rs:4:10
|
LL | [(); loop {}].field;
| ^^^^^^^
= note: `#[deny(long_running_const_eval)]` on by default
error: aborting due to 1 previous error