Changeset 13470

Timestamp:

08/12/11 19:43:37 (11 years ago)

Author:

ehuelsmann

Message:

Explicitly record the children of a compiland for later use,
instead of counting them, even though we only needed a HAS-CHILDREN boolean.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• compiler-pass1.lisp (modified) (3 diffs)
• compiler-pass2.lisp (modified) (1 diff)
• jvm.lisp (modified) (1 diff)

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

@@ -727 +727 @@
   `(let ((*visible-variables* *visible-variables*)
          (*local-functions* *local-functions*)
-         (*current-compiland* *current-compiland*)
+         (parent-compiland *current-compiland*)
          (,local-functions-var '()))
-     (incf (compiland-children *current-compiland*) (length (cadr ,form)))
      (dolist (definition (cadr ,form))
        (let ((,name-var (car definition))
@@ -736 +735 @@
          (let* ((,body-var (cddr definition))
                 (compiland (make-compiland :name ,name-var
-                                           :parent *current-compiland*)))
+                                           :parent parent-compiland)))
+           (push compiland (compiland-children parent-compiland))
            ,@body1)))
      (setf ,local-functions-var (nreverse ,local-functions-var))
@@ -1022 +1022 @@
                                              :lambda-expression lambda-form
                                              :parent *current-compiland*)))
-             (when *current-compiland*
-               (incf (compiland-children *current-compiland*)))
+             (push compiland (compiland-children *current-compiland*))
              (multiple-value-bind (body decls)
                  (parse-body body)

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

@@ -7089 +7089 @@
                (not (variable-special-p variable))
                (not (variable-used-non-locally-p variable))
-               (zerop (compiland-children *current-compiland*)))
+               (null (compiland-children *current-compiland*)))
       (when (memq (type-representation (variable-declared-type variable))
                   '(:int :long))

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

@@ -200 +200 @@
   p1-result         ; the parse tree as created in pass 1
   parent            ; the parent for compilands which defined within another
-  (children 0       ; Number of local functions
-            :type fixnum) ; defined with FLET, LABELS or LAMBDA
+  children          ; List of local compilands
+                    ; defined with FLET, LABELS or LAMBDA
   blocks            ; TAGBODY, PROGV, BLOCK, etc. blocks
   argument-register