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

fix optimization for hash aset/aref with fstring

Browse source 
Patch by Eric Wong [ruby-core:78797].
I don't like the idea of making insns.def any bigger to support
a corner case, and "test_hash_aref_fstring_identity" shows
how contrived this is.

[ruby-core:78783] [Bug #12855]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2017-01-07 11:31:53 +00:00
parent 4dbbcc48de
commit ac9f8145f1
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hash.c
View file

@ -2758,8 +2758,6 @@ rb_hash_compact_bang(VALUE hash)
return Qnil;
}
static VALUE rb_hash_compare_by_id_p(VALUE hash);
/*
* call-seq:
* hsh.compare_by_identity -> hsh
@ -2795,7 +2793,7 @@ rb_hash_compare_by_id(VALUE hash)
*
*/
static VALUE
VALUE
rb_hash_compare_by_id_p(VALUE hash)
{
if (!RHASH(hash)->ntbl)

8
insns.def
View file

@ -1881,7 +1881,9 @@ opt_aset_with
(VALUE recv, VALUE val)
(VALUE val)
{
if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG)) {
if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash &&
BASIC_OP_UNREDEFINED_P(BOP_ASET, HASH_REDEFINED_OP_FLAG) &&
rb_hash_compare_by_id_p(recv) == Qfalse) {
rb_hash_aset(recv, key, val);
}
else {
@ -1903,7 +1905,9 @@ opt_aref_with
(VALUE recv)
(VALUE val)
{
if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) {
if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash &&
BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG) &&
rb_hash_compare_by_id_p(recv) == Qfalse) {
val = rb_hash_aref(recv, key);
}
else {

1
internal.h
View file

@ -1098,6 +1098,7 @@ long rb_objid_hash(st_index_t index);
long rb_dbl_long_hash(double d);
st_table *rb_init_identtable(void);
st_table *rb_init_identtable_with_size(st_index_t size);
VALUE rb_hash_compare_by_id_p(VALUE hash);
#define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h)
VALUE rb_hash_keys(VALUE hash);

13
test/ruby/test_hash.rb
View file

@ -237,6 +237,19 @@ class TestHash < Test::Unit::TestCase
assert_same a.keys[0], b.keys[0]
end
def test_hash_aset_fstring_identity
h = {}.compare_by_identity
h['abc'] = 1
h['abc'] = 2
assert_equal 2, h.size, '[ruby-core:78783] [Bug #12855]'
end
def test_hash_aref_fstring_identity
h = {}.compare_by_identity
h['abc'] = 1
assert_nil h['abc'], '[ruby-core:78783] [Bug #12855]'
end
def test_NEWHASH_fstring_key
a = {"ABC" => :t}
b = {"ABC" => :t}