force_ptr expects a Scalar

oli-obk · oli-obk · commit ceaab1654846 · 2019-12-13T17:18:45.000+01:00
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
@@ -278,7 +278,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 if old_size == 0 || new_size == 0 {
                     throw_unsup!(HeapAllocZeroBytes);
                 }
-                let ptr = this.force_ptr(this.read_scalar(args[0])?)?;
+                let ptr = this.force_ptr(this.read_scalar(args[0])?.not_undef()?)?;
                 if !align.is_power_of_two() {
                     throw_unsup!(HeapAllocNonPowerOfTwoAlignment(align));
                 }

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`278`	`278`	`if old_size == 0 \|\| new_size == 0 {`
`279`	`279`	`throw_unsup!(HeapAllocZeroBytes);`
`280`	`280`	`}`
`281`		`- let ptr = this.force_ptr(this.read_scalar(args[0])?)?;`
	`281`	`+ let ptr = this.force_ptr(this.read_scalar(args[0])?.not_undef()?)?;`
`282`	`282`	`if !align.is_power_of_two() {`
`283`	`283`	`throw_unsup!(HeapAllocNonPowerOfTwoAlignment(align));`
`284`	`284`	`}`