diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-03 10:27:21 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-03 10:27:21 +0000 |
commit | 2d3d84155d6c114a0f76888a8e2779e887722788 (patch) | |
tree | eaaded667ea40494ac6c5c1840931f457eb04a7a | |
parent | bea3f0df108ad4a983843eae83231cca2843b30d (diff) | |
download | ruby-2d3d84155d6c114a0f76888a8e2779e887722788.tar.gz |
* insns.def (invokesuper): don't skip the same class. instead, use
rb_method_entry_get_with_omod() to avoid infinite loop when
super is used with refinements. [ruby-core:30450] [Bug #3351]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | insns.def | 7 | ||||
-rw-r--r-- | test/ruby/test_super.rb | 28 |
3 files changed, 35 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Fri Aug 3 19:26:10 2012 Shugo Maeda <shugo@ruby-lang.org> + + * insns.def (invokesuper): don't skip the same class. instead, use + rb_method_entry_get_with_omod() to avoid infinite loop when + super is used with refinements. [ruby-core:30450] [Bug #3351] + Fri Aug 3 19:21:19 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in: use clang prior to gcc only when self-compiling on @@ -1045,12 +1045,7 @@ invokesuper while (ip && !ip->klass) { ip = ip->parent_iseq; } - me = rb_method_entry(klass, id, &klass); - if (me && me->def->type == VM_METHOD_TYPE_ISEQ && - me->def->body.iseq == ip) { - klass = RCLASS_SUPER(klass); - me = rb_method_entry_get_with_omod(Qnil, klass, id, &klass); - } + me = rb_method_entry_get_with_omod(Qnil, klass, id, &klass); CALL_METHOD(num, blockptr, flag, id, me, recv, klass); } diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb index 743b71d73f..d007f9c714 100644 --- a/test/ruby/test_super.rb +++ b/test/ruby/test_super.rb @@ -184,4 +184,32 @@ class TestSuper < Test::Unit::TestCase mid.subseq end end + + module DoubleInclude + class Base + def foo + [:Base] + end + end + + module Override + def foo + super << :Override + end + end + + class A < Base + end + + class B < A + end + + B.send(:include, Override) + A.send(:include, Override) + end + + # [Bug #3351] + def test_double_include + assert_equal([:Base, :Override, :Override], DoubleInclude::B.new.foo) + end end |