[Guile-commits] GNU Guile branch, master, updated. release_1-9-12-211-g2b41a37

[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=2b41a37b3c4127d4a7f95d032ef63f9f8b9e5035

The branch, master has been updated
       via  2b41a37b3c4127d4a7f95d032ef63f9f8b9e5035 (commit)
      from  e78d4bf9a9501654024a18f8d0baa1597d57fcb8 (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 2b41a37b3c4127d4a7f95d032ef63f9f8b9e5035
Author: Andy Wingo <address@hidden>
Date:   Wed Oct 13 21:18:44 2010 +0200

    fix bug in with-fluids in a non-tail position
    
    * libguile/vm-i-system.c (VM_DEFINE_INSTRUCTION): Drop the stack items
      corresponding the the with-fluids object. Thanks very much to Stefan
      Israelsson Tampe for the fix.

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

Summary of changes:
 libguile/vm-i-system.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 16b74e2..62b5e1a 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -1575,11 +1575,12 @@ VM_DEFINE_INSTRUCTION (89, wind_fluids, "wind-fluids", 
1, -1, 0)
   unsigned n = FETCH ();
   SCM wf;
   
-  if (sp - 2*n < SCM_FRAME_UPPER_ADDRESS (fp))
-    goto vm_error_stack_underflow;
-
   SYNC_REGISTER ();
-  wf = scm_i_make_with_fluids (n, sp + 1 - 2*n, sp + 1 - n);
+  sp -= 2 * n;
+  CHECK_UNDERFLOW ();
+  wf = scm_i_make_with_fluids (n, sp + 1, sp + 1 + n);
+  NULLSTACK (2 * n);
+
   scm_i_swap_with_fluids (wf, dynstate);
   scm_i_set_dynwinds (scm_cons (wf, scm_i_dynwinds ()));
   NEXT;


hooks/post-receive
-- 
GNU Guile