diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-02 13:54:38 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-02 13:54:38 +0000 |
commit | 997f821a58a7295436e64443ab4bd1d550cd6919 (patch) | |
tree | 258704c1655f73fefad13e3d76882324abede381 | |
parent | 00a360a93dc9ac5e32cfa56600b2a10ea42c685a (diff) |
merge revision(s) r48160: [Backport #10432]
* proc.c (method_proc): the receiver of binding from method should
be same as the receiver of the method.
[ruby-core:65917] [Bug #10432]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | proc.c | 10 | ||||
-rw-r--r-- | test/ruby/test_proc.rb | 5 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 21 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Feb 2 22:47:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * proc.c (method_proc): the receiver of binding from method should + be same as the receiver of the method. + [ruby-core:65917] [Bug #10432] + Mon Feb 2 22:43:42 2015 Aaron Patterson <aaron@tenderlovemaking.com> * lib/resolv.rb: fall back if canonicalization fails. @@ -2317,7 +2317,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 @@ -2327,9 +2330,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 1c8a053cca..06f137fdd1 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -202,7 +202,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 @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.5" #define RUBY_RELEASE_DATE "2015-02-02" -#define RUBY_PATCHLEVEL 288 +#define RUBY_PATCHLEVEL 289 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 |