diff --git a/ChangeLog b/ChangeLog index 72fd643356..a4b2b0411a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 22 09:52:57 2016 Nobuyoshi Nakada + + * compile.c (setup_args): duplicate splatting array if more + arguments present to obey left-to-right execution order. + [ruby-core:77701] [Bug# 12860] + Fri Oct 21 16:44:44 2016 Nobuyoshi Nakada * dir.c (do_opendir): retry after GC when the limit for open file diff --git a/compile.c b/compile.c index e2aef08902..e183c688b5 100644 --- a/compile.c +++ b/compile.c @@ -3741,7 +3741,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, s switch (nd_type(argn)) { case NODE_SPLAT: { COMPILE(args, "args (splat)", argn->nd_head); - ADD_INSN1(args, nd_line(argn), splatarray, Qfalse); + ADD_INSN1(args, nd_line(argn), splatarray, nsplat ? Qtrue : Qfalse); argc = INT2FIX(1); nsplat++; *flag |= VM_CALL_ARGS_SPLAT; @@ -3755,7 +3755,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, s INIT_ANCHOR(tmp); COMPILE(tmp, "args (cat: splat)", argn->nd_body); if (nd_type(argn) == NODE_ARGSCAT) { - ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse); + ADD_INSN1(tmp, nd_line(argn), splatarray, nsplat ? Qtrue : Qfalse); } else { ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1)); diff --git a/test/ruby/test_call.rb b/test/ruby/test_call.rb index fb79eadb64..4496d78210 100644 --- a/test/ruby/test_call.rb +++ b/test/ruby/test_call.rb @@ -90,4 +90,12 @@ class TestCall < Test::Unit::TestCase h[:foo] = nil } end + + def test_call_splat_order + bug12860 = '[ruby-core:77701] [Bug# 12860]' + ary = [1, 2] + assert_equal([1, 2, 1], aaa(*ary, ary.shift), bug12860) + ary = [1, 2] + assert_equal([0, 1, 2, 1], aaa(0, *ary, ary.shift), bug12860) + end end