bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #104982 - RalfJung:norun, r=oli-obk

Browse source 
interpret: get rid of run() function

Miri needs its own loop anyway, so there's not much of a point in trying to share this code.
This commit is contained in:
Matthias Krüger 2022-11-28 17:25:49 +01:00 • committed by GitHub
commit 3aace9a641
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_const_eval/src/const_eval/eval_queries.rs
View file

@ -66,7 +66,7 @@ fn eval_body_using_ecx<'mir, 'tcx>(
)?; )?;
// The main interpreter loop. // The main interpreter loop.
ecx.run()?; while ecx.step()? {}
// Intern the result // Intern the result
let intern_kind = if cid.promoted.is_some() { let intern_kind = if cid.promoted.is_some() {

5
compiler/rustc_const_eval/src/interpret/step.rs
View file

@ -32,11 +32,6 @@ fn binop_right_homogeneous(op: mir::BinOp) -> bool {
} }
impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
pub fn run(&mut self) -> InterpResult<'tcx> {
while self.step()? {}
Ok(())
}
/// Returns `true` as long as there are more things to do. /// Returns `true` as long as there are more things to do.
/// ///
/// This is used by [priroda](https://github.com/oli-obk/priroda) /// This is used by [priroda](https://github.com/oli-obk/priroda)