diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 06:51:42 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 06:51:42 +0000 |
commit | 8f97a2c53745f97055c38f41dd1e3dd96e64b300 (patch) | |
tree | bc851e2634160217beae68650ff6d825789605b7 | |
parent | 7b05ac78e18740d107af133c410069375855dea1 (diff) |
* variable.c (autoload_delete): An autoload entry is still in a
RCLASS_IV_TBL, not in a RCLASS_CONST_TBL, so take back the table
changed in r29600. And an autoload entry keeps not a
rb_const_entry_t but a NODE so remove rb_const_entry_t thing added
in r29602.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | variable.c | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Thu Aug 11 15:37:42 2011 Hiroshi Nakamura <nahi@ruby-lang.org> + + * variable.c (autoload_delete): An autoload entry is still in a + RCLASS_IV_TBL, not in a RCLASS_CONST_TBL, so take back the table + changed in r29600. And an autoload entry keeps not a + rb_const_entry_t but a NODE so remove rb_const_entry_t thing added + in r29602. + Thu Aug 11 15:07:36 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for diff --git a/variable.c b/variable.c index ef1c914df3..6ddbd71390 100644 --- a/variable.c +++ b/variable.c @@ -1495,9 +1495,7 @@ autoload_delete(VALUE mod, ID id) if (tbl->num_entries == 0) { n = autoload; - st_delete(RCLASS_CONST_TBL(mod), &n, &val); - ce = (rb_const_entry_t*)val; - if (ce) xfree(ce); + st_delete(RCLASS_IV_TBL(mod), &n, &val); } } |