kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Extracted wmap_live_p

Browse source
This commit is contained in:
Nobuyoshi Nakada 2019-08-06 23:00:29 +09:00
parent 3e6b9926b7
commit a04e3585d3
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gc.c
View file

@ -10206,6 +10206,14 @@ wmap_allocate(VALUE klass)
return obj; return obj;
} }
static int
wmap_live_p(rb_objspace_t *objspace, VALUE obj)
{
if (!is_id_value(objspace, obj)) return FALSE;
if (!is_live_object(objspace, obj)) return FALSE;
return TRUE;
}
static int static int
wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing) wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
{ {
@ -10312,7 +10320,7 @@ wmap_each_i(st_data_t key, st_data_t val, st_data_t arg)
{ {
rb_objspace_t *objspace = (rb_objspace_t *)arg; rb_objspace_t *objspace = (rb_objspace_t *)arg;
VALUE obj = (VALUE)val; VALUE obj = (VALUE)val;
if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) { if (wmap_live_p(objspace, obj)) {
rb_yield_values(2, (VALUE)key, obj); rb_yield_values(2, (VALUE)key, obj);
} }
return ST_CONTINUE; return ST_CONTINUE;
@ -10335,7 +10343,7 @@ wmap_each_key_i(st_data_t key, st_data_t val, st_data_t arg)
{ {
rb_objspace_t *objspace = (rb_objspace_t *)arg; rb_objspace_t *objspace = (rb_objspace_t *)arg;
VALUE obj = (VALUE)val; VALUE obj = (VALUE)val;
if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) { if (wmap_live_p(objspace, obj)) {
rb_yield((VALUE)key); rb_yield((VALUE)key);
} }
return ST_CONTINUE; return ST_CONTINUE;
@ -10358,7 +10366,7 @@ wmap_each_value_i(st_data_t key, st_data_t val, st_data_t arg)
{ {
rb_objspace_t *objspace = (rb_objspace_t *)arg; rb_objspace_t *objspace = (rb_objspace_t *)arg;
VALUE obj = (VALUE)val; VALUE obj = (VALUE)val;
if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) { if (wmap_live_p(objspace, obj)) {
rb_yield(obj); rb_yield(obj);
} }
return ST_CONTINUE; return ST_CONTINUE;
@ -10383,7 +10391,7 @@ wmap_keys_i(st_data_t key, st_data_t val, st_data_t arg)
rb_objspace_t *objspace = argp->objspace; rb_objspace_t *objspace = argp->objspace;
VALUE ary = argp->value; VALUE ary = argp->value;
VALUE obj = (VALUE)val; VALUE obj = (VALUE)val;
if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) { if (wmap_live_p(objspace, obj)) {
rb_ary_push(ary, (VALUE)key); rb_ary_push(ary, (VALUE)key);
} }
return ST_CONTINUE; return ST_CONTINUE;
@ -10410,7 +10418,7 @@ wmap_values_i(st_data_t key, st_data_t val, st_data_t arg)
rb_objspace_t *objspace = argp->objspace; rb_objspace_t *objspace = argp->objspace;
VALUE ary = argp->value; VALUE ary = argp->value;
VALUE obj = (VALUE)val; VALUE obj = (VALUE)val;
if (is_id_value(objspace, obj) && is_live_object(objspace, obj)) { if (wmap_live_p(objspace, obj)) {
rb_ary_push(ary, obj); rb_ary_push(ary, obj);
} }
return ST_CONTINUE; return ST_CONTINUE;
@ -10479,8 +10487,7 @@ wmap_aref(VALUE self, VALUE wmap)
TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w); TypedData_Get_Struct(self, struct weakmap, &weakmap_type, w);
if (!st_lookup(w->wmap2obj, (st_data_t)wmap, &data)) return Qnil; if (!st_lookup(w->wmap2obj, (st_data_t)wmap, &data)) return Qnil;
obj = (VALUE)data; obj = (VALUE)data;
if (!is_id_value(objspace, obj)) return Qnil; if (!wmap_live_p(objspace, obj)) return Qnil;
if (!is_live_object(objspace, obj)) return Qnil;
return obj; return obj;
} }