mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-03 03:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct fix to heap_allocator_proc in compiler

Browse Source
This commit is contained in:
gingerBill
2021-09-06 19:34:44 +01:00
parent b63d49aafa
commit 97a1147537
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common_memory.cpp
View File

@@ -351,20 +351,19 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
} break;
case gbAllocation_Free:
if (!old_memory) {
if (old_memory != nullptr) {
free(old_memory);
}
break;
case gbAllocation_Resize:
if (!old_memory) {
break;
}
if (size == 0) {
free(old_memory);
if (old_memory != nullptr) {
free(old_memory);
}
break;
}
if (!old_memory) {
if (old_memory == nullptr) {
ptr = aligned_alloc(alignment, (size + alignment - 1) & ~(alignment - 1));
gb_zero_size(ptr, size);
break;
@@ -386,20 +385,17 @@ GB_ALLOCATOR_PROC(heap_allocator_proc) {
break;
case gbAllocation_Free:
if (!old_memory) {
if (old_memory != nullptr) {
free(old_memory);
}
break;
case gbAllocation_Resize:
if (!old_memory) {
break;
}
if (size == 0) {
free(old_memory);
break;
}
if (!old_memory) {
if (old_memory == nullptr) {
posix_memalign(&ptr, alignment, size);
gb_zero_size(ptr, size);
break;