X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir2tran.lisp;h=a6262af5931498b78873445e3fbc0c5c53fd15e6;hb=82653abf5573c22c691e2243b70647ecdaa6aea8;hp=41910d2bcce2135a06acd89c20d928431cb71b88;hpb=0a82f2db352cc348d2107a882e50af222ff97ed3;p=sbcl.git

diff --git a/src/compiler/ir2tran.lisp b/src/compiler/ir2tran.lisp
index 41910d2..a6262af 100644
--- a/src/compiler/ir2tran.lisp
+++ b/src/compiler/ir2tran.lisp
@@ -46,18 +46,23 @@
 
 ;;; Allocate an indirect value cell. Maybe do some clever stack
 ;;; allocation someday.
-(defevent make-value-cell "Allocate heap value cell for lexical var.")
+;;;
+;;; FIXME: DO-MAKE-VALUE-CELL is a bad name, since it doesn't make
+;;; clear what's the distinction between it and the MAKE-VALUE-CELL
+;;; VOP, and since the DO- further connotes iteration, which has
+;;; nothing to do with this. Clearer, more systematic names, anyone?
+(defevent make-value-cell-event "Allocate heap value cell for lexical var.")
 (defun do-make-value-cell (node block value res)
-  (event make-value-cell node)
+  (event make-value-cell-event node)
   (vop make-value-cell node block value res))
 
 ;;;; leaf reference
 
 ;;; Return the TN that holds the value of THING in the environment ENV.
+(declaim (ftype (function ((or nlx-info lambda-var) physenv) tn)
+		find-in-physenv))
 (defun find-in-physenv (thing physenv)
-  (declare (type (or nlx-info lambda-var) thing) (type physenv physenv)
-	   (values tn))
-  (or (cdr (assoc thing (ir2-physenv-environment (physenv-info physenv))))
+  (or (cdr (assoc thing (ir2-physenv-closure (physenv-info physenv))))
       (etypecase thing
 	(lambda-var
 	 ;; I think that a failure of this assertion means that we're
@@ -76,7 +81,9 @@
 	 (leaf-info thing))
 	(nlx-info
 	 (aver (eq physenv (block-physenv (nlx-info-target thing))))
-	 (ir2-nlx-info-home (nlx-info-info thing))))))
+	 (ir2-nlx-info-home (nlx-info-info thing))))
+      (error "~@<internal error: ~2I~_~S ~_not found in ~_~S~:>"
+	     thing physenv)))
 
 ;;; If LEAF already has a constant TN, return that, otherwise make a
 ;;; TN for it.
