diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-13 14:01:07 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-13 14:01:07 +0000 |
| commit | 4c2f2ffc02c9a8bff5750d754c5a6e8502ae3a64 (patch) | |
| tree | 607e5935272a9d8c3b51792672de8b7507f59853 /vm_insnhelper.c | |
| parent | a6929d1d7e276184427d861797fff8cc7e9badb6 (diff) | |
merge revision(s) 42782,42799: [Backport #8902]
* vm_insnhelper.c (vm_search_super_method): use ci->argc instead of
ci->orig_argc. ci->argc can be changed by splat arguments.
[ruby-list:49575]
This fix should be applied to Ruby 2.0.0 seriese.
* test/ruby/test_super.rb: add a test for above.
* numeric.c (NUM_STEP_SCAN_ARGS): On second thought, keep
* internal.h (bit_length): Add casts to fix compilation error with
This fix should be applied to Ruby 2.0.0 series.
numeric literal, for the backward compatibility.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index db8591a812..9d321c0529 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1991,7 +1991,7 @@ vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_inf { VALUE current_defined_class; rb_iseq_t *iseq = GET_ISEQ(); - VALUE sigval = TOPN(ci->orig_argc); + VALUE sigval = TOPN(ci->argc); current_defined_class = GET_CFP()->klass; if (NIL_P(current_defined_class)) { |