[前][次][番号順一覧][スレッド一覧]

ruby-changes:12116

From: yugui <ko1@a...>
Date: Sun, 21 Jun 2009 18:15:45 +0900 (JST)
Subject: [ruby-changes:12116] Ruby:r23787 (ruby_1_9_1): merges r23693 from trunk into ruby_1_9_1.

yugui	2009-06-21 18:15:27 +0900 (Sun, 21 Jun 2009)

  New Revision: 23787

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

  Log:
    merges r23693 from trunk into ruby_1_9_1.
    --
    * gc.c (os_obj_of): invoke garbage collection before iteration, to
      avoid accessing half recycled object references.  [ruby-dev:38613]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/gc.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23786)
+++ ruby_1_9_1/ChangeLog	(revision 23787)
@@ -1,3 +1,8 @@
+Mon Jun 15 17:48:42 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* gc.c (os_obj_of): invoke garbage collection before iteration, to
+	  avoid accessing half recycled object references.  [ruby-dev:38613]
+
 Sat Jun 13 07:06:54 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_eval.c (rb_f_catch): updated rdoc about generalized argument,
Index: ruby_1_9_1/gc.c
===================================================================
--- ruby_1_9_1/gc.c	(revision 23786)
+++ ruby_1_9_1/gc.c	(revision 23787)
@@ -85,6 +85,7 @@
 int ruby_gc_debug_indent = 0;
 
 #undef GC_DEBUG
+#define GC_DEBUG
 
 /* for GC profile */
 #define GC_PROFILE_MORE_DETAIL 0
@@ -266,7 +267,7 @@
 	struct RComplex complex;
     } as;
 #ifdef GC_DEBUG
-    char *file;
+    const char *file;
     int   line;
 #endif
 } RVALUE;
@@ -2164,6 +2165,7 @@
     RVALUE *p, *pend;
     volatile VALUE v;
 
+    rb_garbage_collect();
     i = 0;
     while (i < heaps_used) {
         while (0 < i && (uintptr_t)membase < (uintptr_t)heaps[i-1].membase)
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23786)
+++ ruby_1_9_1/version.h	(revision 23787)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 177
+#define RUBY_PATCHLEVEL 178
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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

[前][次][番号順一覧][スレッド一覧]