Changeset 12841

Timestamp:

08/01/10 09:59:11 (13 years ago)

Author:

ehuelsmann

Message:

Fix dual-mode: the new style requires type specifiers, not strings.

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

@@ -463 +463 @@
          (descriptor (car info))
          (stack-effect (cdr info))
-         (class-name (!class-name class-name))
          (index (if (null *current-code-attribute*)
-                    (pool-method class-name method-name descriptor)
+                    (pool-method (!class-name class-name) method-name descriptor)
                     (pool-add-method-ref *pool* class-name
-                                         method-name descriptor)))
+                                         method-name (cons return-type arg-types))))
          (instruction (apply #'%emit 'invokestatic (u2 index))))
     (setf (instruction-stack instruction) stack-effect)))
@@ -489 +488 @@
          (descriptor (car info))
          (stack-effect (cdr info))
-         (class-name (!class-name class-name))
          (index (if (null *current-code-attribute*)
-                    (pool-method class-name method-name descriptor)
+                    (pool-method (!class-name class-name) method-name descriptor)
                     (pool-add-method-ref *pool* class-name
-                                         method-name descriptor)))
+                                         method-name (cons return-type arg-types))))
          (instruction (apply #'%emit 'invokevirtual (u2 index))))
     (declare (type (signed-byte 8) stack-effect))
@@ -511 +509 @@
          (descriptor (car info))
          (stack-effect (cdr info))
-         (class-name (!class-name class-name))
          (index (if (null *current-code-attribute*)
-                    (pool-method class-name "<init>" descriptor)
+                    (pool-method (!class-name  class-name) "<init>" descriptor)
                     (pool-add-method-ref *pool* class-name
-                                         "<init>" descriptor)))
+                                         "<init>" (cons nil arg-types))))
          (instruction (apply #'%emit 'invokespecial (u2 index))))
     (declare (type (signed-byte 8) stack-effect))