interpret: move nullary-op evaluation into operator.rs

2024-08-05 20:35:52 +02:00
parent 83e9b93c90
commit 46896d6f66
6 changed files with 49 additions and 41 deletions
--- a/compiler/rustc_const_eval/src/const_eval/machine.rs
+++ b/compiler/rustc_const_eval/src/const_eval/machine.rs
@@ -458,7 +458,7 @@ impl<'tcx> interpret::Machine<'tcx> for CompileTimeMachine<'tcx> {
        _unwind: mir::UnwindAction,
    ) -> InterpResult<'tcx, Option<ty::Instance<'tcx>>> {
        // Shared intrinsics.
-        if ecx.emulate_intrinsic(instance, args, dest, target)? {
+        if ecx.eval_intrinsic(instance, args, dest, target)? {
            return Ok(None);
        }
        let intrinsic_name = ecx.tcx.item_name(instance.def_id());