archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 57278,57279: [Backport #12855]

Browse source 
fix optimization for hash aset/aref with fstring

	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]
	adjust indent [ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-03-27 16:02:50 +00:00
parent 7cbc39be69
commit 0d399220b0
5 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hash.c
View file

@ -2581,8 +2581,6 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
return ary; return ary;
} }
static VALUE rb_hash_compare_by_id_p(VALUE hash);
/* /*
* call-seq: * call-seq:
* hsh.compare_by_identity -> hsh * hsh.compare_by_identity -> hsh
@ -2618,7 +2616,7 @@ rb_hash_compare_by_id(VALUE hash)
* *
*/ */
static VALUE VALUE
rb_hash_compare_by_id_p(VALUE hash) rb_hash_compare_by_id_p(VALUE hash)
{ {
if (!RHASH(hash)->ntbl) if (!RHASH(hash)->ntbl)

11
insns.def
View file

@ -1904,7 +1904,9 @@ opt_aset_with
(VALUE recv, VALUE val) (VALUE recv, VALUE val)
(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); rb_hash_aset(recv, key, val);
} }
else { else {
@ -1926,7 +1928,9 @@ opt_aref_with
(VALUE recv) (VALUE recv)
(VALUE val) (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); val = rb_hash_aref(recv, key);
} }
else { else {
@ -2075,8 +2079,7 @@ opt_succ
BASIC_OP_UNREDEFINED_P(BOP_SUCC, STRING_REDEFINED_OP_FLAG)) { BASIC_OP_UNREDEFINED_P(BOP_SUCC, STRING_REDEFINED_OP_FLAG)) {
val = rb_str_succ(recv); val = rb_str_succ(recv);
} }
else else {
{
goto INSN_LABEL(normal_dispatch); goto INSN_LABEL(normal_dispatch);
} }
} }

1
internal.h
View file

@ -837,6 +837,7 @@ VALUE rb_hash_set_default_proc(VALUE hash, VALUE proc);
long rb_objid_hash(st_index_t index); long rb_objid_hash(st_index_t index);
st_table *rb_init_identtable(void); st_table *rb_init_identtable(void);
st_table *rb_init_identtable_with_size(st_index_t size); 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) #define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h)
VALUE rb_hash_keys(VALUE hash); VALUE rb_hash_keys(VALUE hash);

13
test/ruby/test_hash.rb
View file

@ -229,6 +229,19 @@ class TestHash < Test::Unit::TestCase
assert_same a.keys[0], b.keys[0] assert_same a.keys[0], b.keys[0]
end 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 def test_NEWHASH_fstring_key
a = {"ABC" => :t} a = {"ABC" => :t}
b = {"ABC" => :t} b = {"ABC" => :t}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3" #define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-03-28" #define RUBY_RELEASE_DATE "2017-03-28"
#define RUBY_PATCHLEVEL 275 #define RUBY_PATCHLEVEL 276
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3