Changeset 12768

Timestamp:

06/27/10 10:10:38 (13 years ago)

Author:

ehuelsmann

Message:

Fix elimination of unused local functions:
macroexpand before scanning the body.

Found by: William Wadsworth (will wadsworth 10 at gmail com)

File:

• trunk/abcl/src/org/armedbear/lisp/precompiler.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/precompiler.lisp

@@ -789 +789 @@
         (operator (car form))
         (locals (cadr form))
-        (body (cddr form)))
+        ;; precompile (thus macro-expand) the body before inspecting it
+        ;; for the use of our locals and optimizing them away
+        (body (mapcar #'precompile1 (cddr form))))
     (dolist (local locals)
       (let* ((name (car local))
@@ -821 +823 @@
     (list* (car form)
            (precompile-local-functions locals)
-           (mapcar #'precompile1 body))))
+           body)))
 
 (defun precompile-function (form)