Changeset 12633

Timestamp:

04/24/10 15:46:29 (13 years ago)

Author:

ehuelsmann

Message:

Move a section of code around to separate the

class file finalization from the method finalization.

File:

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

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

@@ -8541 +8541 @@
       (setf *code* (nconc code *code*)))
 
+    (setf (abcl-class-file-superclass class-file)
+          (if (or *hairy-arglist-p*
+      (and *child-p* *closure-variables*))
+        +lisp-compiled-closure-class+
+      +lisp-primitive-class+))
+
+    (setf (abcl-class-file-lambda-list class-file) args)
+    (setf (method-max-locals execute-method) *registers-allocated*)
+    (push execute-method (abcl-class-file-methods class-file))
+
+
+    ;;;  Move here
     (finalize-code)
     (optimize-code)
@@ -8554 +8566 @@
                             (symbol-value (handler-to handler))))
                      *handlers*))
-
-    (setf (method-max-locals execute-method) *registers-allocated*)
-    (setf (method-handlers execute-method) (nreverse *handlers*))
-
-    (setf (abcl-class-file-superclass class-file)
-          (if (or *hairy-arglist-p*
-      (and *child-p* *closure-variables*))
-        +lisp-compiled-closure-class+
-      +lisp-primitive-class+))
-
-    (setf (abcl-class-file-lambda-list class-file) args)
-
-    (push execute-method (abcl-class-file-methods class-file)))
+    ;;; to here
+    ;;; To a separate function which is part of class file finalization
+    ;;;  when we have a section of class-file-generation centered code
+
+
+    (setf (method-handlers execute-method) (nreverse *handlers*)))
   t)