summaryrefslogtreecommitdiff
path: root/class.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-09-24 00:55:11 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-09-24 08:29:00 +0900
commit65285bf673914424e960671d1d35e357c455985e (patch)
tree551c2e9aac3b017d462fadd00c924ddfbeec5ee0 /class.c
parent854fe9d1c1d52037a0c04d75b75765f25f028d1e (diff)
downloadruby-65285bf673914424e960671d1d35e357c455985e.tar.gz
Consider modified modules initialized [Bug #18185]
Diffstat (limited to 'class.c')
-rw-r--r--class.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/class.c b/class.c
index 46d44085d5..8e37f8a93e 100644
--- a/class.c
+++ b/class.c
@@ -358,6 +358,15 @@ RMODULE_UNINITIALIZED(VALUE module)
}
void
+rb_module_set_initialized(VALUE mod)
+{
+ if (RMODULE_UNINITIALIZED(mod)) {
+ RB_OBJ_WRITE(mod, &RCLASS(mod)->super, 0);
+ /* no more re-initialization */
+ }
+}
+
+void
rb_module_check_initializable(VALUE mod)
{
if (!RMODULE_UNINITIALIZED(mod)) {
@@ -916,10 +925,7 @@ ensure_includable(VALUE klass, VALUE module)
{
rb_class_modify_check(klass);
Check_Type(module, T_MODULE);
- if (RMODULE_UNINITIALIZED(module)) {
- RB_OBJ_WRITE(module, &RCLASS(module)->super, 0);
- /* no more re-initialization */
- }
+ rb_module_set_initialized(module);
if (!NIL_P(rb_refinement_module_get_refined_class(module))) {
rb_raise(rb_eArgError, "refinement module is not allowed");
}