diff --git a/ChangeLog b/ChangeLog index 3c90a4e5e5..6889c2bd99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 28 16:18:44 2014 Nobuyoshi Nakada + + * proc.c (method_proc): the receiver of binding from method should + be same as the receiver of the method. + [ruby-core:65917] [Bug #10432] + Fri Nov 28 16:12:22 2014 NARUSE, Yui * lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead diff --git a/proc.c b/proc.c index d8f0b28e1a..8d18e2c3db 100644 --- a/proc.c +++ b/proc.c @@ -2034,7 +2034,10 @@ static VALUE method_proc(VALUE method) { VALUE procval; + struct METHOD *meth; rb_proc_t *proc; + rb_env_t *env; + /* * class Method * def to_proc @@ -2044,9 +2047,16 @@ method_proc(VALUE method) * end * end */ + TypedData_Get_Struct(method, struct METHOD, &method_data_type, meth); procval = rb_iterate(mlambda, 0, bmcall, method); GetProcPtr(procval, proc); proc->is_from_method = 1; + proc->block.self = meth->recv; + proc->block.klass = meth->defined_class; + GetEnvPtr(proc->envval, env); + env->block.self = meth->recv; + env->block.klass = meth->defined_class; + env->block.iseq = method_get_iseq(meth->me->def); return procval; } diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index 2db9108534..da7f07ef6c 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -179,7 +179,10 @@ class TestProc < Test::Unit::TestCase def test_method_to_proc b = block() assert_equal "OK", b.call - assert_instance_of(Binding, b.binding, '[ruby-core:25589]') + b = b.binding + assert_instance_of(Binding, b, '[ruby-core:25589]') + bug10432 = '[ruby-core:65919] [Bug #10432]' + assert_same(self, b.eval("self"), bug10432) end def test_block_given_method diff --git a/version.h b/version.h index 48a0af5d4a..ec4a00c26b 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-11-28" -#define RUBY_PATCHLEVEL 602 +#define RUBY_PATCHLEVEL 603 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 11