0.pre7.86:

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

diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp
index 410fdfd..716afa1 100644 (file)
--- a/src/compiler/locall.lisp
+++ b/src/compiler/locall.lisp
@@ -283,7 +283,6 @@
 
 (defun local-call-analyze-until-done (clambdas)
   (loop
-   (/show "at head of LOCAL-CALL-ANALYZE-UNTIL-DONE loop")
    (let ((did-something nil))
      (dolist (clambda clambdas)
        (let* ((component (block-component (node-block (lambda-bind clambda))))
@@ -357,7 +356,7 @@
                (block-delete-p block)
                (eq (functional-kind (block-home-lambda block)) :deleted)
                (member (functional-kind original-fun)
-                       '(:top-level-xep :deleted))
+                       '(:toplevel-xep :deleted))
                (not (or (eq (component-kind component) :initial)
                         (eq (block-component
                              (node-block
@@ -687,7 +686,7 @@
   ;;
   ;; The (SETF .. NIL) caused problems in sbcl-0.pre7.37.flaky5.2 when
   ;; I was trying to get Python to emit :EXTERNAL LAMBDAs directly
-  ;; (instead of only being able to emit funny little :TOP-LEVEL stubs
+  ;; (instead of only being able to emit funny little :TOPLEVEL stubs
   ;; which you called in order to get the address of an external LAMBDA):
   ;; the external function was defined in terms of internal function,
   ;; which was LET-converted, and then things blew up downstream when
@@ -742,15 +741,15 @@
   (depart-from-tail-set fun)
 
   (let* ((home (node-home-lambda call))
-        (home-env (lambda-environment home)))
+        (home-env (lambda-physenv home)))
     (push fun (lambda-lets home))
     (setf (lambda-home fun) home)
-    (setf (lambda-environment fun) home-env)
+    (setf (lambda-physenv fun) home-env)
 
     (let ((lets (lambda-lets fun)))
       (dolist (let lets)
        (setf (lambda-home let) home)
-       (setf (lambda-environment let) home-env))
+       (setf (lambda-physenv let) home-env))
 
       (setf (lambda-lets home) (nconc lets (lambda-lets home)))
       (setf (lambda-lets fun) ()))