summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-08 02:18:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-08 02:18:15 +0000
commitd011b2e3effe48540d50f536dea198cd919340f5 (patch)
tree2f12947a30e5e29cb6f5230bb71cb4c33bd0b72f /variable.c
parentbaeeebf474cae027bc3d2e80a72a540612874ef9 (diff)
* variable.c (autoload_delete, autoload_file): should not delete
autoload table, since it may be shared with duplicated modules. [ruby-core:19181] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/variable.c b/variable.c
index a5fbf28f5f..62377d0c7e 100644
--- a/variable.c
+++ b/variable.c
@@ -1374,12 +1374,8 @@ autoload_delete(VALUE mod, ID id)
st_delete(tbl, (st_data_t*)&id, &load);
if (tbl->num_entries == 0) {
- DATA_PTR(val) = 0;
- st_free_table(tbl);
id = autoload;
- if (st_delete(RCLASS_IV_TBL(mod), (st_data_t*)&id, &val)) {
- rb_gc_force_recycle(val);
- }
+ st_delete(RCLASS_IV_TBL(mod), (st_data_t*)&id, &val);
}
}
@@ -1421,12 +1417,8 @@ autoload_file(VALUE mod, ID id)
/* already loaded but not defined */
st_delete(tbl, (st_data_t*)&id, 0);
if (!tbl->num_entries) {
- DATA_PTR(val) = 0;
- st_free_table(tbl);
id = autoload;
- if (st_delete(RCLASS_IV_TBL(mod), (st_data_t*)&id, &val)) {
- rb_gc_force_recycle(val);
- }
+ st_delete(RCLASS_IV_TBL(mod), (st_data_t*)&id, &val);
}
return Qnil;
}