nagachika	2013-10-09 23:57:15 +0900 (Wed, 09 Oct 2013)

  New Revision: 43220

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

  Log:
    merge revision(s) 43092: [Backport #8969]
    
    * gc.c (rb_gc_disable): do rest_sweep() before disable GC.
      This fix may solve a failure of
      TestTracepointObj#test_tracks_objspace_events
      [test/-ext-/tracepoint/test_tracepoint.rb:43].

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/gc.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43219)
+++ ruby_2_0_0/ChangeLog	(revision 43220)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Oct  9 23:32:37 2013  Koichi Sasada  <ko1@a...>
+
+	* gc.c (rb_gc_disable): do rest_sweep() before disable GC.
+	  This fix may solve a failure of
+	  TestTracepointObj#test_tracks_objspace_events
+	  [test/-ext-/tracepoint/test_tracepoint.rb:43].
+
 Sat Oct  5 02:14:56 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_close_read): duplex IO should wait its child process
Index: ruby_2_0_0/gc.c
===================================================================
--- ruby_2_0_0/gc.c	(revision 43219)
+++ ruby_2_0_0/gc.c	(revision 43220)
@@ -3285,6 +3285,8 @@ rb_gc_disable(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/gc.c#L3285
     rb_objspace_t *objspace = &rb_objspace;
     int old = dont_gc;
 
+    rest_sweep(objspace);
+
     dont_gc = TRUE;
     return old ? Qtrue : Qfalse;
 }
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43219)
+++ ruby_2_0_0/version.h	(revision 43220)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-10-05"
-#define RUBY_PATCHLEVEL 326
+#define RUBY_RELEASE_DATE "2013-10-09"
+#define RUBY_PATCHLEVEL 327
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43092


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