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

Timestamp:

03/27/11 10:50:56 (13 years ago)

Author:

Mark Evenson

Message:

Fix compilation of LOGAND for args that could possibly be nil.

Fixes ticket #142.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (2 diffs)

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

@@ -4409 +4409 @@
                 (convert-representation :int representation)
                 (emit-move-from-stack target representation))
-               ((or (and (fixnum-type-p type1)
+               ((or (and (fixnum-type-p type1) (member type2 '(:long :int))
                          (compiler-subtypep type1 'unsigned-byte))
-                    (and (fixnum-type-p type2)
+                    (and (fixnum-type-p type2) (member type1 '(:long :int))
                          (compiler-subtypep type2 'unsigned-byte)))
                 ;; One of the arguments is a positive fixnum.
@@ -4430 +4430 @@
                 (convert-representation :long representation)
                 (emit-move-from-stack target representation))
-               ((or (and (java-long-type-p type1)
+               ((or (and (java-long-type-p type1) (member type2 '(:long :int))
                          (compiler-subtypep type1 'unsigned-byte))
-                    (and (java-long-type-p type2)
+                    (and (java-long-type-p type2) (member type1 '(:long :int))
                          (compiler-subtypep type2 'unsigned-byte)))
                 ;; One of the arguments is a positive long.