interpret: always enable write_immediate sanity checks

RalfJung · RalfJung · commit 7f48538ef54c · 2024-09-29T13:14:38.000+02:00
diff --git a/compiler/rustc_const_eval/src/interpret/operand.rs b/compiler/rustc_const_eval/src/interpret/operand.rs
@@ -118,6 +118,7 @@ impl<Prov: Provenance> Immediate<Prov> {
             (Immediate::Scalar(scalar), Abi::Scalar(s)) => {
                 assert_eq!(scalar.size(), s.size(cx));
                 if !matches!(s.primitive(), abi::Pointer(..)) {
+                    // This is not a pointer, it should not carry provenance.
                     assert!(matches!(scalar, Scalar::Int(..)));
                 }
             }
diff --git a/compiler/rustc_const_eval/src/interpret/place.rs b/compiler/rustc_const_eval/src/interpret/place.rs
@@ -651,10 +651,10 @@ where
                 if !self.validation_in_progress() {
                     M::after_local_write(self, local, /*storage_live*/ false)?;
                 }
-                // Double-check that the value we are storing and the local fit to each other.
-                if cfg!(debug_assertions) {
-                    src.assert_matches_abi(local_layout.abi, self);
-                }
+                // Double-check that the value we are storing and the local fit to each other. We do
+                // this even with debug assertions as interpreter behavior can get really strange
+                // when this is violated.
+                src.assert_matches_abi(local_layout.abi, self);
             }
             Left(mplace) => {
                 self.write_immediate_to_mplace_no_validate(src, mplace.layout, mplace.mplace)?;
@@ -672,6 +672,7 @@ where
         layout: TyAndLayout<'tcx>,
         dest: MemPlace<M::Provenance>,
     ) -> InterpResult<'tcx> {
+        // Ensure the value matches the type of the place it is written to.
         if cfg!(debug_assertions) {
             value.assert_matches_abi(layout.abi, self);
         }

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ impl<Prov: Provenance> Immediate<Prov> {`
`118`	`118`	`(Immediate::Scalar(scalar), Abi::Scalar(s)) => {`
`119`	`119`	`assert_eq!(scalar.size(), s.size(cx));`
`120`	`120`	`if !matches!(s.primitive(), abi::Pointer(..)) {`
	`121`	`+ // This is not a pointer, it should not carry provenance.`
`121`	`122`	`assert!(matches!(scalar, Scalar::Int(..)));`
`122`	`123`	`}`
`123`	`124`	`}`