Merge from rustc

oli-obk · oli-obk · commit d1e9ad8bba57 · 2023-03-23T07:33:19.000Z
diff --git a/src/machine.rs b/src/machine.rs
@@ -812,7 +812,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {
+    fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>, _layout: TyAndLayout<'tcx>) -> bool {
         ecx.machine.validate
     }
 

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {`
`812`	`812`	`}`
`813`	`813`
`814`	`814`	`#[inline(always)]`
`815`		`- fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {`
	`815`	`+ fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>, _layout: TyAndLayout<'tcx>) -> bool {`
`816`	`816`	`ecx.machine.validate`
`817`	`817`	`}`
`818`	`818`