merges r25371 from trunk into ruby_1_9_1.

--
* bootstraptest/test_gc.rb: added tests based on [ruby-dev:39484]
  from wanabe <s.wanabe AT gmail.com>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 40 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 56510a5cc6..ba7777015d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 16 18:42:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bootstraptest/test_gc.rb: added tests based on [ruby-dev:39484]
+	  from wanabe <s.wanabe AT gmail.com>.
+
 Thu Oct 15 14:20:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_create): cannot retry with given block.
diff --git a/bootstraptest/test_gc.rb b/bootstraptest/test_gc.rb
new file mode 100644
index 0000000000..eb68c9845e
--- /dev/null
+++ b/bootstraptest/test_gc.rb
@@ -0,0 +1,34 @@
+assert_normal_exit %q{
+a = []
+ms = "a".."k"
+("A".."Z").each do |mod|
+  mod = eval("module #{mod}; self; end")
+  ms.each do |meth|
+    iseq = RubyVM::InstructionSequence.compile("module #{mod}; def #{meth}; end; end")
+    GC.stress = true
+    iseq.eval
+    GC.stress = false
+  end
+  o = Object.new.extend(mod)
+  ms.each do |meth|
+    o.send(meth)
+  end
+end
+}, '[ruby-dev:39453]'
+
+assert_normal_exit %q{
+a = []
+ms = "a".."k"
+("A".."Z").each do |mod|
+  mod = eval("module #{mod}; self; end")
+  ms.each do |meth|
+    GC.stress = true
+    mod.module_eval {define_method(meth) {}}
+    GC.stress = false
+  end
+  o = Object.new.extend(mod)
+  ms.each do |meth|
+    o.send(meth)
+  end
+end
+}, '[ruby-dev:39453]'
diff --git a/version.h b/version.h
index 2522b1dc72..10a1f8bc55 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 394
+#define RUBY_PATCHLEVEL 395
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1