Skip to content

Commit 487337b

Browse files
committed
Auto merge of #128707 - matthiaskrgr:rollup-63klywk, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #122049 (Promote riscv64gc-unknown-linux-musl to tier 2) - #128580 (Use `ParamEnv::reveal_all` in CFI) - #128688 (custom MIR: add support for tail calls) - #128694 (Normalize when equating `dyn` tails in MIR borrowck) - #128697 (interpret: move nullary-op evaluation into operator.rs) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 264590c + 316807c commit 487337b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/intrinsics/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
3333
let this = self.eval_context_mut();
3434

3535
// See if the core engine can handle this intrinsic.
36-
if this.emulate_intrinsic(instance, args, dest, ret)? {
36+
if this.eval_intrinsic(instance, args, dest, ret)? {
3737
return Ok(None);
3838
}
3939
let intrinsic_name = this.tcx.item_name(instance.def_id());

0 commit comments

Comments
 (0)