@@ -109,7 +116,6 @@
   (declare (type ref node) (type ir2-block block))
   (let* ((cont (node-cont node))
 	 (leaf (ref-leaf node))
-	 (name (leaf-name leaf))
 	 (locs (continuation-result-tns
 		cont (list (primitive-type (leaf-type leaf)))))
 	 (res (first locs)))
@@ -122,16 +128,18 @@
       (constant
        (if (legal-immediate-constant-p leaf)
 	   (emit-move node block (constant-tn leaf) res)
-	   (let ((name-tn (emit-constant name)))
+	   (let* ((name (leaf-source-name leaf))
+		  (name-tn (emit-constant name)))
 	     (if (policy node (zerop safety))
 		 (vop fast-symbol-value node block name-tn res)
 		 (vop symbol-value node block name-tn res)))))
       (functional
        (ir2-convert-closure node block leaf res))
       (global-var
-       (let ((unsafe (policy node (zerop safety))))
+       (let ((unsafe (policy node (zerop safety)))
+	     (name (leaf-source-name leaf)))
 	 (ecase (global-var-kind leaf)
-	   ((:special :global :constant)
+	   ((:special :global)
 	    (aver (symbolp name))
 	    (let ((name-tn (emit-constant name)))
 	      (if unsafe
@@ -145,43 +153,83 @@
     (move-continuation-result node block locs cont))
   (values))
 
-;;; Emit code to load a function object representing LEAF into RES.
-;;; This gets interesting when the referenced function is a closure:
-;;; we must make the closure and move the closed over values into it.
+;;; Emit code to load a function object implementing FUN into
+;;; RES. This gets interesting when the referenced function is a
+;;; closure: we must make the closure and move the closed-over values
+;;; into it.
 ;;;
-;;; LEAF is either a :TOP-LEVEL-XEP functional or the XEP lambda for
-;;; the called function, since local call analysis converts all
-;;; closure references. If a TL-XEP, we know it is not a closure.
+;;; FUN is either a :TOPLEVEL-XEP functional or the XEP lambda for the
+;;; called function, since local call analysis converts all closure
+;;; references. If a :TOPLEVEL-XEP, we know it is not a closure.
 ;;;
 ;;; If a closed-over LAMBDA-VAR has no refs (is deleted), then we
 ;;; don't initialize that slot. This can happen with closures over
-;;; top-level variables, where optimization of the closure deleted the
+;;; top level variables, where optimization of the closure deleted the
 ;;; variable. Since we committed to the closure format when we
-;;; pre-analyzed the top-level code, we just leave an empty slot.
-(defun ir2-convert-closure (node block leaf res)
-  (declare (type ref node) (type ir2-block block)
-	   (type functional leaf) (type tn res))
-  (unless (leaf-info leaf)
-    (setf (leaf-info leaf) (make-entry-info)))
-  (let ((entry (make-load-time-constant-tn :entry leaf))
-	(closure (etypecase leaf
+;;; pre-analyzed the top level code, we just leave an empty slot.
+(defun ir2-convert-closure (ref ir2-block fun res)
+  (declare (type ref ref) (type ir2-block ir2-block)
+	   (type functional fun) (type tn res))
+
+  (unless (leaf-info fun)
+    (setf (leaf-info fun)
+	  (make-entry-info :name (functional-debug-name fun))))
+  (let ((entry (make-load-time-constant-tn :entry fun))
+	(closure (etypecase fun
 		   (clambda
-		    (physenv-closure (get-lambda-physenv leaf)))
+
+		    ;; This assertion was sort of an experiment. It
+		    ;; would be nice and sane and easier to understand
+		    ;; things if it were *always* true, but
+		    ;; experimentally I observe that it's only
+		    ;; *almost* always true. -- WHN 2001-01-02
+		    #+nil 
+		    (aver (eql (lambda-component fun)
+			       (block-component (ir2-block-block ir2-block))))
+
+		    ;; Check for some weirdness which came up in bug
+		    ;; 138, 2002-01-02.
+		    ;;
+		    ;; The MAKE-LOAD-TIME-CONSTANT-TN call above puts
+		    ;; an :ENTRY record into the
+		    ;; IR2-COMPONENT-CONSTANTS table. The
+		    ;; dump-a-COMPONENT code
+		    ;;   * treats every HANDLEless :ENTRY record into a
+		    ;;     patch, and
+		    ;;   * expects every patch to correspond to an
+		    ;;     IR2-COMPONENT-ENTRIES record.
+		    ;; The IR2-COMPONENT-ENTRIES records are set by
+		    ;; ENTRY-ANALYZE walking over COMPONENT-LAMBDAS.
+		    ;; Bug 138b arose because there was a HANDLEless
+		    ;; :ENTRY record which didn't correspond to an
+		    ;; IR2-COMPONENT-ENTRIES record. That problem is
+		    ;; hard to debug when it's caught at dump time, so
+		    ;; this assertion tries to catch it here.
+		    (aver (member fun
+				  (component-lambdas (lambda-component fun))))
+
+		    ;; another bug-138-related issue: COMPONENT-NEW-FUNS
+		    ;; is an IR1 temporary, and now that we're doing IR2
+		    ;; it should've been completely flushed (but wasn't).
+		    (aver (null (component-new-funs (lambda-component fun))))
+
+		    (physenv-closure (get-lambda-physenv fun)))
 		   (functional
-		    (aver (eq (functional-kind leaf) :top-level-xep))
+		    (aver (eq (functional-kind fun) :toplevel-xep))
 		    nil))))
+
     (cond (closure
-	   (let ((this-env (node-physenv node)))
-	     (vop make-closure node block entry (length closure) res)
+	   (let ((this-env (node-physenv ref)))
+	     (vop make-closure ref ir2-block entry (length closure) res)
 	     (loop for what in closure and n from 0 do
 	       (unless (and (lambda-var-p what)
 			    (null (leaf-refs what)))
-		 (vop closure-init node block
+		 (vop closure-init ref ir2-block
 		      res
 		      (find-in-physenv what this-env)
 		      n)))))
 	  (t
-	   (emit-move node block entry res))))
+	   (emit-move ref ir2-block entry res))))
   (values))
 
 ;;; Convert a SET node. If the node's CONT is annotated, then we also
@@ -207,8 +255,8 @@
       (global-var
        (ecase (global-var-kind leaf)
 	 ((:special :global)
-	  (aver (symbolp (leaf-name leaf)))
-	  (vop set node block (emit-constant (leaf-name leaf)) val)))))
+	  (aver (symbolp (leaf-source-name leaf)))
+	  (vop set node block (emit-constant (leaf-source-name leaf)) val)))))
     (when locs
       (emit-move node block val (first locs))
       (move-continuation-result node block locs cont)))
@@ -277,23 +325,23 @@
 	(multiple-value-bind (check types) (continuation-check-types cont)
 	  (aver (eq check :simple))
 	  (let ((ntypes (length types)))
-	    (mapcar #'(lambda (from to-type assertion)
-			(let ((temp (make-normal-tn to-type)))
-			  (if assertion
-			      (emit-type-check node block from temp assertion)
-			      (emit-move node block from temp))
-			  temp))
+	    (mapcar (lambda (from to-type assertion)
+		      (let ((temp (make-normal-tn to-type)))
+			(if assertion
+			    (emit-type-check node block from temp assertion)
+			    (emit-move node block from temp))
+			temp))
 		    locs ptypes
 		    (if (< ntypes nlocs)
 			(append types (make-list (- nlocs ntypes)
 						 :initial-element nil))
 			types))))
-	(mapcar #'(lambda (from to-type)
-		    (if (eq (tn-primitive-type from) to-type)
-			from
-			(let ((temp (make-normal-tn to-type)))
-			  (emit-move node block from temp)
-			  temp)))
+	(mapcar (lambda (from to-type)
+		  (if (eq (tn-primitive-type from) to-type)
+		      from
+		      (let ((temp (make-normal-tn to-type)))
+			(emit-move node block from temp)
+			temp)))
 		locs
 		ptypes))))
 
@@ -332,10 +380,10 @@
 			(unless (eq (tn-primitive-type (car loc)) (car type))
 			  (return nil))))
 		 locs
