diff --git a/compile.c b/compile.c index 099c280..4121b2a 100644 --- a/compile.c +++ b/compile.c @@ -4392,6 +4392,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } break; } + if (node->nd_mid == idAREF && + node->nd_recv != (NODE *)1 && + node->nd_args && + nd_type(node->nd_args) == NODE_ARRAY && + node->nd_args->nd_alen == 1 && + nd_type(node->nd_args->nd_head) == NODE_STR) + { + VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit); + node->nd_args->nd_head->nd_lit = str; + COMPILE(ret, "recv", node->nd_recv); + ADD_INSN2(ret, line, opt_aref_str, + new_callinfo(iseq, idAREF, 1, 0, 0), str); + if (poped) { + ADD_INSN(ret, line, pop); + } + break; + } case NODE_FCALL: case NODE_VCALL:{ /* VCALL: variable or call */ /* @@ -5362,6 +5379,25 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) VALUE flag = 0; VALUE argc; + if (node->nd_mid == idASET && + node->nd_recv != (NODE *)1 && + node->nd_args && + nd_type(node->nd_args) == NODE_ARRAY && + node->nd_args->nd_alen == 2 && + nd_type(node->nd_args->nd_head) == NODE_STR) + { + VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit); + node->nd_args->nd_head->nd_lit = str; + COMPILE(ret, "recv", node->nd_recv); + COMPILE(ret, "value", node->nd_args->nd_next->nd_head); + ADD_INSN2(ret, line, opt_aset_str, + new_callinfo(iseq, idASET, 2, 0, 0), str); + if (poped) { + ADD_INSN(ret, line, pop); + } + break; + } + INIT_ANCHOR(recv); INIT_ANCHOR(args); argc = setup_args(iseq, args, node->nd_args, &flag); diff --git a/hash.c b/hash.c index 376f33f..58f04a9 100644 --- a/hash.c +++ b/hash.c @@ -2436,7 +2436,7 @@ static VALUE rb_hash_compare_by_id_p(VALUE hash); * h1["a"] #=> 100 * h1.compare_by_identity * h1.compare_by_identity? #=> true - * h1["a"] #=> nil # different objects. + * h1["a".dup] #=> nil # different objects. * h1[:c] #=> "c" # same symbols are all same. * */ diff --git a/insns.def b/insns.def index ad4bba6..616838d 100644 --- a/insns.def +++ b/insns.def @@ -1903,6 +1903,47 @@ opt_aset /** @c optimize + @e recv[str] = set + @j 最適化された recv[str] = set。 + */ +DEFINE_INSN +opt_aset_str +(CALL_INFO ci, VALUE key) +(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)) { + rb_hash_aset(recv, key, val); + } else { + PUSH(recv); + PUSH(rb_str_resurrect(key)); + PUSH(val); + CALL_SIMPLE_METHOD(recv); + } +} + +/** + @c optimize + @e recv[str] + @j 最適化された recv[str]。 + */ +DEFINE_INSN +opt_aref_str +(CALL_INFO ci, VALUE key) +(VALUE recv) +(VALUE val) +{ + if (!SPECIAL_CONST_P(recv) && RBASIC_CLASS(recv) == rb_cHash && BASIC_OP_UNREDEFINED_P(BOP_AREF, HASH_REDEFINED_OP_FLAG)) { + val = rb_hash_aref(recv, key); + } else { + PUSH(recv); + PUSH(rb_str_resurrect(key)); + CALL_SIMPLE_METHOD(recv); + } +} + +/** + @c optimize @e optimized length @j 最適化された recv.length()。 */ diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 59000ad..d811598 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -215,6 +215,13 @@ class TestHash < Test::Unit::TestCase assert_equal(256, h[z]) end + def test_ASET_fstring_key + a, b = {}, {} + a["abc"] = 1 + b["abc"] = 1 + assert_same a.keys[0], b.keys[0] + end + def test_NEWHASH_fstring_key a = {"ABC" => :t} b = {"ABC" => :t} @@ -965,7 +972,7 @@ class TestHash < Test::Unit::TestCase h = @cls[] h.compare_by_identity h["a"] = 1 - h["a"] = 2 + h["a".dup] = 2 assert_equal(["a",1], h.assoc("a")) end