Changeset 12505

Timestamp:

02/23/10 23:35:17 (14 years ago)

Author:

astalla

Message:

Added missing copy-tree for the function body in one case of lambda inlining,
which didn't play well with compiler macros (self-modifying code).
Should fix the bug found by Alan Ruttenberg on 2010-02-16.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp (modified) (5 diffs)

trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -204 +204 @@
                temp-bindings rest-binding)
     (setf bindings (append bindings rest-binding)))))
-
   ;;Aux parameters.
   (when aux
@@ -212 +211 @@
            :for var-info :in aux
            :collect `(,(var var-info) ,(initform var-info))))))
-  
   (values (append req-bindings temp-bindings bindings)
     ignorables)))))
@@ -319 +317 @@
            args)
   `(let* ,bindings
-     (declare (ignorable ,@ignorables))
+     ,@(when ignorables
+       `((declare (ignorable ,@ignorables))))
      ,@body))
     (lambda-list-mismatch (x)
@@ -1249 +1248 @@
     (if (and (listp op)
        (eq (car op) 'lambda))
-  (expand-function-call-inline form (cadr op) (cddr op) args)
+  (expand-function-call-inline form (cadr op) (copy-tree (cddr op)) args)
   (if (unsafe-p args)
       (let ((arg1 (car args)))
@@ -1276 +1275 @@
   (let ((new-form (rewrite-function-call form)))
     (when (neq new-form form)
-;;       (let ((*print-structure* nil))
-;;         (format t "old form = ~S~%" form)
-;;         (format t "new form = ~S~%" new-form))
       (return-from p1-function-call (p1 new-form))))
   (let* ((op (car form))