[Guile-commits] 01/01: Fix eta-conversion edge cases in peval.

[Mark H. Weaver]

mhw pushed a commit to branch stable-2.2
in repository guile.

commit b56e084c77914a7fde558e8fd28a218759a4ddd7
Author: Mark H Weaver <address@hidden>
Date:   Thu Mar 15 23:22:26 2018 -0400

    Fix eta-conversion edge cases in peval.
    
    Fixes <https://bugs.gnu.org/29520>.
    Reported by Stefan Israelsson Tampe <address@hidden>.
    
    * module/language/tree-il/peval.scm (peval)[lift-applied-lambda]: Before
    performing eta-conversion, check that the variable(s) passed to the
    inner 'apply' are not referenced from the inner lambda, and that the
    number of required arguments would not be reduced by the conversion.
---
 module/language/tree-il/peval.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/language/tree-il/peval.scm 
b/module/language/tree-il/peval.scm
index 993fa0a..13b7d9b 100644
--- a/module/language/tree-il/peval.scm
+++ b/module/language/tree-il/peval.scm
@@ -1585,11 +1585,15 @@ top-level bindings from ENV and return the resulting 
expression."
          (and (not opt) rest (not kw)
               (match body
                 (($ <primcall> _ 'apply
-                    (($ <lambda> _ _ (and lcase ($ <lambda-case>)))
+                    (($ <lambda> _ _ (and lcase ($ <lambda-case> _ req1)))
                      ($ <lexical-ref> _ _ sym)
                      ...))
                  (and (equal? sym gensyms)
                       (not (lambda-case-alternate lcase))
+                      (<= (length req) (length req1))
+                      (every (lambda (s)
+                               (= (lexical-refcount s) 1))
+                             sym)
                       lcase))
                 (_ #f))))
        (let* ((vars (map lookup-var gensyms))