From d1d05c8b4127295717b6f893e22cf657b4dbf1db Mon Sep 17 00:00:00 2001
From: Tim Diekmann <tim.diekmann@3dvision.de>
Date: Sun, 7 Apr 2019 21:09:21 +0200
Subject: [PATCH] Fix tagging order

---
 src/fn_call.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/fn_call.rs b/src/fn_call.rs
index 911f76929d5a..062cc900e176 100644
--- a/src/fn_call.rs
+++ b/src/fn_call.rs
@@ -100,19 +100,21 @@ pub trait EvalContextExt<'a, 'mir, 'tcx: 'a + 'mir>: crate::MiriEvalContextExt<'
                     size
                 } else {
                     return err!(MachineError(format!(
-                        "calloc: overflow of items * size: {} * {}",
-                        items, size,
+                        "calloc: overflow of items * count: {} * {}",
+                        items, count,
                     )));
                 };
                 if size == 0 {
                     this.write_null(dest)?;
                 } else {
                     let align = this.tcx.data_layout.pointer_align.abi;
-                    let ptr = this.memory_mut().allocate(Size::from_bytes(size), align, MiriMemoryKind::C.into());
+                    let ptr = this.memory_mut()
+                        .allocate(Size::from_bytes(size), align, MiriMemoryKind::C.into())
+                        .with_default_tag();
                     this.memory_mut()
                         .get_mut(ptr.alloc_id)?
                         .write_repeat(tcx, ptr, 0, Size::from_bytes(size))?;
-                    this.write_scalar(Scalar::Ptr(ptr.with_default_tag()), dest)?;
+                    this.write_scalar(Scalar::Ptr(ptr), dest)?;
                 }
             }
             "posix_memalign" => {