diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-19 01:35:04 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-19 01:35:04 +0000 |
commit | 0493b1ce3a43a33bb6298762d67e1a1b4f0a9657 (patch) | |
tree | 7553612b4b68a8f6bf2572936af3d40ecf6d11ac /st.c | |
parent | 13155d4df577a2b5fc57c6b16cd92515c2d56870 (diff) |
revert r59359, r59356, r59355, r59354
These caused numerous CI failures I haven't been able to
reproduce [ruby-core:82102]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'st.c')
-rw-r--r-- | st.c | 20 |
1 files changed, 2 insertions, 18 deletions
@@ -2092,23 +2092,6 @@ st_rehash(st_table *tab) } #ifdef RUBY - -static VALUE -str_key(VALUE key) -{ - VALUE k; - - if (RB_OBJ_FROZEN(key)) { - return key; - } - if ((k = rb_fstring_existing(key)) != Qnil) { - return k; - } - else { - return rb_str_new_frozen(key); - } -} - /* Mimics ruby's { foo => bar } syntax. This function is placed here because it touches table internals and write barriers at once. */ void @@ -2131,7 +2114,8 @@ rb_hash_bulk_insert(long argc, const VALUE *argv, VALUE hash) for (i = 0; i < argc; /* */) { VALUE key = argv[i++]; VALUE val = argv[i++]; - st_data_t k = (rb_obj_class(key) == rb_cString) ? str_key(key) : key; + st_data_t k = (rb_obj_class(key) == rb_cString) ? + rb_str_new_frozen(key) : key; st_table_entry e; e.hash = do_hash(k, tab); e.key = k; |