From aec14b33d4379d69b63766964ac731fc3cb42edf Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 3 Jul 2018 23:56:11 +0000 Subject: vm.c: simplified core#hash_merge_kwd * vm.c (core_hash_merge_kwd): simplified to merge the second hash into the first hash. * compile.c (compile_array): call core#hash_merge_kwd with 2 hashes always, by passing an new empty hash to at the first iteration. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'compile.c') diff --git a/compile.c b/compile.c index 21971830ea..ea6b74d18d 100644 --- a/compile.c +++ b/compile.c @@ -3989,18 +3989,17 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node_ro } } if (kw) { - VALUE nhash = (i > 0 || !first) ? INT2FIX(2) : INT2FIX(1); if (!popped) { ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); if (i > 0 || !first) ADD_INSN(ret, line, swap); + else ADD_INSN1(ret, line, newhash, INT2FIX(0)); } COMPILE(ret, "keyword splat", kw); if (popped) { ADD_INSN(ret, line, pop); } else { - ADD_SEND(ret, line, id_core_hash_merge_kwd, nhash); - if (nhash == INT2FIX(1)) ADD_SEND(ret, line, rb_intern("dup"), INT2FIX(0)); + ADD_SEND(ret, line, id_core_hash_merge_kwd, INT2FIX(2)); } } first = 0; -- cgit v1.2.3