Changeset 12893


Ignore:
Timestamp:
08/13/10 19:19:06 (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/generic-class-file/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r12892 r12893  
    292292(defknown emit-getstatic (t t t) t)
    293293(defun emit-getstatic (class-name field-name type)
    294   (let ((index (if (null *current-code-attribute*)
    295                    (pool-field class-name field-name type)
    296                    (pool-add-field-ref *pool* class-name field-name type))))
     294  (let ((index (pool-add-field-ref *pool* class-name field-name type)))
    297295    (apply #'%emit 'getstatic (u2 index))))
    298296
    299297(defknown emit-putstatic (t t t) t)
    300298(defun emit-putstatic (class-name field-name type)
    301   (let ((index (if (null *current-code-attribute*)
    302                    (pool-field class-name field-name type)
    303                    (pool-add-field-ref *pool* class-name field-name type))))
     299  (let ((index (pool-add-field-ref *pool* class-name field-name type)))
    304300    (apply #'%emit 'putstatic (u2 index))))
    305301
     
    307303(defknown emit-getfield (t t t) t)
    308304(defun emit-getfield (class-name field-name type)
    309   (let* ((index (if (null *current-code-attribute*)
    310                     (pool-field class-name field-name type)
    311                     (pool-add-field-ref *pool* class-name field-name type))))
     305  (let* ((index (pool-add-field-ref *pool* class-name field-name type)))
    312306    (apply #'%emit 'getfield (u2 index))))
    313307
    314308(defknown emit-putfield (t t t) t)
    315309(defun emit-putfield (class-name field-name type)
    316   (let* ((index (if (null *current-code-attribute*)
    317                     (pool-field class-name field-name type)
    318                     (pool-add-field-ref *pool* class-name field-name type))))
     310  (let* ((index (pool-add-field-ref *pool* class-name field-name type)))
    319311    (apply #'%emit 'putfield (u2 index))))
    320312
     
    68816873          (t (setf *using-arg-array* t)
    68826874             (setf (compiland-arity compiland) arg-count)
    6883              +lisp-object-array+))))
     6875             (list +lisp-object-array+)))))
    68846876
    68856877(defmacro with-open-class-file ((var class-file) &body body)
Note: See TracChangeset for help on using the changeset viewer.