1.0.15.10: ASSOC and MEMBER were broken for :KEY #'IDENTITY

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

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index f9b8849..3faf635 100644 (file)
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -43,23 +43,25 @@
              (setf (car args) nil)))
   (values))
 
-
-(defun handle-nested-dynamic-extent-lvars (arg)
-  (let ((uses (lvar-uses arg)))
+(defun handle-nested-dynamic-extent-lvars (lvar)
+  (let ((uses (lvar-uses lvar)))
     ;; 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))))))
+      (node-ends-block uses))
+    ;; If this LVAR's USE is good for DX, it must be a regular
+    ;; combination, and its arguments are potentially DX as well.
+    (flet ((recurse (use)
+             (loop for arg in (combination-args use)
+                   append (handle-nested-dynamic-extent-lvars arg))))
+      (cons lvar
+            (if (listp uses)
+                (loop for use in uses
+                      when (use-good-for-dx-p use)
+                      nconc (recurse use))
+                (when (use-good-for-dx-p uses)
+                  (recurse uses)))))))
 
 (defun recognize-dynamic-extent-lvars (call fun)
   (declare (type combination call) (type clambda fun))
@@ -593,7 +595,7 @@
                (declare (ignorable ,@ignores))
                (%funcall ,entry ,@args))
             :debug-name (debug-name 'hairy-function-entry
-                                    (lvar-fun-name
+                                    (lvar-fun-debug-name
                                      (basic-combination-fun call)))))))
     (convert-call ref call new-fun)
     (dolist (ref (leaf-refs entry))