Auto merge of #3791 - rust-lang:rustup-2024-08-06, r=RalfJung

bors · bors · commit a0b5e6bdcad0 · 2024-08-06T08:12:07.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-29e924841f06bb181d87494eba2783761bc1ddec
+c9687a95a602091777e28703aa5abf20f1ce1797
diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs
@@ -33,7 +33,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         let this = self.eval_context_mut();
 
         // See if the core engine can handle this intrinsic.
-        if this.emulate_intrinsic(instance, args, dest, ret)? {
+        if this.eval_intrinsic(instance, args, dest, ret)? {
             return Ok(None);
         }
         let intrinsic_name = this.tcx.item_name(instance.def_id());

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`33`	`33`	`let this = self.eval_context_mut();`
`34`	`34`
`35`	`35`	`// 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)? {`
`37`	`37`	`return Ok(None);`
`38`	`38`	`}`
`39`	`39`	`let intrinsic_name = this.tcx.item_name(instance.def_id());`