naruse	2014-02-20 16:30:24 +0900 (Thu, 20 Feb 2014)

  New Revision: 45062

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

  Log:
    merge revision(s) 44654: [Backport #9426]
    
    tracepoint.c: disable tracepoint
    
    * ext/-test-/tracepoint/tracepoint.c (tracepoint_track_objspace_events):
      ensure tracepoint disabled.  [ruby-dev:47901] [Bug #9426]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ext/-test-/tracepoint/tracepoint.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ext/-test-/tracepoint/tracepoint.c
===================================================================
--- ruby_2_1/ext/-test-/tracepoint/tracepoint.c	(revision 45061)
+++ ruby_2_1/ext/-test-/tracepoint/tracepoint.c	(revision 45062)
@@ -64,8 +64,7 @@ tracepoint_track_objspace_events(VALUE s https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/-test-/tracepoint/tracepoint.c#L64
     VALUE result = rb_ary_new();
 
     rb_tracepoint_enable(tpval);
-    rb_yield(Qundef);
-    rb_tracepoint_disable(tpval);
+    rb_ensure(rb_yield, Qundef, rb_tracepoint_disable, tpval);
 
     rb_ary_push(result, SIZET2NUM(track.newobj_count));
     rb_ary_push(result, SIZET2NUM(track.free_count));
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45061)
+++ ruby_2_1/version.h	(revision 45062)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-20"
-#define RUBY_PATCHLEVEL 38
+#define RUBY_PATCHLEVEL 39
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44654


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