gitback/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sahnvour 2019-04-16 19:13:04 +02:00 committed by Andrew Kelley
parent 4e2f6ebf39
commit 71bb8cd537
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
std/heap.zig
View File

@ -118,7 +118,14 @@ pub const DirectAllocator = struct {
}
return old_mem[0..new_size];
},
Os.windows => return realloc(allocator, old_mem, old_align, new_size, new_align) catch {
Os.windows => {
if (new_size == 0) {
const self = @fieldParentPtr(DirectAllocator, "allocator", allocator);
_ = os.windows.HeapFree(self.heap_handle.?, 0, old_mem.ptr);
return old_mem[0..new_size];
}
return realloc(allocator, old_mem, old_align, new_size, new_align) catch {
const old_adjusted_addr = @ptrToInt(old_mem.ptr);
const old_record_addr = old_adjusted_addr + old_mem.len;
const root_addr = @intToPtr(*align(1) usize, old_record_addr).*;
@ -126,6 +133,7 @@ pub const DirectAllocator = struct {
const new_record_addr = old_record_addr - new_size + old_mem.len;
@intToPtr(*align(1) usize, new_record_addr).* = root_addr;
return old_mem[0..new_size];
};
},
else => @compileError("Unsupported OS"),
}
@ -143,6 +151,7 @@ pub const DirectAllocator = struct {
return result;
},
Os.windows => {
assert(new_size > 0);
if (old_mem.len == 0) return alloc(allocator, new_size, new_align);
const self = @fieldParentPtr(DirectAllocator, "allocator", allocator);