Changeset 11896

Timestamp:

05/18/09 20:28:02 (14 years ago)

Author:

ehuelsmann

Message:

Followup to r11892: use the field class too
when caching, the caller assumes that specific
class.

Note to self: this definitely needs cleanup later.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• compiler-pass2.lisp (modified) (2 diffs)
• jvm.lisp (modified) (1 diff)

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

@@ -2198 +2198 @@
 
 The field type of the object is specified by OBJ-REF."
-  (let ((field-name (gethash1 obj *declared-objects*)))
+  (let ((field-name (gethash1 (list obj obj-ref) *declared-objects*)))
     (if field-name
         field-name
@@ -2214 +2214 @@
           (emit 'putstatic *this-class* g2 obj-ref)
           (setf *static-code* *code*)
-          (setf (gethash obj *declared-objects*) g2))))))
+          (setf (gethash (list obj obj-ref) *declared-objects*) g2))))))
 
 (defun declare-lambda (obj)

trunk/abcl/src/org/armedbear/lisp/jvm.lisp

@@ -108 +108 @@
   (floats (make-hash-table :test 'eql))
   (doubles (make-hash-table :test 'eql))
-  (objects (make-hash-table :test 'eq)))
+  (objects (make-hash-table :test 'equal)))
 
 (defun class-name-from-filespec (filespec)