authorgravatar for sahnvour@pm.meSahnvour <sahnvour@pm.me> 2019-04-16 19:13:04+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-16 13:18:21-04:00
log71bb8cd5370f52b5fef3b107069d4879b434e108
treec93ea051d7a9482cf603dbad10de92692f9fef7d
parent4e2f6ebf398f5d84aa630c4a9ab40c0de3980a72

DirectAllocator: on windows, use HeapFree instead of HeapReAlloc to free memory.

1 files changed, 17 insertions(+), 8 deletions(-)

std/heap.zig+17-8
......@@ -118,14 +118,22 @@ pub const DirectAllocator = struct {
118118 }
119119 return old_mem[0..new_size];
120120 },
121 Os.windows => return realloc(allocator, old_mem, old_align, new_size, new_align) catch {
122 const old_adjusted_addr = @ptrToInt(old_mem.ptr);
123 const old_record_addr = old_adjusted_addr + old_mem.len;
124 const root_addr = @intToPtr(*align(1) usize, old_record_addr).*;
125 const old_ptr = @intToPtr(*c_void, root_addr);
126 const new_record_addr = old_record_addr - new_size + old_mem.len;
127 @intToPtr(*align(1) usize, new_record_addr).* = root_addr;
128 return old_mem[0..new_size];
121 Os.windows => {
122 if (new_size == 0) {
123 const self = @fieldParentPtr(DirectAllocator, "allocator", allocator);
124 _ = os.windows.HeapFree(self.heap_handle.?, 0, old_mem.ptr);
125 return old_mem[0..new_size];
126 }
127
128 return realloc(allocator, old_mem, old_align, new_size, new_align) catch {
129 const old_adjusted_addr = @ptrToInt(old_mem.ptr);
130 const old_record_addr = old_adjusted_addr + old_mem.len;
131 const root_addr = @intToPtr(*align(1) usize, old_record_addr).*;
132 const old_ptr = @intToPtr(*c_void, root_addr);
133 const new_record_addr = old_record_addr - new_size + old_mem.len;
134 @intToPtr(*align(1) usize, new_record_addr).* = root_addr;
135 return old_mem[0..new_size];
136 };
129137 },
130138 else => @compileError("Unsupported OS"),
131139 }
......@@ -143,6 +151,7 @@ pub const DirectAllocator = struct {
143151 return result;
144152 },
145153 Os.windows => {
154 assert(new_size > 0);
146155 if (old_mem.len == 0) return alloc(allocator, new_size, new_align);
147156
148157 const self = @fieldParentPtr(DirectAllocator, "allocator", allocator);