diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-06 01:31:03 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-06 01:31:03 +0000 |
commit | 3e557a979ecc2c9a43ffa3bbdb8fc2a6c5cfca61 (patch) | |
tree | d55326333b9d38bc86e72cf7a0de337522f85921 | |
parent | b81950f480df1c07f2e6f271d23d066dafdc0e1f (diff) | |
download | ruby-3e557a979ecc2c9a43ffa3bbdb8fc2a6c5cfca61.tar.gz |
vm_eval.c: next super class from the original
* vm_eval.c (vm_call_super): search next super class from the
original class, to get rid of infinite recursion with
prepending. a patch by Seiei Higa <hanachin AT gmail.com> at
[ruby-core:68434]. [ruby-core:68093] [Bug #10847]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 11 | ||||
-rw-r--r-- | vm_eval.c | 3 |
3 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri Mar 6 10:31:00 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_eval.c (vm_call_super): search next super class from the + original class, to get rid of infinite recursion with + prepending. a patch by Seiei Higa <hanachin AT gmail.com> at + [ruby-core:68434]. [ruby-core:68093] [Bug #10847] + Fri Mar 6 08:45:26 2015 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * lib/matrix.rb: Add Vector#round. Patch by Jordan Stephens. diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index d014e8cb05..f1ca0b7cc1 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1748,6 +1748,17 @@ class TestModule < Test::Unit::TestCase assert_equal([m, c2, m, c1], c2.ancestors[0, 4], "should accesisble prepended module in superclass") end + def test_prepend_call_super + assert_separately([], <<-'end;') #do + bug10847 = '[ruby-core:68093] [Bug #10847]' + module M; end + Float.prepend M + assert_nothing_raised(SystemStackError, bug10847) do + 0.3.numerator + end + end; + end + def test_class_variables m = Module.new m.class_variable_set(:@@foo, 1) @@ -273,7 +273,8 @@ vm_call_super(rb_thread_t *th, int argc, const VALUE *argv) rb_bug("vm_call_super: should not be reached"); } - klass = RCLASS_SUPER(cfp->klass); + klass = RCLASS_ORIGIN(cfp->klass); + klass = RCLASS_SUPER(klass); id = cfp->me->def->original_id; me = rb_method_entry(klass, id, &klass); if (!me) { |