diff options
| author | nari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-28 03:12:33 +0000 |
|---|---|---|
| committer | nari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-28 03:12:33 +0000 |
| commit | e2f4f34467f90bc9bc30891c9cdb4aa82fa0e37c (patch) | |
| tree | f5dddef4bf8457a4c5ed9da918240eb836fc5dbc | |
| parent | 92b6597be67738490c0ab759303a0e81a421b89a (diff) | |
* gc.c (obj_free): doesn't free a method table if it doesn't
exits. [ruby-dev:44436]
* test/ruby/test_gc.rb (class TestGc): added the test case for
this issue.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gc.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_gc.rb | 14 |
3 files changed, 24 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Mon May 28 12:03:04 2012 Narihiro Nakamura <authornari@gmail.com> + + * gc.c (obj_free): doesn't free a method table if it doesn't + exits. [ruby-dev:44436] + * test/ruby/test_gc.rb (class TestGc): added the test case for + this issue. + Sun May 27 23:37:48 2012 Koichi Sasada <ko1@atdot.net> * benchmark/bm_vm1_lvar_init.rb: added. @@ -2501,7 +2501,9 @@ obj_free(rb_objspace_t *objspace, VALUE obj) case T_MODULE: case T_CLASS: rb_clear_cache_by_class((VALUE)obj); - rb_free_m_table(RCLASS_M_TBL(obj)); + if (RCLASS_M_TBL(obj)) { + rb_free_m_table(RCLASS_M_TBL(obj)); + } if (RCLASS_IV_TBL(obj)) { st_free_table(RCLASS_IV_TBL(obj)); } diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index adcf85e79e..782d8fde3d 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -78,6 +78,20 @@ class TestGc < Test::Unit::TestCase EOS end + def test_singleton_method_added + assert_in_out_err(%w[--disable-gems], <<-EOS, [], [], "[ruby-dev:44436]") + class BasicObject + def singleton_method_added(mid) + raise + end + end + b = proc {} + class << b; end + b.clone rescue nil + GC.start + EOS + end + def test_gc_parameter env = { "RUBY_GC_MALLOC_LIMIT" => "60000000", |