1.0.44.18: physenvanal: When checking closure-DXness, handle XEPs reasonably.

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

diff --git a/src/compiler/physenvanal.lisp b/src/compiler/physenvanal.lisp
index fe6769c..d067c27 100644 (file)
--- a/src/compiler/physenvanal.lisp
+++ b/src/compiler/physenvanal.lisp
@@ -219,12 +219,24 @@
 ;;; that need checking.
 (defun analyze-indirect-lambda-vars (component)
   (dolist (fun (component-lambdas component))
-    (unless (leaf-dynamic-extent fun)
-      (let ((closure (physenv-closure (lambda-physenv fun))))
-        (dolist (var closure)
-          (when (and (lambda-var-p var)
-                     (lambda-var-indirect var))
-            (setf (lambda-var-explicit-value-cell var) t)))))))
+    (let ((entry-fun (functional-entry-fun fun)))
+      ;; We also check the ENTRY-FUN, as XEPs for LABELS or FLET
+      ;; functions aren't set to be DX even if their underlying
+      ;; CLAMBDAs are, and if we ever get LET-bound anonymous function
+      ;; DX working, it would mark the XEP as being DX but not the
+      ;; "real" CLAMBDA.  This works because a FUNCTIONAL-ENTRY-FUN is
+      ;; either NULL, a self-pointer (for :TOPLEVEL functions), a
+      ;; pointer from an XEP to its underlying function (for :EXTERNAL
+      ;; functions), or a pointer from an underlying function to its
+      ;; XEP (for non-:TOPLEVEL functions with XEPs).
+      (unless (or (leaf-dynamic-extent fun)
+                  (and entry-fun
+                       (leaf-dynamic-extent entry-fun)))
+        (let ((closure (physenv-closure (lambda-physenv fun))))
+          (dolist (var closure)
+            (when (and (lambda-var-p var)
+                       (lambda-var-indirect var))
+              (setf (lambda-var-explicit-value-cell var) t))))))))
 \f
 ;;;; non-local exit