Changeset 11898 for trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Timestamp:

05/18/09 21:21:02 (14 years ago)

Author:

ehuelsmann

Message:

Revert r11892 and r11896 because they keep causing breakage
in different places.

We need general infrastructure for this problem. To come.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.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 (list obj obj-ref) *declared-objects*)))
-    (if field-name
-        field-name
-      (let ((key (symbol-name (gensym "OBJ"))))
-        (remember key obj)
-        (let* ((g1 (declare-string key))
-               (g2 (symbol-name (gensym "O2BJ")))
-               (*code* *static-code*))
-          (declare-field g2 obj-ref)
-          (emit 'getstatic *this-class* g1 +lisp-simple-string+)
-          (emit-invokestatic +lisp-class+ "recall"
-                             (list +lisp-simple-string+) +lisp-object+)
-          (when (and obj-class (string/= obj-class +lisp-object-class+))
-            (emit 'checkcast obj-class))
-          (emit 'putstatic *this-class* g2 obj-ref)
-          (setf *static-code* *code*)
-          (setf (gethash (list obj obj-ref) *declared-objects*) g2))))))
+  (let ((key (symbol-name (gensym "OBJ"))))
+    (remember key obj)
+    (let* ((g1 (declare-string key))
+           (g2 (symbol-name (gensym "O2BJ"))))
+      (let* ((*code* *static-code*))
+      (declare-field g2 obj-ref)
+      (emit 'getstatic *this-class* g1 +lisp-simple-string+)
+      (emit-invokestatic +lisp-class+ "recall"
+                         (list +lisp-simple-string+) +lisp-object+)
+      (when (and obj-class (string/= obj-class +lisp-object-class+))
+        (emit 'checkcast obj-class))
+      (emit 'putstatic *this-class* g2 obj-ref)
+      (setf *static-code* *code*)
+      g2))))
 
 (defun declare-lambda (obj)