[Guile-commits] 09/12: Fix boot closure wrong-num-args error

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 9b1ac02a8584ee7ca73a8f5920d7b33c0487bfc0
Author: Andy Wingo <address@hidden>
Date:   Wed Oct 21 10:48:15 2015 +0200

    Fix boot closure wrong-num-args error
    
    * libguile/eval.c (prepare_boot_closure_env_for_eval): Fix issue if
      fixed closure is called with wrong number of arguments during
      bootstrap.
---
 libguile/eval.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libguile/eval.c b/libguile/eval.c
index 09fa71d..6f27519 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -882,7 +882,8 @@ prepare_boot_closure_env_for_eval (SCM proc, unsigned int 
argc,
       *out_body = BOOT_CLOSURE_BODY (proc);
       *inout_env = new_env;
     }
-  else if (BOOT_CLOSURE_IS_REST (proc) && argc >= nreq)
+  else if (!BOOT_CLOSURE_IS_FIXED (proc) &&
+           BOOT_CLOSURE_IS_REST (proc) && argc >= nreq)
     {
       SCM rest;
       int i;