about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2024-05-06 09:45:11 +0200
committerRalf Jung <post@ralfj.de>2024-05-06 09:45:11 +0200
commit82e2144ed74648485dc27dbb67f594acd1b14916 (patch)
tree5987431d7dd77345e773bdba90171edea22a8183
parente43458cf0619bdaeba0e855af1bd4853444ddca4 (diff)
downloadrust-82e2144ed74648485dc27dbb67f594acd1b14916.tar.gz
rust-82e2144ed74648485dc27dbb67f594acd1b14916.zip
avoid code duplication between realloc and malloc
-rw-r--r--src/tools/miri/src/shims/alloc.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/tools/miri/src/shims/alloc.rs b/src/tools/miri/src/shims/alloc.rs
index 79531598c00..61e639f76ed 100644
--- a/src/tools/miri/src/shims/alloc.rs
+++ b/src/tools/miri/src/shims/alloc.rs
@@ -124,13 +124,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
         let new_align = this.min_align(new_size, kind);
         if this.ptr_is_null(old_ptr)? {
             // Here we must behave like `malloc`.
-            if new_size == 0 {
-                Ok(Pointer::null())
-            } else {
-                let new_ptr =
-                    this.allocate_ptr(Size::from_bytes(new_size), new_align, kind.into())?;
-                Ok(new_ptr.into())
-            }
+            self.malloc(new_size, /*zero_init*/ false, kind)
         } else {
             if new_size == 0 {
                 // C, in their infinite wisdom, made this UB.