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

Refactor duplicate code in rb_array_replace

Browse Source 
In both cases in the if statement, we free heap allocated arrays and
unshare shared arrays.
This commit is contained in:
Peter Zhu 2022-03-11 11:45:14 -05:00
parent 2e4516be26
commit 42e5ec9414
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
array.c
View File

@ -4391,25 +4391,20 @@ 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)) {
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) {
if (ARY_OWNS_HEAP_P(copy)) {
ary_heap_free(copy);
}
else if (ARY_SHARED_P(copy)) {
rb_ary_unshare(copy);
}
FL_SET_EMBED(copy); FL_SET_EMBED(copy);
ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig)); ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig));
ARY_SET_LEN(copy, RARRAY_LEN(orig)); ARY_SET_LEN(copy, RARRAY_LEN(orig));
} }
else { else {
VALUE shared_root = ary_make_shared(orig); VALUE shared_root = ary_make_shared(orig);
if (ARY_OWNS_HEAP_P(copy)) {
ary_heap_free(copy);
}
else {
rb_ary_unshare_safe(copy);
}
FL_UNSET_EMBED(copy); FL_UNSET_EMBED(copy);
ARY_SET_PTR(copy, ARY_HEAP_PTR(orig)); ARY_SET_PTR(copy, ARY_HEAP_PTR(orig));
ARY_SET_LEN(copy, ARY_HEAP_LEN(orig)); ARY_SET_LEN(copy, ARY_HEAP_LEN(orig));