Changeset 15037

Timestamp:

06/03/17 04:35:50 (6 years ago)

Author:

Mark Evenson

Message:

Fix MAX type derivation
(Olof-Joachim Frahm)

C.f. <​http://abcl.org/trac/ticket/258>.

From <​https://github.com/Ferada/abcl/commit/013fb56d5c5fc4d4837ffc4c67e9909db56cbabf>.

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/compiler-pass2.lisp (modified) (1 diff)
• src/org/armedbear/lisp/compiler-types.lisp (modified) (1 diff)
• test/lisp/abcl/math-tests.lisp (modified) (1 diff)

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

@@ -5250 +5250 @@
       (derive-compiler-types args op))))
 
-(define-int-bounds-derivation max (low1 low2 high1 high2)
+(define-int-bounds-derivation max (low1 high1 low2 high2)
   (values (or (when (and low1 low2) (max low1 low2)) low1 low2)
           ; if either maximum is unbound, their maximum is unbound

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

@@ -61 +61 @@
   low
   high)
+
+(defmethod print-object ((type integer-type) stream)
+  (print-unreadable-object (type stream :type t :identity t)
+    (format stream "~D ~D" (integer-type-low type) (integer-type-high type))))
 
 (defconstant +fixnum-type+  (%make-integer-type most-negative-fixnum

trunk/abcl/test/lisp/abcl/math-tests.lisp

@@ -476 +476 @@
   :results 0)
 
-
-     
+(define-compiler-test math.max.1
+    (lambda (a b)
+      (declare (type (integer * 6488318769) b))
+      (max 1 (the (integer * 5711538578) a) b 2 1351352470))
+  :args (5711538444 6488318765)
+  :results 6488318765)