diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-02 02:34:12 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-02 02:34:12 +0000 |
| commit | 1201b970eeff276d516bf608d9de90f9610b0983 (patch) | |
| tree | 3e7990d2c6b91042d01005e6a84b1e473beed335 | |
| parent | 3a23aad61c4a07a092aa9cba10f899d58d17c510 (diff) | |
merge revision(s) 19710:
* 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/branches/ruby_1_8_6@21939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | variable.c | 12 | ||||
| -rw-r--r-- | version.h | 11 |
3 files changed, 14 insertions, 15 deletions
@@ -1,3 +1,9 @@ +Mon Feb 2 11:33:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * variable.c (autoload_delete, autoload_file): should not delete + autoload table, since it may be shared with duplicated modules. + [ruby-core:19181] + Thu Jan 29 11:53:14 2009 Tadayoshi Funaba <tadf@dotrb.org> * lib/date.rb (today,now): should produce own instances. diff --git a/variable.c b/variable.c index 7e548c3704..cb7ac31609 100644 --- a/variable.c +++ b/variable.c @@ -1325,12 +1325,8 @@ autoload_delete(mod, 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(mod)->iv_tbl, (st_data_t*)&id, &val)) { - rb_gc_force_recycle(val); - } + st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val); } } @@ -1376,12 +1372,8 @@ autoload_file(mod, 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(mod)->iv_tbl, (st_data_t*)&id, &val)) { - rb_gc_force_recycle(val); - } + st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val); } return Qnil; } @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-29" +#define RUBY_RELEASE_DATE "2009-02-02" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090129 -#define RUBY_PATCHLEVEL 315 +#define RUBY_RELEASE_CODE 20090202 +#define RUBY_PATCHLEVEL 316 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 2 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; @@ -20,3 +20,4 @@ RUBY_EXTERN const int ruby_patchlevel; + |