naruse	2015-01-16 14:58:13 +0900 (Fri, 16 Jan 2015)

  New Revision: 49274

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

  Log:
    merge revision(s) 49090: [Backport #10686]
    
    * symbol.c (rb_gc_free_dsymbol): delete from global fstr hash
    
    * test/ruby/test_symbol.rb (test_symbol_fstr_leak): test for bug
      [ruby-core:67268] [Bug #10686]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/symbol.c
    branches/ruby_2_2/test/ruby/test_symbol.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/symbol.c
===================================================================
--- ruby_2_2/symbol.c	(revision 49273)
+++ ruby_2_2/symbol.c	(revision 49274)
@@ -664,6 +664,7 @@ rb_gc_free_dsymbol(VALUE sym) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/symbol.c#L664
     if (str) {
 	RSYMBOL(sym)->fstr = 0;
 	unregister_sym(str, sym);
+	rb_hash_delete_entry(global_symbols.dsymbol_fstr_hash, str);
     }
 }
 
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49273)
+++ ruby_2_2/ChangeLog	(revision 49274)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Jan 16 14:56:08 2015  Eric Wong  <e@8...>
+
+	* symbol.c (rb_gc_free_dsymbol): delete from global fstr hash
+	* test/ruby/test_symbol.rb (test_symbol_fstr_leak): test for bug
+	  [ruby-core:67268] [Bug #10686]
+
 Fri Jan 16 14:20:52 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_args.c (keyword_hash_p): fix non-symbol keys hash.
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49273)
+++ ruby_2_2/version.h	(revision 49274)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-16"
-#define RUBY_PATCHLEVEL 10
+#define RUBY_PATCHLEVEL 11
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_2/test/ruby/test_symbol.rb
===================================================================
--- ruby_2_2/test/ruby/test_symbol.rb	(revision 49273)
+++ ruby_2_2/test/ruby/test_symbol.rb	(revision 49274)
@@ -230,4 +230,12 @@ class TestSymbol < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_symbol.rb#L230
     end
     assert_nothing_raised(NoMethodError, bug10259) {obj.send("unagi=".intern, 1)}
   end
+
+  def test_symbol_fstr_leak
+    bug10686 = '[ruby-core:67268] [Bug #10686]'
+    x = 0
+    assert_no_memory_leak([], '', <<-"end;", bug10686)
+      200_000.times { |i| i.to_s.to_sym }
+    end;
+  end
 end

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49090


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