[Guile-commits] GNU Guile branch, master, updated. v2.1.0-761-g2a62eda

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=2a62eda85a6f838499792a8b7bbd1bcec05084a5

The branch, master has been updated
       via  2a62eda85a6f838499792a8b7bbd1bcec05084a5 (commit)
      from  24af549ac15110e6cdac326def3987a3aa4a0d2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2a62eda85a6f838499792a8b7bbd1bcec05084a5
Author: Andy Wingo <address@hidden>
Date:   Thu Feb 20 10:43:40 2014 +0100

    Fix "VM never extends vp->sp ..." commit
    
    * libguile/vm.c (vm_expand_stack): Make sure the new SP is visible to
      vm_error if we throw because of stack overflow.

-----------------------------------------------------------------------

Summary of changes:
 libguile/vm.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libguile/vm.c b/libguile/vm.c
index 10d800f..af1531b 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1018,7 +1018,7 @@ vm_expand_stack (struct scm_vm *vp, SCM *new_sp)
           SCM *fp;
           if (vp->fp)
             vp->fp += reloc;
-          vp->sp_max_since_gc += reloc;
+          new_sp += reloc;
           fp = vp->fp;
           while (fp)
             {
@@ -1031,10 +1031,10 @@ vm_expand_stack (struct scm_vm *vp, SCM *new_sp)
               fp = next_fp;
             }
         }
-
-      new_sp += reloc;
     }
 
+  vp->sp_max_since_gc = vp->sp = new_sp;
+
   if (stack_size >= vp->max_stack_size)
     {
       /* Expand the soft limit by 256K entries to give us space to
@@ -1055,7 +1055,6 @@ vm_expand_stack (struct scm_vm *vp, SCM *new_sp)
     }
 
   /* Otherwise continue, with the new enlarged stack.  */
-  vp->sp_max_since_gc = vp->sp = new_sp;
 }
 
 static struct scm_vm *


hooks/post-receive
-- 
GNU Guile