| author | |
| committer | |
| log | 70dcdcb73d42e69df50f3a4b721a7ecb30153758 |
| tree | f6f449380d412dadf1a6f1bbd311c6cd9b53167b |
| parent | e4c053f04737d852766b6577e7b1fbfb4a8a3096 |
Merge conflict between
02a1f838e67edc4107df19ba194a925958f1c669
and
885c73f3438d108c3cbb1afd75e3fee2f4bc88c01 files changed, 0 insertions(+), 2 deletions(-)
lib/std/heap/general_purpose_allocator.zig-2| ... | ... | @@ -633,8 +633,6 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type { |
| 633 | 633 | self.total_requested_bytes -= entry.value_ptr.requested_size; |
| 634 | 634 | } |
| 635 | 635 | |
| 636 | if (!config.never_unmap) self.backing_allocator.rawFree(old_mem, old_align, ret_addr); | |
| 637 | ||
| 638 | 636 | if (config.verbose_log) { |
| 639 | 637 | log.info("large free {d} bytes at {*}", .{ old_mem.len, old_mem.ptr }); |
| 640 | 638 | } |