authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2019-04-25 13:41:19-07:00
committergravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2019-04-25 13:41:19-07:00
logafc33f00ee65bfefa173200e4ec8c0f329172d3f
treec4e4347a664001f0d727bfb19b5b247b4443a524
parent57f545eed8e940520855c127245414db9ea29310

heap: fixup style of realloc memory copies

1 files changed, 4 insertions(+), 20 deletions(-)

std/heap.zig+4-20
...@@ -139,11 +139,7 @@ pub const DirectAllocator = struct {...@@ -139,11 +139,7 @@ pub const DirectAllocator = struct {
139 return shrink(allocator, old_mem, old_align, new_size, new_align);139 return shrink(allocator, old_mem, old_align, new_size, new_align);
140 }140 }
141 const result = try alloc(allocator, new_size, new_align);141 const result = try alloc(allocator, new_size, new_align);
142 if (result.len >= old_mem.len) {142 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
143 mem.copy(u8, result, old_mem);
144 } else {
145 @memcpy(result.ptr, old_mem.ptr, new_size);
146 }
147 _ = os.posix.munmap(@ptrToInt(old_mem.ptr), old_mem.len);143 _ = os.posix.munmap(@ptrToInt(old_mem.ptr), old_mem.len);
148 return result;144 return result;
149 },145 },
...@@ -274,11 +270,7 @@ pub const ArenaAllocator = struct {...@@ -274,11 +270,7 @@ pub const ArenaAllocator = struct {
274 return error.OutOfMemory;270 return error.OutOfMemory;
275 } else {271 } else {
276 const result = try alloc(allocator, new_size, new_align);272 const result = try alloc(allocator, new_size, new_align);
277 if (result.len >= old_mem.len) {273 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
278 mem.copy(u8, result, old_mem);
279 } else {
280 @memcpy(result.ptr, old_mem.ptr, new_size);
281 }
282 return result;274 return result;
283 }275 }
284 }276 }
...@@ -336,11 +328,7 @@ pub const FixedBufferAllocator = struct {...@@ -336,11 +328,7 @@ pub const FixedBufferAllocator = struct {
336 return error.OutOfMemory;328 return error.OutOfMemory;
337 } else {329 } else {
338 const result = try alloc(allocator, new_size, new_align);330 const result = try alloc(allocator, new_size, new_align);
339 if (result.len >= old_mem.len) {331 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
340 mem.copy(u8, result, old_mem);
341 } else {
342 @memcpy(result.ptr, old_mem.ptr, new_size);
343 }
344 return result;332 return result;
345 }333 }
346 }334 }
...@@ -483,11 +471,7 @@ pub const ThreadSafeFixedBufferAllocator = blk: {...@@ -483,11 +471,7 @@ pub const ThreadSafeFixedBufferAllocator = blk: {
483 return error.OutOfMemory;471 return error.OutOfMemory;
484 } else {472 } else {
485 const result = try alloc(allocator, new_size, new_align);473 const result = try alloc(allocator, new_size, new_align);
486 if (result.len >= old_mem.len) {474 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
487 mem.copy(u8, result, old_mem);
488 } else {
489 @memcpy(result.ptr, old_mem.ptr, new_size);
490 }
491 return result;475 return result;
492 }476 }
493 }477 }