Changeset 13519

Timestamp:

08/20/11 21:55:30 (10 years ago)

Author:

ehuelsmann

Message:

Generate <clinit>() functions for the initialization of static variables.
After this change, it should be possible to run the constructor of
compiled functions more than once.

File:

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

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

@@ -1061 +1061 @@
     ;; We don't normally need to see debugging output for <clinit>.
     (with-code-to-method (class method)
-      (setf (code-max-locals *current-code-attribute*) 0)
-      (emit 'return)
       method)))
 
@@ -1074 +1072 @@
 extend the class any further."
   (with-code-to-method (class (abcl-class-file-constructor class))
+    (emit 'return))
+  (with-code-to-method (class (abcl-class-file-static-initializer class))
     (emit 'return))
   (finalize-class-file class)
@@ -1308 +1308 @@
         ((not *file-compilation*)
          (with-code-to-method
-             (*class-file* (abcl-class-file-constructor *class-file*))
+             (*class-file* (abcl-class-file-static-initializer *class-file*))
            (remember field-name object)
            (emit 'ldc (pool-string field-name))
@@ -1321 +1321 @@
         (t
          (with-code-to-method
-             (*class-file* (abcl-class-file-constructor *class-file*))
+             (*class-file* (abcl-class-file-static-initializer *class-file*))
            (funcall dispatch-fn object)
            (emit-putstatic *this-class* field-name field-type))))
@@ -7077 +7077 @@
       (setf (abcl-class-file-constructor class-file) constructor)
       (class-add-method class-file constructor))
-    #+enable-when-generating-clinit
     (let ((clinit (make-static-initializer class-file)))
       (setf (abcl-class-file-static-initializer class-file) clinit)