From 9b1ac02a8584ee7ca73a8f5920d7b33c0487bfc0 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 21 Oct 2015 10:48:15 +0200
Subject: [PATCH] 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 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libguile/eval.c b/libguile/eval.c
index 09fa71df4..6f2751970 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;