summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-25 16:31:54 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-25 16:31:54 +0000
commitbdedc17f0cd55e1c277330458ace9e6e8ff00383 (patch)
tree27e73b2a0417124d3e3c2d858a0fe09db962747f
parent0d528f4a2942c46c2d62fe13514f1acd8b8cbbc9 (diff)
merge revision(s) 57278,57279: [Backport #12855]
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_2@58099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--hash.c4
-rw-r--r--insns.def11
-rw-r--r--internal.h1
-rw-r--r--test/ruby/test_hash.rb13
-rw-r--r--version.h2
5 files changed, 23 insertions, 8 deletions
diff --git a/hash.c b/hash.c
index d145f17005..0df042fc66 100644
--- a/hash.c
+++ b/hash.c
@@ -2504,8 +2504,6 @@ rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
return ary;
}
-static VALUE rb_hash_compare_by_id_p(VALUE hash);
-
/*
* call-seq:
* hsh.compare_by_identity -> hsh
@@ -2541,7 +2539,7 @@ rb_hash_compare_by_id(VALUE hash)
*
*/
-static VALUE
+VALUE
rb_hash_compare_by_id_p(VALUE hash)
{
if (!RHASH(hash)->ntbl)
diff --git a/insns.def b/insns.def
index 834f3dd691..fb7e0f11f4 100644
--- a/insns.def
+++ b/insns.def
@@ -1950,7 +1950,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 {
@@ -1972,7 +1974,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 {
@@ -2121,8 +2125,7 @@ opt_succ
BASIC_OP_UNREDEFINED_P(BOP_SUCC, STRING_REDEFINED_OP_FLAG)) {
val = rb_str_succ(recv);
}
- else
- {
+ else {
goto INSN_LABEL(normal_dispatch);
}
}
diff --git a/internal.h b/internal.h
index 7a76ba2548..72892cb6cf 100644
--- a/internal.h
+++ b/internal.h
@@ -715,6 +715,7 @@ long rb_objid_hash(st_index_t index);
VALUE rb_ident_hash_new(void);
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);
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 1bb32f663e..9ac3614dd8 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -228,6 +228,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}
diff --git a/version.h b/version.h
index 259c6ddd95..9456b9f39b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26"
-#define RUBY_PATCHLEVEL 431
+#define RUBY_PATCHLEVEL 432
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3