1.0.19.1: DERIVE-TYPE optimizer for %%PRIMITIVE

[sbcl.git] / src / code / sort.lisp

diff --git a/src/code/sort.lisp b/src/code/sort.lisp
index 83e9898..1d6949f 100644 (file)
--- a/src/code/sort.lisp
+++ b/src/code/sort.lisp
@@ -240,8 +240,8 @@
                 (simple-vector ,temp))
        (when (> ,vector-len ,temp-len)
          (setf ,temp (make-array (max ,vector-len
-                                      (min most-positive-fixnum
-                                           (+ ,temp-len ,temp-len))))
+                                      (min (truncate array-dimension-limit 2)
+                                           (logand most-positive-fixnum (+ ,temp-len ,temp-len)))))
                *merge-sort-temp-vector* ,temp))
        ;; Rebind, in case PRED or KEY calls STABLE-SORT. This is also
        ;; interrupt safe: we bind before we put any data of our own in
@@ -297,10 +297,6 @@
 
 ) ; EVAL-when
 
-;;; temporary vector for stable sorting vectors, allocated for each new thread
-(defvar *merge-sort-temp-vector* (vector))
-(declaim (simple-vector *merge-sort-temp-vector*))
-
 (defun stable-sort-simple-vector (vector pred key)
   (declare (type simple-vector vector)
            (type function pred)