Changeset 13228

Timestamp:

02/25/11 22:43:08 (11 years ago)

Author:

astalla

Message:

Fix incorrect elimination of named local functions declared inline when they're actually reified in the flet/labels body.

File:

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

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

@@ -933 +933 @@
      (dolist (special (flet-free-specials block))
        (push special *visible-variables*))
-     (setf (flet-form block)
-     (list* (car form)
-      (remove-if (lambda (fn)
-             (and (inline-p (local-function-name fn))
-            (not (local-function-references-needed-p fn))))
-           local-functions)
-      (p1-body (cddr form))))
-     block)))))
+           (let ((body (p1-body (cddr form))))
+             (setf (flet-form block)
+                   (list* (car form)
+                          (remove-if (lambda (fn)
+                                       (and (inline-p (local-function-name fn))
+                                            (not (local-function-references-needed-p fn))))
+                                     local-functions)
+                          body)))
+           block)))))
 
 
@@ -1034 +1035 @@
              (list 'FUNCTION compiland)))
           ((setf local-function (find-local-function (cadr form)))
-           (dformat t "p1-function local function ~S~%" (cadr form))
-     ;;we found out that the function needs a reference
-     (setf (local-function-references-needed-p local-function) t)
+           (dformat "p1-function local function ~S~%" (cadr form))
+           ;;we found out that the function needs a reference
+           (setf (local-function-references-needed-p local-function) t)
            (let ((variable (local-function-variable local-function)))
              (when variable