diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:41:32 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-12 15:41:32 +0000 |
commit | 54dc1cf1eda9afac1c43fd21cd077ac216f75730 (patch) | |
tree | 1634b813a4a0c4043d7701b1d0ee749d646416e6 /ChangeLog | |
parent | 91ad9122a51d795b1267191ec0e40a3e910dbe11 (diff) |
merge revision(s) 49867: [Backport #10847] [Backport #10970]
* 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/branches/ruby_2_2@50275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Mon Apr 13 00:16:32 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] + Mon Apr 13 00:09:48 2015 Koichi Sasada <ko1@atdot.net> * class.c (rb_prepend_module): need a WB for klass -> origin. |