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

mark Hash keys correctly.

Browse source 
* hash.c (rb_hash_new_from_object): same as r58434.
  Newly created frozen objects are not referred from any roots/objects.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-04-23 00:20:27 +00:00
parent 3aa95e7846
commit a6f0ec21e9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hash.c
View file

@ -643,11 +643,9 @@ hash_insert_raw(VALUE hash, st_table *tbl, VALUE key, VALUE val)
(st_data_t)key; (st_data_t)key;
st_insert(tbl, k, v); st_insert(tbl, k, v);
if (hash != Qfalse) {
RB_OBJ_WRITTEN(hash, Qundef, key); RB_OBJ_WRITTEN(hash, Qundef, key);
RB_OBJ_WRITTEN(hash, Qundef, val); RB_OBJ_WRITTEN(hash, Qundef, val);
} }
}
static VALUE static VALUE
rb_hash_new_from_values_with_klass(long argc, const VALUE *argv, VALUE klass) rb_hash_new_from_values_with_klass(long argc, const VALUE *argv, VALUE klass)
@ -695,6 +693,8 @@ rb_hash_new_from_object(VALUE klass, VALUE obj)
long i; long i;
long len = RARRAY_LEN(tmp); long len = RARRAY_LEN(tmp);
st_table *tbl = len ? st_init_table_with_size(&objhash, len) : NULL; st_table *tbl = len ? st_init_table_with_size(&objhash, len) : NULL;
VALUE hv = hash_alloc_from_st(klass, tbl);;
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
VALUE e = RARRAY_AREF(tmp, i); VALUE e = RARRAY_AREF(tmp, i);
VALUE v = rb_check_array_type(e); VALUE v = rb_check_array_type(e);
@ -721,10 +721,10 @@ rb_hash_new_from_object(VALUE klass, VALUE obj)
val = RARRAY_AREF(v, 1); val = RARRAY_AREF(v, 1);
case 1: case 1:
key = RARRAY_AREF(v, 0); key = RARRAY_AREF(v, 0);
hash_insert_raw(Qfalse, tbl, key, val); hash_insert_raw(hv, tbl, key, val);
} }
} }
return hash_alloc_from_st(klass, tbl); return hv;
} }
rb_raise(rb_eArgError, "odd number of arguments for Hash"); rb_raise(rb_eArgError, "odd number of arguments for Hash");