diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 18:47:16 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 18:47:16 +0000 |
commit | 44212576f5b2bfe92f1df31f9b75cb23d6086c64 (patch) | |
tree | ed89864fae22db8e29575ba1894a1b6b797086db /proc.c | |
parent | 35cc23f49367c83f35efa5c9f94ee17706007915 (diff) |
merge revision(s) 39905,39919,39925,39945: [Backport #8163]
* test/ruby/envutil.rb (assert_ruby_status): include stderr output. unlinked method entry. [Bug #8100] [ruby-core:53439]
* proc.c (bm_free): need to clean up the mark flag of a free and
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -905,6 +905,7 @@ bm_free(void *ptr) { struct METHOD *data = ptr; struct unlinked_method_entry_list_entry *ume = data->ume; + data->me->mark = 0; ume->me = data->me; ume->next = GET_VM()->unlinked_method_entry_list; GET_VM()->unlinked_method_entry_list = ume; |