kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 61603: [Backport #14279]

Browse source 
check array for zsuper. [Bug #14279]

	* compile.c (iseq_compile_each0): for zsuper (NODE_ZSUPER), we need to check
	  given argument is Array or not.

	* test/ruby/test_super.rb: add a test for this bug.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-02-16 07:32:11 +00:00
parent 0397ed4518
commit 53859b791d
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compile.c
View file

@ -6181,7 +6181,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
if (liseq->body->param.flags.has_rest) {
/* rest argument */
int idx = liseq->body->local_table_size - liseq->body->param.rest_start;
ADD_GETLOCAL(args, line, idx, lvar_level);
ADD_INSN1(args, line, splatarray, Qfalse);
argc = liseq->body->param.rest_start + 1;
flag |= VM_CALL_ARGS_SPLAT;

16
test/ruby/test_super.rb
View file

@ -544,4 +544,20 @@ class TestSuper < Test::Unit::TestCase
c.new
}
end
class TestFor_super_with_modified_rest_parameter_base
def foo *args
args
end
end
class TestFor_super_with_modified_rest_parameter < TestFor_super_with_modified_rest_parameter_base
def foo *args
args = 13
super
end
end
def test_super_with_modified_rest_parameter
assert_equal [13], TestFor_super_with_modified_rest_parameter.new.foo
end
end

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.0"
#define RUBY_RELEASE_DATE "2018-01-30"
#define RUBY_PATCHLEVEL 13
#define RUBY_RELEASE_DATE "2018-02-16"
#define RUBY_PATCHLEVEL 14
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 30
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 16
#include "ruby/version.h"