Changeset 13536

Timestamp:

08/23/11 21:34:33 (10 years ago)

Author:

ehuelsmann

Message:

Move more static field initialization to the static class initializer
<clinit>() code.

Additionally, place some remarks where I expect issues once I start
compiling forward references the same way as backward references.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (6 diffs)

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

@@ -1393 +1393 @@
         (field-name (local-function-field local-function)))
     (with-code-to-method
-        (*class-file* (abcl-class-file-constructor *class-file*))
+        (*class-file* (abcl-class-file-static-initializer *class-file*))
       ;; fixme *declare-inline*
       (declare-field field-name +lisp-object+)
@@ -1417 +1417 @@
         (*class-file*
          (if *declare-inline* *method*
-             (abcl-class-file-constructor *class-file*)))
+             (abcl-class-file-static-initializer *class-file*)))
       ;; strings may contain evaluated bits which may depend on
       ;; previous statements
@@ -1433 +1433 @@
          (*class-file*
           (if *declare-inline* *method*
-              (abcl-class-file-constructor *class-file*)))
+              (abcl-class-file-static-initializer *class-file*)))
        ;; The readObjectFromString call may require evaluation of
        ;; lisp code in the string (think #.() syntax), of which the outcome
@@ -1456 +1456 @@
     (remember g obj)
     (with-code-to-method
-        (*class-file* (abcl-class-file-constructor *class-file*))
+        (*class-file* (abcl-class-file-static-initializer *class-file*))
       (declare-field g +lisp-object+)
       (emit 'ldc (pool-string g))
@@ -4150 +4150 @@
           (emit-move-from-stack target))
          ((inline-ok name)
+          ;; ### FASLATONCE: when compiling fasl functions after the
+          ;; full fasl has been processed, forward referenced functions
+          ;; may not be available during the load process
+          ;; This case is particularly triggered with circular referencing
+          ;; functions, both marked as 'notinline'
           (emit-getstatic *this-class*
                 (declare-function name) +lisp-object+)
@@ -4167 +4172 @@
          ((and (member name *functions-defined-in-current-file* :test #'equal)
                (not (notinline-p name)))
+          ;; ### FASLATONCE: when compiling fasl functions after the
+          ;; full fasl has been processed, forward referenced functions
+          ;; may not be available during the load process
+          ;; This case is particularly triggered with circular referencing
+          ;; functions, both marked as 'notinline'
           (emit-getstatic *this-class*
                 (declare-setf-function name) +lisp-object+)