Changeset 12893 for branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Timestamp:

08/13/10 19:19:06 (13 years ago)

Author:

ehuelsmann

Message:

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

File:

• branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (3 diffs)

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

@@ -292 +292 @@
 (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))))
 
@@ -307 +303 @@
 (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))))
 
@@ -6881 +6873 @@
           (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)