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

Don't shrink array in ary_make_shared

Browse Source 
This change adds back the assertions removed in #11092 and removes the
call to `ary_shrink_capa` from `ary_make_shared` when the array is
frozen.
This commit is contained in:
eileencodes 2024-07-08 14:10:11 -04:00 committed by Aaron Patterson
parent c1ff8d519f
commit 6f6aff56b1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
array.c
View File

@ -149,6 +149,7 @@ should_be_T_ARRAY(VALUE ary)
#define ARY_SET_CAPA(ary, n) do { \ #define ARY_SET_CAPA(ary, n) do { \
RUBY_ASSERT(!ARY_EMBED_P(ary)); \ RUBY_ASSERT(!ARY_EMBED_P(ary)); \
RUBY_ASSERT(!ARY_SHARED_P(ary)); \ RUBY_ASSERT(!ARY_SHARED_P(ary)); \
RUBY_ASSERT(!OBJ_FROZEN(ary)); \
RARRAY(ary)->as.heap.aux.capa = (n); \ RARRAY(ary)->as.heap.aux.capa = (n); \
} while (0) } while (0)
@ -369,6 +370,7 @@ ary_heap_free(VALUE ary)
static size_t static size_t
ary_heap_realloc(VALUE ary, size_t new_capa) ary_heap_realloc(VALUE ary, size_t new_capa)
{ {
RUBY_ASSERT(!OBJ_FROZEN(ary));
SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, ARY_HEAP_CAPA(ary)); SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, ARY_HEAP_CAPA(ary));
ary_verify(ary); ary_verify(ary);
@ -926,9 +928,6 @@ ary_make_shared(VALUE ary)
return ary; return ary;
} }
else if (OBJ_FROZEN(ary)) { else if (OBJ_FROZEN(ary)) {
if (!ARY_EMBED_P(ary)) {
ary_shrink_capa(ary);
}
return ary; return ary;
} }
else { else {