diff options
| -rw-r--r-- | class.c | 3 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 9 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -1053,8 +1053,7 @@ rb_include_module(VALUE klass, VALUE module) if (RB_TYPE_P(klass, T_MODULE)) { rb_subclass_entry_t *iclass = RCLASS_SUBCLASSES(klass); // skip the placeholder subclass entry at the head of the list - if (iclass && iclass->next) { - RUBY_ASSERT(!iclass->klass); + if (iclass && !iclass->klass) { iclass = iclass->next; } diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index b84a090fce..fa890c0e40 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -475,6 +475,15 @@ class TestModule < Test::Unit::TestCase assert_not_include(mod.ancestor_list, BasicObject) end + def test_module_collected_extended_object + m1 = labeled_module("m1") + m2 = labeled_module("m2") + Object.new.extend(m1) + GC.start + m1.include(m2) + assert_equal([m1, m2], m1.ancestors) + end + def test_dup OtherSetup.call @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 8 +#define RUBY_PATCHLEVEL 9 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 1 |