mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-20 21:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into separate-int-word-sizes

Browse Source
This commit is contained in:
gingerBill
2023-05-18 11:26:57 +01:00
parent e82146bf17 49cd9648b0
commit 49d1f6aca0
39 changed files with 464 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/runtime/core_builtin.odin
View File

@@ -401,7 +401,7 @@ append_nothing :: proc(array: ^$T/[dynamic]$E, loc := #caller_location) -> int {
return 0
}
prev_len := len(array)
resize(array, len(array)+1)
resize(array, len(array)+1, loc)
return len(array)-prev_len
}

2
core/runtime/os_specific_windows.odin
View File

@@ -112,7 +112,7 @@ _windows_default_alloc_or_resize :: proc "contextless" (size, alignment: int, ol
ptr := uintptr(aligned_mem)
aligned_ptr := (ptr - 1 + uintptr(a)) & -uintptr(a)
diff := int(aligned_ptr - ptr)
if (size + diff) > space {
if (size + diff) > space || allocated_mem == nil {
return nil, .Out_Of_Memory
}