summaryrefslogtreecommitdiff
path: root/class.c
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 02:11:59 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 02:11:59 +0000
commit9e449748744cbb28ede16ecb3064e3fcb0899022 (patch)
tree9d61dc0828e816c66f91aebdf2b2ee7a4e8411f2 /class.c
parent696ebcd8cafece7c0ed6407af9679699a16a5c5a (diff)
* revert r37993 to avoid SEGV in tests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'class.c')
-rw-r--r--class.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/class.c b/class.c
index 0aa7561aa6..e083bf633d 100644
--- a/class.c
+++ b/class.c
@@ -678,13 +678,6 @@ rb_include_module(VALUE klass, VALUE module)
}
static int
-add_refined_method_entry_i(st_data_t key, st_data_t value, st_data_t data)
-{
- rb_add_refined_method_entry((VALUE) data, (ID) key);
- return ST_CONTINUE;
-}
-
-static int
include_modules_at(VALUE klass, VALUE c, VALUE module)
{
VALUE p;
@@ -714,13 +707,6 @@ include_modules_at(VALUE klass, VALUE c, VALUE module)
}
}
c = RCLASS_SUPER(c) = rb_include_class_new(module, RCLASS_SUPER(c));
- if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
- VALUE refined_class =
- rb_refinement_module_get_refined_class(klass);
-
- st_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i,
- (st_data_t) refined_class);
- }
if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
changed = 1;
skip:
@@ -752,7 +738,7 @@ rb_prepend_module(VALUE klass, VALUE module)
RCLASS_SUPER(klass) = origin;
RCLASS_ORIGIN(klass) = origin;
RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
- RCLASS_M_TBL(klass) = st_init_numtable();
+ RCLASS_M_TBL(klass) = 0;
}
changed = include_modules_at(klass, klass, module);
if (changed < 0)