From fe92bc26a67c3092b64851cef06ab5a072bd705b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 27 May 2018 22:04:27 -0400 Subject: [PATCH] Avoid inexact arithmetic in the type inferrer for 'sqrt'. * module/language/cps/types.scm: Use 'exact-integer-sqrt' and avoid inexact arithmetic in the range analysis of the type inferrer for 'sqrt'. --- module/language/cps/types.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/module/language/cps/types.scm b/module/language/cps/types.scm index b40e48c6f..bac25cf20 100644 --- a/module/language/cps/types.scm +++ b/module/language/cps/types.scm @@ -1668,13 +1668,16 @@ where (A0 <= A <= A1) and (B0 <= B <= B1)." (define-type-inferrer (sqrt x result) (let ((type (&type x))) (cond - ((and (zero? (logand type &complex)) (<= 0 (&min x))) + ((and (zero? (logand type &complex)) + (non-negative? (&min x))) (define! result (logior type &flonum) - (inexact->exact (floor (sqrt (&min x)))) + (exact-integer-sqrt (&min x)) (if (inf? (&max x)) +inf.0 - (inexact->exact (ceiling (sqrt (&max x))))))) + (call-with-values (lambda () (exact-integer-sqrt (&max x))) + (lambda (s r) + (if (zero? r) s (+ s 1))))))) (else (define! result (logior type &flonum &complex) -inf.0 +inf.0)))))