1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/prism] Always calloc the locals resize

Browse Source 
https://github.com/ruby/prism/commit/8bbd3fef6f
This commit is contained in:
Kevin Newton 2024-04-05 14:15:12 -04:00 committed by git
parent 3b59addaf1
commit 37ba6927d1
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
prism/prism.c
View File

@ -824,21 +824,17 @@ pm_locals_hash(pm_constant_id_t name) {
*/ */
static void static void
pm_locals_resize(pm_locals_t *locals) { pm_locals_resize(pm_locals_t *locals) {
pm_local_t *next_locals;
uint32_t next_capacity = locals->capacity == 0 ? 4 : (locals->capacity * 2); uint32_t next_capacity = locals->capacity == 0 ? 4 : (locals->capacity * 2);
assert(next_capacity > locals->capacity); assert(next_capacity > locals->capacity);
if (next_capacity < PM_LOCALS_HASH_THRESHOLD) { pm_local_t *next_locals = xcalloc(next_capacity, sizeof(pm_local_t));
next_locals = xmalloc(next_capacity * sizeof(pm_local_t)); if (next_locals == NULL) abort();
if (next_locals == NULL) abort();
if (next_capacity < PM_LOCALS_HASH_THRESHOLD) {
if (locals->size > 0) { if (locals->size > 0) {
memcpy(next_locals, locals->locals, locals->size * sizeof(pm_local_t)); memcpy(next_locals, locals->locals, locals->size * sizeof(pm_local_t));
} }
} else { } else {
next_locals = xcalloc(next_capacity, sizeof(pm_local_t));
if (next_locals == NULL) abort();
// If we just switched from a list to a hash, then we need to fill in // If we just switched from a list to a hash, then we need to fill in
// the hash values of all of the locals. // the hash values of all of the locals.
bool hash_needed = locals->locals[0].hash == 0; bool hash_needed = locals->locals[0].hash == 0;