diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | parse.y | 7 | ||||
-rw-r--r-- | test/ruby/test_symbol.rb | 14 |
3 files changed, 15 insertions, 12 deletions
@@ -1,3 +1,9 @@ +Fri May 2 10:37:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (rb_id_attrset): turn dynamically interned Symbol into + an ID, since rb_str_dynamic_intern returns a Symbol but not an + ID. [ruby-core:62226] [Bug #9787] + Thu May 1 22:19:34 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * file.c: Change AND condition to nested condition. @@ -8862,12 +8862,7 @@ rb_id_attrset(ID id) /* make new dynamic symbol */ str = rb_str_dup(RSYMBOL((VALUE)id)->fstr); rb_str_cat(str, "=", 1); - id = (ID)rb_str_dynamic_intern(str); - if (ID_DYNAMIC_SYM_P(id)) { - /* attrset ID may have been registered as a static - * symbol */ - rb_pin_dynamic_symbol((VALUE)id); - } + id = SYM2ID(rb_str_dynamic_intern(str)); } return id; } diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index e74c41cd2d..686525e053 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -239,8 +239,8 @@ class TestSymbol < Test::Unit::TestCase end def test_gc_attrset - bug9787 = '[ruby-core:62226] [Bug #9787]' - assert_normal_exit(<<-'end;', '', child_env: '--disable-gems') + assert_separately(['-', '[ruby-core:62226] [Bug #9787]'], <<-'end;') # begin + bug = ARGV.shift def noninterned_name(prefix = "") prefix += "_#{Thread.current.object_id.to_s(36).tr('-', '_')}" begin @@ -248,11 +248,13 @@ class TestSymbol < Test::Unit::TestCase end while Symbol.find(name) or Symbol.find(name + "=") name end - n = noninterned_name("gc") - n.to_sym + names = Array.new(1000) {noninterned_name("gc")} + names.each {|n| n.to_sym} GC.start(immediate_sweep: false) - eval(":#{n}=") - eval("proc{self.#{n} = nil}") + names.each do |n| + eval(":#{n}=") + assert_nothing_raised(TypeError, bug) {eval("proc{self.#{n} = nil}")} + end end; end end |