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

1 files changed, 1 insertions, 0 deletions

diff --git a/proc.c b/proc.c
index 7e90ab6e2a..8b13b3ebf9 100644
--- a/proc.c
+++ b/proc.c
@@ -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;