From 9e449748744cbb28ede16ecb3064e3fcb0899022 Mon Sep 17 00:00:00 2001 From: shugo Date: Fri, 30 Nov 2012 02:11:59 +0000 Subject: * revert r37993 to avoid SEGV in tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- class.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'class.c') diff --git a/class.c b/class.c index 0aa7561aa6..e083bf633d 100644 --- a/class.c +++ b/class.c @@ -677,13 +677,6 @@ rb_include_module(VALUE klass, VALUE module) if (changed) rb_clear_cache(); } -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) { @@ -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) -- cgit v1.2.3