From cdeea489cbde0fe510539393b02c9473ee8e2344 Mon Sep 17 00:00:00 2001 From: Marius Gerbershagen Date: Thu, 1 Apr 2021 16:18:52 +0200 Subject: [PATCH] cmp: fix typo to make constant folding work again --- src/cmp/cmpeval.lsp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/cmp/cmpeval.lsp b/src/cmp/cmpeval.lsp index 5749c47aa..85ff24bb5 100644 --- a/src/cmp/cmpeval.lsp +++ b/src/cmp/cmpeval.lsp @@ -173,14 +173,15 @@ (push v all-values) (return nil)) finally - (let ((results (multiple-value-list (apply fname (nreverse all-values))))) - (if (endp (rest results)) - (c1constant-value (first results) :only-small-values nil) - (let ((results (mapcar (lambda (r) - (c1constant-value r :only-small-values nil)) - results))) - (when (every #'identity results) - (make-c1form* 'values :args results)))))) + (return + (let ((results (multiple-value-list (apply fname (nreverse all-values))))) + (if (endp (rest results)) + (c1constant-value (first results) :only-small-values nil) + (let ((results (mapcar (lambda (r) + (c1constant-value r :only-small-values nil)) + results))) + (when (every #'identity results) + (make-c1form* 'values :args results))))))) (error (c) (cmpdebug "Can't constant-fold ~s ~s: ~a~%" fname forms c))))) (defun c2expr (form)