1.0.8.8: restore reuse-sap value after incomplete writes in FROB-OUTPUT-LATER

[sbcl.git] / src / compiler / locall.lisp

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index ee3b1e3..2c41365 100644 (file)
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -191,7 +191,7 @@
          (optional-dispatch-entry-point-fun fun 0)
          (loop for ep in (optional-dispatch-entry-points fun)
                and n from min
-               do (entries `((= ,n-supplied ,n)
+               do (entries `((eql ,n-supplied ,n)
                              (%funcall ,(force ep) ,@(subseq temps 0 n)))))
          `(lambda (,n-supplied ,@temps)
             ;; FIXME: Make sure that INDEX type distinguishes between
@@ -201,7 +201,9 @@
             (cond
              ,@(if more (butlast (entries)) (entries))
              ,@(when more
-                 `((,(if (zerop min) t `(>= ,n-supplied ,max))
+                 ;; KLUDGE: (NOT (< ...)) instead of >= avoids one round of
+                 ;; deftransforms and lambda-conversion.
+                 `((,(if (zerop min) t `(not (< ,n-supplied ,max)))
                     ,(let ((n-context (gensym))
                            (n-count (gensym)))
                        `(multiple-value-bind (,n-context ,n-count)
@@ -355,8 +357,7 @@
   (loop
    (let ((did-something nil))
      (dolist (clambda clambdas)
-       (let* ((component (lambda-component clambda))
-              (*all-components* (list component)))
+       (let ((component (lambda-component clambda)))
          ;; The original CMU CL code seemed to implicitly assume that
          ;; COMPONENT is the only one here. Let's make that explicit.
          (aver (= 1 (length (functional-components clambda))))