Changeset 13486

Timestamp:

08/13/11 10:30:16 (11 years ago)

Author:

ehuelsmann

Message:

Assign all local functions a field in the immediate parent;
also make sure all compiland children have known class names
before processing the body of the compiland.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

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

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

@@ -4033 +4033 @@
   "Creates a class file associated with `compiland`, writing it
 either to stream or the pathname of the class file if `stream' is NIL."
-  (let* ((pathname (funcall *pathnames-generator*))
-         (class-file (make-abcl-class-file
-                      :pathname pathname)))
-    (setf (compiland-class-file compiland) class-file)
+  (let* ((class-file (compiland-class-file compiland))
+         (pathname (abcl-class-file-pathname class-file)))
     (with-open-stream (f (or stream
                              (open pathname :direction :output
@@ -4045 +4043 @@
           (with-saved-compiler-policy
               (p2-compiland compiland)
-            ;;        (finalize-class-file (compiland-class-file compiland))
             (finish-class (compiland-class-file compiland) f)))))))
 
@@ -4139 +4136 @@
 (defun p2-lambda (local-function target)
   (let ((compiland (local-function-compiland local-function)))
-    (aver (null (compiland-class-file compiland)))
+    (aver (not (null (compiland-class-file compiland))))
     (cond (*file-compilation*
            (compile-and-write-to-stream compiland)
@@ -7094 +7091 @@
   t)
 
+
+(defun assign-field-and-class-name (local-function)
+  (let* ((pathname (funcall *pathnames-generator*))
+         (class-file (make-abcl-class-file :pathname pathname))
+         (compiland (local-function-compiland local-function)))
+    (setf (compiland-class-file compiland) class-file))
+  (setf (local-function-field local-function)
+        (declare-local-function local-function)))
+
 (defknown p2-compiland (t) t)
 (defun p2-compiland (compiland)
@@ -7144 +7150 @@
           (code-add-attribute *current-code-attribute* table)
           (line-numbers-add-line table 0 *source-line-number*)))
+
+      (dolist (local-function (compiland-children compiland))
+        (assign-field-and-class-name local-function))
 
       (dolist (var (compiland-arg-vars compiland))

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

@@ -376 +376 @@
   definition
   compiland
+  field
   inline-expansion
   variable    ;; the variable which contains the loaded compiled function