-		 (mapcar #'(lambda (loc type)
-			     (if (eq (tn-primitive-type loc) type)
-				 loc
-				 (make-normal-tn type)))
+		 (mapcar (lambda (loc type)
+			   (if (eq (tn-primitive-type loc) type)
+			       loc
+			       (make-normal-tn type)))
 			 (if (< nlocs ntypes)
 			     (append locs
 				     (mapcar #'make-normal-tn
@@ -350,7 +398,7 @@
   (declare (type unsigned-byte n))
   (collect ((res))
     (dotimes (i n)
-      (res (standard-argument-location i)))
+      (res (standard-arg-location i)))
     (res)))
 
 ;;; Return a list of TNs wired to the standard value passing
@@ -379,9 +427,9 @@
   (declare (type node node) (type ir2-block block) (list src dest))
   (let ((nsrc (length src))
 	(ndest (length dest)))
-    (mapc #'(lambda (from to)
-	      (unless (eq from to)
-		(emit-move node block from to)))
+    (mapc (lambda (from to)
+	    (unless (eq from to)
+	      (emit-move node block from to)))
 	  (if (> ndest nsrc)
 	      (append src (make-list (- ndest nsrc)
 				     :initial-element (emit-constant nil)))
@@ -389,7 +437,7 @@
 	  dest))
   (values))
 
-;;; If necessary, emit coercion code needed to deliver the Results to
+;;; If necessary, emit coercion code needed to deliver the RESULTS to
 ;;; the specified continuation. NODE and BLOCK provide context for
 ;;; emitting code. Although usually obtained from STANDARD-RESULT-TNs
 ;;; or CONTINUATION-RESULT-TNs, RESULTS my be a list of any type or
@@ -426,7 +474,7 @@
 ;;; arguments are returned in the second value as a list rather than
 ;;; being accessed as a normal argument. NODE and BLOCK provide the
 ;;; context for emitting any necessary type-checking code.
-(defun reference-arguments (node block args template)
+(defun reference-args (node block args template)
   (declare (type node node) (type ir2-block block) (list args)
 	   (type template template))
   (collect ((info-args))
@@ -547,7 +595,7 @@
 	 (cont (node-cont call))
 	 (rtypes (template-result-types template)))
     (multiple-value-bind (args info-args)
-	(reference-arguments call block (combination-args call) template)
+	(reference-args call block (combination-args call) template)
       (aver (not (template-more-results-type template)))
       (if (eq rtypes :conditional)
 	  (ir2-convert-conditional call block template args info-args
@@ -574,8 +622,7 @@
 	 (results (make-template-result-tns call cont template rtypes))
 	 (r-refs (reference-tn-list results t)))
     (multiple-value-bind (args info-args)
-	(reference-arguments call block (cddr (combination-args call))
-			     template)
+	(reference-args call block (cddr (combination-args call)) template)
       (aver (not (template-more-results-type template)))
       (aver (not (eq rtypes :conditional)))
       (aver (null info-args))
@@ -596,13 +643,13 @@
 ;;; this.
 (defun ir2-convert-let (node block fun)
   (declare (type combination node) (type ir2-block block) (type clambda fun))
-  (mapc #'(lambda (var arg)
-	    (when arg
-	      (let ((src (continuation-tn node block arg))
-		    (dest (leaf-info var)))
-		(if (lambda-var-indirect var)
-		    (do-make-value-cell node block src dest)
-		    (emit-move node block src dest)))))
+  (mapc (lambda (var arg)
+	  (when arg
+	    (let ((src (continuation-tn node block arg))
+		  (dest (leaf-info var)))
+	      (if (lambda-var-indirect var)
+		  (do-make-value-cell node block src dest)
+		  (emit-move node block src dest)))))
 	(lambda-vars fun) (basic-combination-args node))
   (values))
 
@@ -623,10 +670,10 @@
 	   (type (or tn null) old-fp))
   (let* ((called-env (physenv-info (lambda-physenv fun)))
 	 (this-1env (node-physenv node))
-	 (actuals (mapcar #'(lambda (x)
-			     (when x
-			       (continuation-tn node block x)))
-			 (combination-args node))))
+	 (actuals (mapcar (lambda (x)
+			    (when x
+			      (continuation-tn node block x)))
+			  (combination-args node))))
     (collect ((temps)
 	      (locs))
       (dolist (var (lambda-vars fun))
@@ -648,10 +695,10 @@
 	    (locs loc))))
 
       (when old-fp
-	(dolist (thing (ir2-physenv-environment called-env))
+	(dolist (thing (ir2-physenv-closure called-env))
 	  (temps (find-in-physenv (car thing) this-1env))
 	  (locs (cdr thing)))
-	
+
 	(temps old-fp)
 	(locs (ir2-physenv-old-fp called-env)))
 
@@ -667,8 +714,8 @@
     (multiple-value-bind (temps locs)
 	(emit-psetq-moves node block fun (ir2-physenv-old-fp this-env))
 
-      (mapc #'(lambda (temp loc)
-		(emit-move node block temp loc))
+      (mapc (lambda (temp loc)
+	      (emit-move node block temp loc))
 	    temps locs))
 
     (emit-move node block
@@ -686,8 +733,8 @@
   (declare (type combination node) (type ir2-block block) (type clambda fun))
     (multiple-value-bind (temps locs) (emit-psetq-moves node block fun nil)
 
-      (mapc #'(lambda (temp loc)
-		(emit-move node block temp loc))
+      (mapc (lambda (temp loc)
+	      (emit-move node block temp loc))
 	    temps locs))
   (values))
 
@@ -769,7 +816,7 @@
 	  ((node-tail-p node)
 	   (ir2-convert-tail-local-call node block fun))
 	  (t
-	   (let ((start (block-label (node-block (lambda-bind fun))))
+	   (let ((start (block-label (lambda-block fun)))
 		 (returns (tail-set-info (lambda-tail-set fun)))
 		 (cont (node-cont node)))
 	     (ecase (if returns
@@ -790,7 +837,7 @@
 ;;;   -- Known to be a function, no check needed: return the
 ;;;      continuation loc.
 ;;;   -- Not known what it is.
-(defun function-continuation-tn (node block cont)
+(defun fun-continuation-tn (node block cont)
   (declare (type continuation cont))
   (let ((2cont (continuation-info cont)))
     (if (eq (ir2-continuation-kind 2cont) :delayed)
@@ -823,7 +870,7 @@
 	(last nil)
 	(first nil))
     (dotimes (num (length args))
-      (let ((loc (standard-argument-location num)))
+      (let ((loc (standard-arg-location num)))
 	(emit-move node block (continuation-tn node block (elt args num)) loc)
 	(let ((ref (reference-tn loc nil)))
 	  (if last
@@ -844,7 +891,7 @@
 	 (return-pc (ir2-physenv-return-pc env)))
 
     (multiple-value-bind (fun-tn named)
-	(function-continuation-tn node block (basic-combination-fun node))
+	(fun-continuation-tn node block (basic-combination-fun node))
       (if named
 	  (vop* tail-call-named node block
 		(fun-tn old-fp return-pc pass-refs)
@@ -868,7 +915,7 @@
       (let ((last nil)
 	    (first nil))
 	(dotimes (num nargs)
-	  (locs (standard-argument-location num))
+	  (locs (standard-arg-location num))
 	  (let ((ref (reference-tn (continuation-tn node block (elt args num))
 				   nil)))
 	    (if last
@@ -891,7 +938,7 @@
 	   (loc-refs (reference-tn-list locs t))
 	   (nvals (length locs)))
       (multiple-value-bind (fun-tn named)
-	  (function-continuation-tn node block (basic-combination-fun node))
+	  (fun-continuation-tn node block (basic-combination-fun node))
 	(if named
 	    (vop* call-named node block (fp fun-tn args) (loc-refs)
 		  arg-locs nargs nvals)
@@ -909,7 +956,7 @@
 	   (locs (ir2-continuation-locs (continuation-info cont)))
 	   (loc-refs (reference-tn-list locs t)))
       (multiple-value-bind (fun-tn named)
-	  (function-continuation-tn node block (basic-combination-fun node))
+	  (fun-continuation-tn node block (basic-combination-fun node))
 	(if named
 	    (vop* multiple-call-named node block (fp fun-tn args) (loc-refs)
 		  arg-locs nargs)
@@ -1014,7 +1061,7 @@
   (declare (type bind node) (type ir2-block block) (type clambda fun))
   (let ((start-label (entry-info-offset (leaf-info fun)))
 	(env (physenv-info (node-physenv node))))
-    (let ((ef (functional-entry-function fun)))
+    (let ((ef (functional-entry-fun fun)))
       (cond ((and (optional-dispatch-p ef) (optional-dispatch-more-entry ef))
 	     ;; Special case the xep-allocate-frame + copy-more-arg case.
 	     (vop xep-allocate-frame node block start-label t)
@@ -1022,25 +1069,25 @@
 	    (t
 	     ;; No more args, so normal entry.
 	     (vop xep-allocate-frame node block start-label nil)))
-      (if (ir2-physenv-environment env)
+      (if (ir2-physenv-closure env)
 	  (let ((closure (make-normal-tn *backend-t-primitive-type*)))
 	    (vop setup-closure-environment node block start-label closure)
 	    (when (getf (functional-plist ef) :fin-function)
 	      (vop funcallable-instance-lexenv node block closure closure))
 	    (let ((n -1))
-	      (dolist (loc (ir2-physenv-environment env))
+	      (dolist (loc (ir2-physenv-closure env))
 		(vop closure-ref node block closure (incf n) (cdr loc)))))
 	  (vop setup-environment node block start-label)))
 
-    (unless (eq (functional-kind fun) :top-level)
+    (unless (eq (functional-kind fun) :toplevel)
       (let ((vars (lambda-vars fun))
 	    (n 0))
 	(when (leaf-refs (first vars))
-	  (emit-move node block (make-argument-count-location)
+	  (emit-move node block (make-arg-count-location)
 		     (leaf-info (first vars))))
 	(dolist (arg (rest vars))
 	  (when (leaf-refs arg)
-	    (let ((pass (standard-argument-location n))
+	    (let ((pass (standard-arg-location n))
 		  (home (leaf-info arg)))
 	      (if (lambda-var-indirect arg)
 		  (do-make-value-cell node block pass home)
@@ -1064,9 +1111,9 @@
   (let* ((fun (bind-lambda node))
 	 (env (physenv-info (lambda-physenv fun))))
     (aver (member (functional-kind fun)
-		  '(nil :external :optional :top-level :cleanup)))
+		  '(nil :external :optional :toplevel :cleanup)))
 
-    (when (external-entry-point-p fun)
+    (when (xep-p fun)
       (init-xep-environment node block fun)
       #!+sb-dyncount
       (when *collect-dynamic-statistics*
@@ -1105,7 +1152,7 @@
 	 (returns (tail-set-info (lambda-tail-set fun))))
     (cond
      ((and (eq (return-info-kind returns) :fixed)
-	   (not (external-entry-point-p fun)))
+	   (not (xep-p fun)))
       (let ((locs (continuation-tns node block cont
 				    (return-info-types returns))))
 	(vop* known-return node block
@@ -1117,8 +1164,8 @@
 	     (cont-locs (continuation-tns node block cont types))
 	     (nvals (length cont-locs))
 	     (locs (make-standard-value-tns nvals)))
-	(mapc #'(lambda (val loc)
-		  (emit-move node block val loc))
+	(mapc (lambda (val loc)
+		(emit-move node block val loc))
 	      cont-locs
 	      locs)
 	(if (= nvals 1)
@@ -1142,10 +1189,10 @@
 ;;; stack. It returns the OLD-FP and RETURN-PC for the current
 ;;; function as multiple values.
 (defoptimizer (sb!kernel:%caller-frame-and-pc ir2-convert) (() node block)
-  (let ((env (physenv-info (node-physenv node))))
+  (let ((ir2-physenv (physenv-info (node-physenv node))))
     (move-continuation-result node block
-			      (list (ir2-physenv-old-fp env)
-				    (ir2-physenv-return-pc env))
+			      (list (ir2-physenv-old-fp ir2-physenv)
+				    (ir2-physenv-return-pc ir2-physenv))
 			      (node-cont node))))
 
 ;;;; multiple values
@@ -1160,15 +1207,15 @@
 	 (fun (ref-leaf (continuation-use (basic-combination-fun node))))
 	 (vars (lambda-vars fun)))
     (aver (eq (functional-kind fun) :mv-let))
-    (mapc #'(lambda (src var)
-	      (when (leaf-refs var)
-		(let ((dest (leaf-info var)))
-		  (if (lambda-var-indirect var)
-		      (do-make-value-cell node block src dest)
-		      (emit-move node block src dest)))))
+    (mapc (lambda (src var)
+	    (when (leaf-refs var)
+	      (let ((dest (leaf-info var)))
+		(if (lambda-var-indirect var)
+		    (do-make-value-cell node block src dest)
+		    (emit-move node block src dest)))))
 	  (continuation-tns node block cont
-			    (mapcar #'(lambda (x)
-					(primitive-type (leaf-type x)))
+			    (mapcar (lambda (x)
+				      (primitive-type (leaf-type x)))
 				    vars))
 	  vars))
   (values))
@@ -1188,7 +1235,7 @@
 	 (cont (node-cont node))
 	 (2cont (continuation-info cont)))
     (multiple-value-bind (fun named)
-	(function-continuation-tn node block (basic-combination-fun node))
+	(fun-continuation-tn node block (basic-combination-fun node))
       (aver (and (not named)
 		 (eq (ir2-continuation-kind start-cont) :unknown)))
       (cond
@@ -1218,8 +1265,8 @@
 
 ;;; Deliver the values TNs to CONT using MOVE-CONTINUATION-RESULT.
 (defoptimizer (values ir2-convert) ((&rest values) node block)
-  (let ((tns (mapcar #'(lambda (x)
-			 (continuation-tn node block x))
+  (let ((tns (mapcar (lambda (x)
+		       (continuation-tn node block x))
 		     values)))
     (move-continuation-result node block tns (node-cont node))))
 
@@ -1261,7 +1308,7 @@
 ;;; This is trivial, given our assumption of a shallow-binding
 ;;; implementation.
 (defoptimizer (%special-bind ir2-convert) ((var value) node block)
-  (let ((name (leaf-name (continuation-value var))))
+  (let ((name (leaf-source-name (continuation-value var))))
     (vop bind node block (continuation-tn node block value)
 	 (emit-constant name))))
 (defoptimizer (%special-unbind ir2-convert) ((var) node block)
@@ -1277,8 +1324,8 @@
    (once-only ((n-save-bs '(%primitive current-binding-pointer)))
      `(unwind-protect
 	  (progn
-	    (mapc #'(lambda (var val)
-		      (%primitive bind val var))
+	    (mapc (lambda (var val)
+		    (%primitive bind val var))
 		  ,vars
 		  ,vals)
 	    ,@body)
@@ -1329,7 +1376,6 @@
 	    (ir2-continuation-locs (continuation-info (second args)))
 	    nil))
 	  (nil)))
-
   (move-continuation-result node block () (node-cont node))
   (values))
 
@@ -1414,8 +1460,8 @@
 	 (2cont (continuation-info cont))
 	 (2info (nlx-info-info info))
 	 (top-loc (ir2-nlx-info-save-sp 2info))
-	 (start-loc (make-nlx-entry-argument-start-location))
-	 (count-loc (make-argument-count-location))
+	 (start-loc (make-nlx-entry-arg-start-location))
+	 (count-loc (make-arg-count-location))
 	 (target (ir2-nlx-info-target 2info)))
 
     (ecase (cleanup-kind (nlx-info-cleanup info))
@@ -1433,7 +1479,7 @@
 		   (length locs))
 	     (move-continuation-result node block locs cont))))
       (:unwind-protect
-       (let ((block-loc (standard-argument-location 0)))
+       (let ((block-loc (standard-arg-location 0)))
 	 (vop uwp-entry node block target block-loc start-loc count-loc)
 	 (move-continuation-result
 	  node block
@@ -1453,7 +1499,7 @@
 
 ;;;; n-argument functions
 
-(macrolet ((def-frob (name)
+(macrolet ((def (name)
 	     `(defoptimizer (,name ir2-convert) ((&rest args) node block)
 		(let* ((refs (move-tail-full-call-args node block))
 		       (cont (node-cont node))
@@ -1463,40 +1509,8 @@
 		  (vop* ,name node block (refs) ((first res) nil)
 			(length args))
 		  (move-continuation-result node block res cont)))))
-  (def-frob list)
-  (def-frob list*))
-
-;;;; structure accessors
-;;;;
-;;;; These guys have to bizarrely determine the slot offset by looking
-;;;; at the called function.
-
-(defoptimizer (%slot-accessor ir2-convert) ((str) node block)
-  (let* ((cont (node-cont node))
-	 (res (continuation-result-tns cont
-				       (list *backend-t-primitive-type*))))
-    (vop instance-ref node block
-	 (continuation-tn node block str)
-	 (dsd-index
-	  (slot-accessor-slot
-	   (ref-leaf
-	    (continuation-use
-	     (combination-fun node)))))
-	 (first res))
-    (move-continuation-result node block res cont)))
-
-(defoptimizer (%slot-setter ir2-convert) ((value str) node block)
-  (let ((val (continuation-tn node block value)))
-    (vop instance-set node block
-	 (continuation-tn node block str)
-	 val
-	 (dsd-index
-	  (slot-accessor-slot
-	   (ref-leaf
-	    (continuation-use
-	     (combination-fun node))))))
-
-    (move-continuation-result node block (list val) (node-cont node))))
+  (def list)
+  (def list*))
 
 ;;; Convert the code in a component into VOPs.
 (defun ir2-convert (component)
@@ -1529,8 +1543,7 @@
 	    (when *collect-dynamic-statistics*
 	      (let ((first-node (continuation-next (block-start block))))
 		(unless (or (and (bind-p first-node)
-				 (external-entry-point-p
-				  (bind-lambda first-node)))
+				 (xep-p (bind-lambda first-node)))
 			    (eq (continuation-fun-name
 				 (node-cont first-node))
 				'%nlx-entry))
@@ -1561,15 +1574,17 @@
 			  (eq (basic-combination-kind last) :full))
 		 (let* ((fun (basic-combination-fun last))
 			(use (continuation-use fun))
-			(name (and (ref-p use) (leaf-name (ref-leaf use)))))
+			(name (and (ref-p use)
+				   (leaf-has-source-name-p (ref-leaf use))
+				   (leaf-source-name (ref-leaf use)))))
 		   (unless (or (node-tail-p last)
 			       (info :function :info name)
 			       (policy last (zerop safety)))
-		     (vop nil-function-returned-error last 2block
+		     (vop nil-fun-returned-error last 2block
 			  (if name
 			      (emit-constant name)
 			      (multiple-value-bind (tn named)
-				  (function-continuation-tn last 2block fun)
+				  (fun-continuation-tn last 2block fun)
 				(aver (not named))
 				tn)))))))
 	      ((not (eq (ir2-block-next 2block) (block-info target)))
@@ -1596,7 +1611,7 @@
 	     (:full
 	      (ir2-convert-full-call node 2block))
 	     (t
-	      (let ((fun (function-info-ir2-convert kind)))
+	      (let ((fun (fun-info-ir2-convert kind)))
 		(cond (fun
 		       (funcall fun node 2block))
 		      ((eq (basic-combination-info node) :full)