archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 35080: [Backport #7353]

Browse source 
* gc.c (free_method_entry_i): method entry may be in
	  unlinked_method_entry_list.  [ruby-core:43383][Bug #6171]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-15 06:20:18 +00:00
parent d3216922c2
commit 1fc111198a
4 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Nov 15 15:17:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (free_method_entry_i): method entry may be in
unlinked_method_entry_list. [ruby-core:43383][Bug #6171]
Wed Nov 14 20:20:46 2012 Naohisa Goto <ngotogenome@gmail.com> Wed Nov 14 20:20:46 2012 Naohisa Goto <ngotogenome@gmail.com>
* ruby_atomic.h: renamed from atomic.h to avoid header file name * ruby_atomic.h: renamed from atomic.h to avoid header file name

2
gc.c
View file

@ -1673,7 +1673,9 @@ mark_m_tbl(rb_objspace_t *objspace, st_table *tbl)
static int static int
free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data) free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data)
{ {
if (!me->mark) {
rb_free_method_entry(me); rb_free_method_entry(me);
}
return ST_CONTINUE; return ST_CONTINUE;
} }

12
test/ruby/test_method.rb
View file

@ -460,4 +460,16 @@ class TestMethod < Test::Unit::TestCase
assert_nothing_raised { v.instance_eval { mv2 } } assert_nothing_raised { v.instance_eval { mv2 } }
assert_nothing_raised { v.instance_eval { mv3 } } assert_nothing_raised { v.instance_eval { mv3 } }
end end
def test_bound_method_entry
bug6171 = '[ruby-core:43383]'
assert_ruby_status([], <<-EOC, bug6171)
class Bug6171
def initialize(target)
define_singleton_method(:reverse, target.method(:reverse).to_proc)
end
end
1000.times {p = Bug6171.new('test'); 10000.times {p.reverse}}
EOC
end
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 331 #define RUBY_PATCHLEVEL 332
#define RUBY_RELEASE_DATE "2012-11-15" #define RUBY_RELEASE_DATE "2012-11-15"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012