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