merges r21414 from trunk into ruby_1_9_1.

* cont.c (cont_restore_1): should not be inlined.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f4229b52..1b028ee28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 10 19:05:13 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* cont.c (cont_restore_1): should not be inlined.
+
 Fri Jan  9 13:20:08 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: rescue abnormal Encoding.locale_charmap value.
diff --git a/cont.c b/cont.c
index c0db5083a..f2ba013d9 100644
--- a/cont.c
+++ b/cont.c
@@ -289,7 +289,7 @@ cont_capture(volatile int *stat)
     }
 }
 
-NORETURN(static void cont_restore_1(rb_context_t *));
+NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
 
 static void
 cont_restore_1(rb_context_t *cont)