Skip to content

Commit 17369f3

Browse files
committed
Auto merge of rust-lang#106227 - bryangarza:ctfe-limit, r=oli-obk
Use stable metric for const eval limit instead of current terminator-based logic This patch adds a `MirPass` that inserts a new MIR instruction `ConstEvalCounter` to any loops and function calls in the CFG. This instruction is used during Const Eval to count against the `const_eval_limit`, and emit the `StepLimitReached` error, replacing the current logic which uses Terminators only. The new method of counting loops and function calls should be more stable across compiler versions (i.e., not cause crates that compiled successfully before, to no longer compile when changes to the MIR generation/optimization are made). Also see: rust-lang#103877
2 parents 79475f5 + 520814b commit 17369f3

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

clippy_utils/src/qualify_min_const_fn.rs

+1
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ fn check_statement<'tcx>(
240240
| StatementKind::Retag { .. }
241241
| StatementKind::AscribeUserType(..)
242242
| StatementKind::Coverage(..)
243+
| StatementKind::ConstEvalCounter
243244
| StatementKind::Nop => Ok(()),
244245
}
245246
}

0 commit comments

Comments
 (0)