1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in rb_include_module that stops nested inclusion into module subclasses

Browse Source 
This bug was present since the code was originally added by me
in 3556a834a2847e52162d1d3302d4c64390df1694.

Fixes [Bug #20871]
This commit is contained in:
Jeremy Evans 2024-11-19 13:58:19 -08:00
parent 9db056f2ea
commit 3b7892b6e4
Notes: git 2024-11-20 15:59:50 +00:00 
Merged: https://github.com/ruby/ruby/pull/12125
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
class.c
View File

@ -1204,8 +1204,8 @@ rb_include_module(VALUE klass, VALUE module)
iclass = iclass->next; iclass = iclass->next;
} }
int do_include = 1;
while (iclass) { while (iclass) {
int do_include = 1;
VALUE check_class = iclass->klass; VALUE check_class = iclass->klass;
/* During lazy sweeping, iclass->klass could be a dead object that /* During lazy sweeping, iclass->klass could be a dead object that
* has not yet been swept. */ * has not yet been swept. */

12
test/ruby/test_module.rb
View File

@ -784,6 +784,18 @@ class TestModule < Test::Unit::TestCase
assert_equal([:m1, :m0, :m, :sc, :m1, :m0, :c], sc.new.m) assert_equal([:m1, :m0, :m, :sc, :m1, :m0, :c], sc.new.m)
end end
def test_include_into_module_after_prepend_bug_20871
bar = Module.new{def bar; 'bar'; end}
foo = Module.new{def foo; 'foo'; end}
m = Module.new
c = Class.new{include m}
m.prepend bar
Class.new{include m}
m.include foo
assert_include c.ancestors, foo
assert_equal "foo", c.new.foo
end
def test_protected_include_into_included_module def test_protected_include_into_included_module
m1 = Module.new do m1 = Module.new do
def other_foo(other) def other_foo(other)