nahi	2011-08-11 19:06:25 +0900 (Thu, 11 Aug 2011)

  New Revision: 32932

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32932

  Log:
    * 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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/variable.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32931)
+++ ruby_1_9_3/ChangeLog	(revision 32932)
@@ -1,3 +1,13 @@
+Thu Aug 11 19:04:38 2011  Hiroshi Nakamura  <nahi@r...>
+
+	* 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@r...>
 
 	* lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
Index: ruby_1_9_3/variable.c
===================================================================
--- ruby_1_9_3/variable.c	(revision 32931)
+++ ruby_1_9_3/variable.c	(revision 32932)
@@ -1484,9 +1484,7 @@
 
 	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);
 	}
     }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/