nagachika	2015-11-28 05:43:31 +0900 (Sat, 28 Nov 2015)

  New Revision: 52769

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

  Log:
    merge revision(s) 52128,52133: [Backport #11271]
    
    * test/objspace/test_objspace.rb
      (test_trace_object_allocations_start_stop_clear): clear object
      allocation table first to get rid of erronous detection for obj3.
      [ruby-dev:49095] [Bug #11271]
      allocation table first to get rid of erroneous detection for obj3.
      because it is only delegation function.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/objspace/test_objspace.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52768)
+++ ruby_2_2/ChangeLog	(revision 52769)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Nov 28 05:35:28 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* test/objspace/test_objspace.rb
+	  (test_trace_object_allocations_start_stop_clear): clear object
+	  allocation table first to get rid of erroneous detection for obj3.
+	  [ruby-dev:49095] [Bug #11271]
+
 Sat Nov 28 05:21:06 2015  Koichi Sasada  <ko1@a...>
 
 	* insns.def (defined): skip respond_to_missing? when
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52768)
+++ ruby_2_2/version.h	(revision 52769)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-11-28"
-#define RUBY_PATCHLEVEL 201
+#define RUBY_PATCHLEVEL 202
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_2/test/objspace/test_objspace.rb
===================================================================
--- ruby_2_2/test/objspace/test_objspace.rb	(revision 52768)
+++ ruby_2_2/test/objspace/test_objspace.rb	(revision 52769)
@@ -162,6 +162,8 @@ class TestObjSpace < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/objspace/test_objspace.rb#L162
   end
 
   def test_trace_object_allocations_start_stop_clear
+    ObjectSpace.trace_object_allocations_clear # clear object_table to get rid of erroneous detection for obj3
+    GC.disable # suppress potential object reuse. see [Bug #11271]
     begin
       ObjectSpace.trace_object_allocations_start
       begin
@@ -192,6 +194,8 @@ class TestObjSpace < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/objspace/test_objspace.rb#L194
     assert_equal(nil, ObjectSpace.allocation_sourcefile(obj1))
     assert_equal(nil, ObjectSpace.allocation_sourcefile(obj2))
     assert_equal(nil, ObjectSpace.allocation_sourcefile(obj3))
+  ensure
+    GC.enable
   end
 
   def test_dump_flags

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52128,52133


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