archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 56469: [Backport #12860]

Browse source 
* compile.c (setup_args): duplicate splatting array if more
	  arguments present to obey left-to-right execution order.
	  [ruby-core:77701] [Bug# 12860]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-12-27 09:34:40 +00:00
parent 16d03ff2a4
commit a078bbcc17
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Dec 27 18:34:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (setup_args): duplicate splatting array if more
arguments present to obey left-to-right execution order.
[ruby-core:77701] [Bug# 12860]
Tue Dec 27 18:28:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Dec 27 18:28:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (dln_load): raise LoadError instead of fatal error on * dln.c (dln_load): raise LoadError instead of fatal error on

4
compile.c
View file

@ -3267,7 +3267,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, r
switch (nd_type(argn)) { switch (nd_type(argn)) {
case NODE_SPLAT: { case NODE_SPLAT: {
COMPILE(args, "args (splat)", argn->nd_head); 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); argc = INT2FIX(1);
nsplat++; nsplat++;
*flag |= VM_CALL_ARGS_SPLAT; *flag |= VM_CALL_ARGS_SPLAT;
@ -3281,7 +3281,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, r
INIT_ANCHOR(tmp); INIT_ANCHOR(tmp);
COMPILE(tmp, "args (cat: splat)", argn->nd_body); COMPILE(tmp, "args (cat: splat)", argn->nd_body);
if (nd_type(argn) == NODE_ARGSCAT) { 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 { else {
ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1)); ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));

8
test/ruby/test_call.rb
View file

@ -31,4 +31,12 @@ class TestCall < Test::Unit::TestCase
assert_nothing_raised(ArgumentError) {o.foo} assert_nothing_raised(ArgumentError) {o.foo}
assert_raise_with_message(ArgumentError, e.message, bug9622) {o.foo(100)} assert_raise_with_message(ArgumentError, e.message, bug9622) {o.foo(100)}
end 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 end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2016-12-27" #define RUBY_RELEASE_DATE "2016-12-27"
#define RUBY_PATCHLEVEL 400 #define RUBY_PATCHLEVEL 401
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12