ruby-changes:12512
From: nobu <ko1@a...>
Date: Tue, 21 Jul 2009 12:38:39 +0900 (JST)
Subject: [ruby-changes:12512] Ruby:r24215 (trunk): * variable.c (rb_generic_ivar_memsize): should not remove generic
nobu 2009-07-21 12:38:17 +0900 (Tue, 21 Jul 2009) New Revision: 24215 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24215 Log: * variable.c (rb_generic_ivar_memsize): should not remove generic instance variable table. Modified files: trunk/ChangeLog trunk/variable.c trunk/version.h Index: ChangeLog =================================================================== --- ChangeLog (revision 24214) +++ ChangeLog (revision 24215) @@ -1,3 +1,8 @@ +Tue Jul 21 12:38:07 2009 Nobuyoshi Nakada <nobu@r...> + + * variable.c (rb_generic_ivar_memsize): should not remove generic + instance variable table. + Mon Jul 20 20:35:55 2009 NARUSE, Yui <naruse@r...> * io.c (rb_f_open): add rdoc about specifying ext_enc as *-bom. Index: variable.c =================================================================== --- variable.c (revision 24214) +++ variable.c (revision 24215) @@ -908,10 +908,10 @@ void rb_free_generic_ivar(VALUE obj) { - st_data_t tbl; + st_data_t key = (st_data_t)obj, tbl; if (!generic_iv_tbl) return; - if (st_delete(generic_iv_tbl, &obj, &tbl)) + if (st_delete(generic_iv_tbl, &key, &tbl)) st_free_table((st_table *)tbl); } @@ -919,8 +919,8 @@ rb_generic_ivar_memsize(VALUE obj) { st_data_t tbl; - if (st_delete(generic_iv_tbl, &obj, &tbl)) - return st_memsize((st_table *)tbl); + if (st_lookup(generic_iv_tbl, (st_data_t)obj, &tbl)) + return st_memsize((st_table *)tbl); return 0; } @@ -931,7 +931,7 @@ if (!generic_iv_tbl) return; if (!FL_TEST(obj, FL_EXIVAR)) { -clear: + clear: if (FL_TEST(clone, FL_EXIVAR)) { rb_free_generic_ivar(clone); FL_UNSET(clone, FL_EXIVAR); Index: version.h =================================================================== --- version.h (revision 24214) +++ version.h (revision 24215) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-07-20" +#define RUBY_RELEASE_DATE "2009-07-21" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/