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

Add rb_ary_reset

Browse Source 
rb_ary_reset will free heap allocated arrays and unshare shared arrays.
This commit is contained in:
Peter Zhu 2022-03-11 13:16:29 -05:00
parent 09186f381f
commit 9a4bddd761
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
array.c
View File

@ -528,10 +528,13 @@ rb_ary_unshare(VALUE ary)
FL_UNSET_SHARED(ary); FL_UNSET_SHARED(ary);
} }
static inline void static void
rb_ary_unshare_safe(VALUE ary) rb_ary_reset(VALUE ary)
{ {
if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) { if (ARY_OWNS_HEAP_P(ary)) {
ary_heap_free(ary);
}
else if (ARY_SHARED_P(ary)) {
rb_ary_unshare(ary); rb_ary_unshare(ary);
} }
} }
@ -1075,10 +1078,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
rb_ary_modify(ary); rb_ary_modify(ary);
if (argc == 0) { if (argc == 0) {
if (ARY_OWNS_HEAP_P(ary) && ARY_HEAP_PTR(ary) != NULL) { rb_ary_reset(ary);
ary_heap_free(ary);
}
rb_ary_unshare_safe(ary);
FL_SET_EMBED(ary); FL_SET_EMBED(ary);
ARY_SET_EMBED_LEN(ary, 0); ARY_SET_EMBED_LEN(ary, 0);
if (rb_block_given_p()) { if (rb_block_given_p()) {
@ -4391,12 +4391,7 @@ rb_ary_replace(VALUE copy, VALUE orig)
orig = to_ary(orig); orig = to_ary(orig);
if (copy == orig) return copy; if (copy == orig) return copy;
if (ARY_OWNS_HEAP_P(copy)) { rb_ary_reset(copy);
ary_heap_free(copy);
}
else if (ARY_SHARED_P(copy)) {
rb_ary_unshare(copy);
}
if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) { if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
FL_SET_EMBED(copy); FL_SET_EMBED(copy);