diff options
| author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 10:06:25 +0000 |
|---|---|---|
| committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 10:06:25 +0000 |
| commit | 892e9111528833ede206fb69ad7389d307b73a56 (patch) | |
| tree | 50d04143c834e56eea9ac6b2f33e78083421a647 | |
| parent | b3e11a33db0cb595fa113cb63d08c2780e910ce6 (diff) | |
* backport r32931 from trunk.
* 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/branches/ruby_1_9_3@32932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | variable.c | 4 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,13 @@ +Thu Aug 11 19:04:38 2011 Hiroshi Nakamura <nahi@ruby-lang.org> + + * backport r32931 from trunk. + + * 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 251fb3bafb..ed6f3debd9 100644 --- a/variable.c +++ b/variable.c @@ -1484,9 +1484,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); } } |