From ea3f34c77fe8cd4003ff083194de28b9dff0dbaa Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Jan 2009 02:11:38 +0000
Subject: * cont.c (cont_restore_0): padding size doesn't need to be large   if
 alloca is used.  suppress warnings.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 cont.c    | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12312032a..bd1c51664 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 17 11:12:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (cont_restore_0): padding size doesn't need to be large
+	  if alloca is used.  suppress warnings.
+
 Sat Jan 17 11:12:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_dump.c (vm_stack_dump_each): initialized at declarations.
diff --git a/cont.c b/cont.c
index 0e80afd4f..483fda0ec 100644
--- a/cont.c
+++ b/cont.c
@@ -403,7 +403,11 @@ static void
 cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
 {
     if (cont->machine_stack_src) {
+#ifdef HAVE_ALLOCA
+#define STACK_PAD_SIZE 1
+#else
 #define STACK_PAD_SIZE 1024
+#endif
 	VALUE space[STACK_PAD_SIZE];
 
 #if !STACK_GROW_DIRECTION
@@ -411,9 +415,11 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
 	    /* Stack grows downward */
 #endif
 #if STACK_GROW_DIRECTION <= 0
-	    if (&space[0] > cont->machine_stack_src) {
+	    volatile VALUE *const end = cont->machine_stack_src;
+	    if (&space[0] > end) {
 # ifdef HAVE_ALLOCA
-		ALLOCA_N(VALUE, &space[0] - cont->machine_stack_src);
+		volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
+		(void)sp;
 # else
 		cont_restore_0(cont, &space[0]);
 # endif
@@ -425,9 +431,11 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
 	    /* Stack grows upward */
 #endif
 #if STACK_GROW_DIRECTION >= 0
-	    if (&space[STACK_PAD_SIZE] < cont->machine_stack_src + cont->machine_stack_size) {
+	    volatile VALUE *const end = cont->machine_stack_src + cont->machine_stack_size;
+	    if (&space[STACK_PAD_SIZE] < end) {
 # ifdef HAVE_ALLOCA
-		ALLOCA_N(VALUE, cont->machine_stack_src + cont->machine_stack_size - &space[STACK_PAD_SIZE]);
+		volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
+		(void)sp;
 # else
 		cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
 # endif
-- 
cgit