kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

Assume that refcnt of shared root is non-negative 

The refcnt of a shared root array should always be non-negative.
This commit is contained in:
Peter Zhu 2022-03-14 09:44:50 -04:00
parent 45786667ec
commit 412991268f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
array.c
View File

@ -165,6 +165,7 @@ should_not_be_shared_and_embedded(VALUE ary)
#define ARY_SHARED_ROOT_OCCUPIED(ary) (ARY_SHARED_ROOT_REFCNT(ary) == 1) #define ARY_SHARED_ROOT_OCCUPIED(ary) (ARY_SHARED_ROOT_REFCNT(ary) == 1)
#define ARY_SET_SHARED_ROOT_REFCNT(ary, value) do { \ #define ARY_SET_SHARED_ROOT_REFCNT(ary, value) do { \
assert(ARY_SHARED_ROOT_P(ary)); \ assert(ARY_SHARED_ROOT_P(ary)); \
assert((value) >= 0); \
RARRAY(ary)->as.heap.aux.capa = (value); \ RARRAY(ary)->as.heap.aux.capa = (value); \
} while (0) } while (0)
#define FL_SET_SHARED_ROOT(ary) do { \ #define FL_SET_SHARED_ROOT(ary) do { \
@ -512,10 +513,8 @@ ary_double_capa(VALUE ary, long min)
static void static void
rb_ary_decrement_share(VALUE shared_root) rb_ary_decrement_share(VALUE shared_root)
{ {
long num = ARY_SHARED_ROOT_REFCNT(shared_root) - 1; long num = ARY_SHARED_ROOT_REFCNT(shared_root);
if (num > 0) { ARY_SET_SHARED_ROOT_REFCNT(shared_root, num - 1);
ARY_SET_SHARED_ROOT_REFCNT(shared_root, num);
}
} }
static void static void
@ -544,9 +543,8 @@ static VALUE
rb_ary_increment_share(VALUE shared_root) rb_ary_increment_share(VALUE shared_root)
{ {
long num = ARY_SHARED_ROOT_REFCNT(shared_root); long num = ARY_SHARED_ROOT_REFCNT(shared_root);
if (num >= 0) { assert(num >= 0);
ARY_SET_SHARED_ROOT_REFCNT(shared_root, num + 1); ARY_SET_SHARED_ROOT_REFCNT(shared_root, num + 1);
}
return shared_root; return shared_root;
} }