Merge pull request #4100 from rust-lang/rustup-2024-12-20

RalfJung · web-flow · commit 252e4bb5f7e6 · 2024-12-20T06:29:50.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-52890e82153cd8716d97a96f47fb6ac99dec65be
+214587c89d527dd0ccbe1f2150c737d3bdee67b0
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -611,7 +611,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                             // `UnsafeCell` action.
                             (self.unsafe_cell_action)(v)
                         }
-                        Variants::Single { .. } => {
+                        Variants::Single { .. } | Variants::Empty => {
                             // Proceed further, try to find where exactly that `UnsafeCell`
                             // is hiding.
                             self.walk_value(v)

Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`611`	`611`	// `UnsafeCell` action.
`612`	`612`	`(self.unsafe_cell_action)(v)`
`613`	`613`	`}`
`614`		`- Variants::Single { .. } => {`
	`614`	`+ Variants::Single { .. } \| Variants::Empty => {`
`615`	`615`	// Proceed further, try to find where exactly that `UnsafeCell`
`616`	`616`	`// is hiding.`
`617`	`617`	`self.walk_value(v)`