diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:11:26 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:11:26 +0000 |
commit | ffafcd96e66ec6a4b7150616b00bd0bab145671d (patch) | |
tree | 00bee4fe35ee0079960fc187fb95802ce3cb9cd8 | |
parent | d3818d6b55af209f9e75a3dda098510a525fcd71 (diff) |
merges r31436 and r31437 from trunk into ruby_1_9_2.
--
* eval.c (frame_func_id): __method__ return different name from
methods defined by Module#define_method with a same block.
[ruby-core:35386] fixes #4606
* eval (method_entry_of_iseq): new helper function. search control
frame stack for a method entry which has given iseq.
* test/ruby/test_method.rb: add tests for #4696
--
* eval.c (frame_func_id): store result of method_entry_of_iseq() to
cfp->me because method_entry_of_iseq() might become expensive.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | eval.c | 23 | ||||
-rw-r--r-- | test/ruby/test_method.rb | 26 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 63 insertions, 2 deletions
@@ -1,3 +1,17 @@ +Thu May 5 17:36:31 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> + + * eval.c (frame_func_id): store result of method_entry_of_iseq() to + cfp->me because method_entry_of_iseq() might become expensive. + +Thu May 5 15:03:51 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> + + * eval.c (frame_func_id): __method__ return different name from + methods defined by Module#define_method with a same block. + [ruby-core:35386] fixes #4606 + * eval (method_entry_of_iseq): new helper function. search control + frame stack for a method entry which has given iseq. + * test/ruby/test_method.rb: add tests for #4696 + Mon May 2 00:36:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * ext/socket/init.c (rsock_connect): add to care EINTR. based @@ -751,17 +751,38 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE return result; } +static const rb_method_entry_t * +method_entry_of_iseq(rb_control_frame_t *cfp, rb_iseq_t *iseq) +{ + rb_thread_t *th = GET_THREAD(); + rb_control_frame_t *cfp_limit; + + cfp_limit = (rb_control_frame_t *)(th->stack + th->stack_size); + while (cfp_limit > cfp) { + if (cfp->iseq == iseq) + return cfp->me; + cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); + } + return 0; +} + static ID frame_func_id(rb_control_frame_t *cfp) { + const rb_method_entry_t *me_local; rb_iseq_t *iseq = cfp->iseq; - if (!iseq) { + if (cfp->me) { return cfp->me->def->original_id; } while (iseq) { if (RUBY_VM_IFUNC_P(iseq)) { return rb_intern("<ifunc>"); } + me_local = method_entry_of_iseq(cfp, iseq); + if (me_local) { + cfp->me = me_local; + return me_local->def->original_id; + } if (iseq->defined_method_id) { return iseq->defined_method_id; } diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 7be70b00a6..3a728e1599 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -78,6 +78,32 @@ class TestMethod < Test::Unit::TestCase assert_nil(eval("class TestCallee; __method__; end")) end + def test_method_in_define_method_block + bug4606 = '[ruby-core:35386]' + c = Class.new do + [:m1, :m2].each do |m| + define_method(m) do + __method__ + end + end + end + assert_equal(:m1, c.new.m1, bug4606) + assert_equal(:m2, c.new.m2, bug4606) + end + + def test_method_in_block_in_define_method_block + bug4606 = '[ruby-core:35386]' + c = Class.new do + [:m1, :m2].each do |m| + define_method(m) do + tap { return __method__ } + end + end + end + assert_equal(:m1, c.new.m1, bug4606) + assert_equal(:m2, c.new.m2, bug4606) + end + def test_body o = Object.new def o.foo; end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 247 +#define RUBY_PATCHLEVEL 248 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |