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

* vm_args.c (setup_parameters_complex): don't raise ArgumentError

Browse source 
if an array is given for instance_exec with optional argument.
  [ruby-core:76300] [Bug #12568]
  https://github.com/rails/rails/pull/25699

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-07-07 18:59:38 +00:00
parent e4d4172bef
commit c016898e79
3 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Jul 8 03:54:22 2016 NARUSE, Yui <naruse@ruby-lang.org>
* vm_args.c (setup_parameters_complex): don't raise ArgumentError
if an array is given for instance_exec with optional argument.
[ruby-core:76300] [Bug #12568]
https://github.com/rails/rails/pull/25699
Fri Jul 8 00:47:36 2016 NARUSE, Yui <naruse@ruby-lang.org> Fri Jul 8 00:47:36 2016 NARUSE, Yui <naruse@ruby-lang.org>
* vm_eval.c (yield_under): change prototype to get argc/argv. * vm_eval.c (yield_under): change prototype to get argc/argv.

7
test/ruby/test_lambda.rb
View file

@ -72,6 +72,13 @@ class TestLambdaParameters < Test::Unit::TestCase
assert_raise(ArgumentError, bug9605) {proc(&plus).call [1,2]} assert_raise(ArgumentError, bug9605) {proc(&plus).call [1,2]}
end end
def test_instance_exec
bug12568 = '[ruby-core:76300] [Bug #12568]'
assert_nothing_raised(ArgumentError, bug12568) do
instance_exec([1,2,3], &->(a=[]){ a })
end
end
def yield_1(arg) def yield_1(arg)
yield arg yield arg
end end

1
vm_args.c
View file

@ -587,6 +587,7 @@ setup_parameters_complex(rb_thread_t * const th, const rb_iseq_t * const iseq,
case arg_setup_lambda: case arg_setup_lambda:
if (given_argc == 1 && if (given_argc == 1 &&
given_argc != iseq->body->param.lead_num && given_argc != iseq->body->param.lead_num &&
!iseq->body->param.flags.has_opt &&
!iseq->body->param.flags.has_rest && !iseq->body->param.flags.has_rest &&
args_check_block_arg0(args, th)) { args_check_block_arg0(args, th)) {
given_argc = RARRAY_LENINT(args->rest); given_argc = RARRAY_LENINT(args->rest);