X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=f9b8849b5822b158dbe843d648c0c0058338a6e1;hb=975f1932acc3a8e90fb31d2b055bfbdde78ea927;hp=bc93706717157f007ad3bef0f3e34aa31c6e3b9d;hpb=4d8b3b1da4d960a6ff768c9e6ee8f99bf270b631;p=sbcl.git

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index bc93706..f9b8849 100644
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -43,21 +43,31 @@
              (setf (car args) nil)))
   (values))
 
+
+(defun handle-nested-dynamic-extent-lvars (arg)
+  (let ((uses (lvar-uses arg)))
+    ;; Stack analysis wants DX value generators to end their
+    ;; blocks. Uses of mupltiple used LVARs already end their blocks,
+    ;; so we just need to process used-once LVARs.
+    (when (node-p uses)
+      (node-ends-block uses)
+      (setf uses (list uses)))
+    ;; If the function result is DX, so are its arguments... This
+    ;; assumes that all our DX functions do not store their arguments
+    ;; anywhere -- just use, and maybe return.
+    (cons arg
+          (loop for use in uses
+                when (basic-combination-p use)
+                nconc (loop for a in (basic-combination-args use)
+                            append (handle-nested-dynamic-extent-lvars a))))))
+
 (defun recognize-dynamic-extent-lvars (call fun)
   (declare (type combination call) (type clambda fun))
   (loop for arg in (basic-combination-args call)
         and var in (lambda-vars fun)
-        when (and arg
-                  (lambda-var-dynamic-extent var)
+        when (and arg (lambda-var-dynamic-extent var)
                   (not (lvar-dynamic-extent arg)))
-        collect arg into dx-lvars
-        and do (let ((use (lvar-uses arg)))
-                 ;; Stack analysis wants DX value generators to end
-                 ;; their blocks. Uses of mupltiple used LVARs already
-                 ;; end their blocks, so we just need to process
-                 ;; used-once LVARs.
-                 (when (node-p use)
-                   (node-ends-block use)))
+        append (handle-nested-dynamic-extent-lvars arg) into dx-lvars
         finally (when dx-lvars
                   (binding* ((before-ctran (node-prev call))
                              (nil (ensure-block-start before-ctran))
@@ -191,7 +201,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 +211,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)