[armedbear-cvs] r12893 - branches/generic-class-file/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Fri Aug 13 15:19:06 2010
New Revision: 12893

Log:
Now that we migrated to the new pool, clean up some code
explicitly testing for that.
Also, fix the last commit (ANALYZE-ARGS).

Modified:
   branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Modified: branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	(original)
+++ branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Fri Aug 13 15:19:06 2010
@@ -291,31 +291,23 @@
 (declaim (inline emit-getstatic emit-putstatic))
 (defknown emit-getstatic (t t t) t)
 (defun emit-getstatic (class-name field-name type)
-  (let ((index (if (null *current-code-attribute*)
-                   (pool-field class-name field-name type)
-                   (pool-add-field-ref *pool* class-name field-name type))))
+  (let ((index (pool-add-field-ref *pool* class-name field-name type)))
     (apply #'%emit 'getstatic (u2 index))))
 
 (defknown emit-putstatic (t t t) t)
 (defun emit-putstatic (class-name field-name type)
-  (let ((index (if (null *current-code-attribute*)
-                   (pool-field class-name field-name type)
-                   (pool-add-field-ref *pool* class-name field-name type))))
+  (let ((index (pool-add-field-ref *pool* class-name field-name type)))
     (apply #'%emit 'putstatic (u2 index))))
 
 (declaim (inline emit-getfield emit-putfield))
 (defknown emit-getfield (t t t) t)
 (defun emit-getfield (class-name field-name type)
-  (let* ((index (if (null *current-code-attribute*)
-                    (pool-field class-name field-name type)
-                    (pool-add-field-ref *pool* class-name field-name type))))
+  (let* ((index (pool-add-field-ref *pool* class-name field-name type)))
     (apply #'%emit 'getfield (u2 index))))
 
 (defknown emit-putfield (t t t) t)
 (defun emit-putfield (class-name field-name type)
-  (let* ((index (if (null *current-code-attribute*)
-                    (pool-field class-name field-name type)
-                    (pool-add-field-ref *pool* class-name field-name type))))
+  (let* ((index (pool-add-field-ref *pool* class-name field-name type)))
     (apply #'%emit 'putfield (u2 index))))
 
 
@@ -6880,7 +6872,7 @@
            (lisp-object-arg-types arg-count))
           (t (setf *using-arg-array* t)
              (setf (compiland-arity compiland) arg-count)
-             +lisp-object-array+))))
+             (list +lisp-object-array+)))))
 
 (defmacro with-open-class-file ((var class-file) &body body)
   `(with-open-file (,var (abcl-class-file-pathname ,class-file)