;;; 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))
\f
;;;; leaf reference
(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))))
+ (bug "~@<~2I~_~S ~_not found in ~_~S~:>" thing physenv)))
;;; If LEAF already has a constant TN, return that, otherwise make a
;;; TN for it.
(move-continuation-result node block locs cont))
(values))
-;;; Emit code to load a function object implementing FUN into
+;;; some sanity checks for a CLAMBDA passed to IR2-CONVERT-CLOSURE
+(defun assertions-on-ir2-converted-clambda (clambda)
+ ;; 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 clambda)
+ (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 clambda
+ (component-lambdas (lambda-component clambda))))
+ ;; another bug-138-related issue: COMPONENT-NEW-FUNCTIONALS is
+ ;; used as a queue for stuff pending to do in IR1, and now that
+ ;; we're doing IR2 it should've been completely flushed (but
+ ;; wasn't).
+ (aver (null (component-new-functionals (lambda-component clambda))))
+ (values))
+
+;;; Emit code to load a function object implementing FUNCTIONAL 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.
;;;
-;;; 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.
+;;; FUNCTIONAL 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
;;; 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 (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
+(defun ir2-convert-closure (ref ir2-block functional res)
+ (declare (type ref ref)
+ (type ir2-block ir2-block)
+ (type functional functional)
+ (type tn res))
+ (aver (not (eql (functional-kind functional) :deleted)))
+ (unless (leaf-info functional)
+ (setf (leaf-info functional)
+ (make-entry-info :name (functional-debug-name functional))))
+ (let ((entry (make-load-time-constant-tn :entry functional))
+ (closure (etypecase functional
(clambda
-
- ;; 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)))
+ (assertions-on-ir2-converted-clambda functional)
+ (physenv-closure (get-lambda-physenv functional)))
(functional
- (aver (eq (functional-kind fun) :toplevel-xep))
+ (aver (eq (functional-kind functional) :toplevel-xep))
nil))))
(cond (closure
(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
;;; 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))
(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
(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))
(defun emit-psetq-moves (node block fun old-fp)
(declare (type combination node) (type ir2-block block) (type clambda fun)
(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))))
+ (let ((actuals (mapcar (lambda (x)
+ (when x
+ (continuation-tn node block x)))
+ (combination-args node))))
(collect ((temps)
(locs))
(dolist (var (lambda-vars fun))
(locs loc))))
(when old-fp
- (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)))
+ (let ((this-1env (node-physenv node))
+ (called-env (physenv-info (lambda-physenv fun))))
+ (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))))
(values (temps) (locs)))))
\f
;;;; full call
-;;; Given a function continuation FUN, return as values a TN holding
-;;; the thing that we call and true if the thing is named (false if it
-;;; is a function). There are two interesting non-named cases:
-;;; -- Known to be a function, no check needed: return the
-;;; continuation loc.
-;;; -- Not known what it is.
+;;; Given a function continuation FUN, return (VALUES TN-TO-CALL
+;;; NAMED-P), where TN-TO-CALL is a TN holding the thing that we call
+;;; NAMED-P is true if the thing is named (false if it is a function).
+;;;
+;;; There are two interesting non-named cases:
+;;; -- We know it's a function. No check needed: return the
+;;; continuation LOC.
+;;; -- We don't know what it is.
(defun fun-continuation-tn (node block cont)
(declare (type continuation cont))
(let ((2cont (continuation-info cont)))
(specifier-type 'function))
(values temp nil))))))))
-;;; Set up the args to Node in the current frame, and return a tn-ref
+;;; Set up the args to NODE in the current frame, and return a TN-REF
;;; list for the passing locations.
(defun move-tail-full-call-args (node block)
(declare (type combination node) (type ir2-block block))
(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
(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
arg-locs nargs)))))
(values))
-;;; stuff to check in CHECK-FULL-CALL
+;;; stuff to check in PONDER-FULL-CALL
;;;
;;; There are some things which are intended always to be optimized
;;; away by DEFTRANSFORMs and such, and so never compiled into full
;;; list.
(defvar *always-optimized-away*
'(;; This should always be DEFTRANSFORMed away, but wasn't in a bug
- ;; reported to cmucl-imp@cons.org 2000-06-20.
+ ;; reported to cmucl-imp 2000-06-20.
%instance-ref
;; These should always turn into VOPs, but wasn't in a bug which
;; appeared when LTN-POLICY stuff was being tweaked in
data-vector-set
data-vector-ref))
-;;; more stuff to check in CHECK-FULL-CALL
+;;; more stuff to check in PONDER-FULL-CALL
;;;
;;; These came in handy when troubleshooting cold boot after making
;;; major changes in the package structure: various transforms and
#!+sb-show (defvar *show-full-called-fnames-p* nil)
#!+sb-show (defvar *full-called-fnames* (make-hash-table :test 'equal))
-;;; Do some checks on a full call:
+;;; Do some checks (and store some notes relevant for future checks)
+;;; on a full call:
;;; * Is this a full call to something we have reason to know should
-;;; never be full called?
+;;; never be full called? (Except as of sbcl-0.7.18 or so, we no
+;;; longer try to ensure this behavior when *FAILURE-P* has already
+;;; been detected.)
;;; * Is this a full call to (SETF FOO) which might conflict with
;;; a DEFSETF or some such thing elsewhere in the program?
-(defun check-full-call (node)
+(defun ponder-full-call (node)
(let* ((cont (basic-combination-fun node))
(fname (continuation-fun-name cont t)))
(declare (type (or symbol cons) fname))
(basic-combination-args node))))
(/show arg-types)))
- (when (memq fname *always-optimized-away*)
- (/show (policy node speed) (policy node safety))
- (/show (policy node compilation-speed))
- (error "internal error: full call to ~S" fname))
+ ;; When illegal code is compiled, all sorts of perverse paths
+ ;; through the compiler can be taken, and it's much harder -- and
+ ;; probably pointless -- to guarantee that always-optimized-away
+ ;; functions are actually optimized away. Thus, we skip the check
+ ;; in that case.
+ (unless *failure-p*
+ (when (memq fname *always-optimized-away*)
+ (/show (policy node speed) (policy node safety))
+ (/show (policy node compilation-speed))
+ (bug "full call to ~S" fname)))
(when (consp fname)
(destructuring-bind (setf stem) fname
;;; multiple-values call.
(defun ir2-convert-full-call (node block)
(declare (type combination node) (type ir2-block block))
- (check-full-call node)
+ (ponder-full-call node)
(let ((2cont (continuation-info (node-cont node))))
(cond ((node-tail-p node)
(ir2-convert-tail-full-call node block))
(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)
\f
;;;; multiple values
-;;; This is almost identical to IR2-Convert-Let. Since LTN annotates
+;;; This is almost identical to IR2-CONVERT-LET. Since LTN annotates
;;; the continuation for the correct number of values (with the
;;; continuation user responsible for defaulting), we can just pick
;;; them up from the continuation.
\f
;;;; non-local exit
-;;; Convert a non-local lexical exit. First find the NLX-Info in our
+;;; Convert a non-local lexical exit. First find the NLX-INFO in our
;;; environment. Note that this is never called on the escape exits
;;; for CATCH and UNWIND-PROTECT, since the escape functions aren't
;;; IR2 converted.
(defun ir2-convert-throw (node block)
(declare (type mv-combination node) (type ir2-block block))
(let ((args (basic-combination-args node)))
+ (check-catch-tag-type (first args))
(vop* throw node block
((continuation-tn node block (first args))
(reference-tn-list
(move-continuation-result node block () (node-cont node))
(values))
-;;; Emit code to set up a non-local exit. INFO is the NLX-Info for the
+;;; Emit code to set up a non-local exit. INFO is the NLX-INFO for the
;;; exit, and TAG is the continuation for the catch tag (if any.) We
;;; get at the target PC by passing in the label to the vop. The vop
;;; is responsible for building a return-PC object.
;;; Set up the unwind block for these guys.
(defoptimizer (%catch ir2-convert) ((info-cont tag) node block)
+ (check-catch-tag-type tag)
(emit-nlx-start node block (continuation-value info-cont) tag))
(defoptimizer (%unwind-protect ir2-convert) ((info-cont cleanup) node block)
(emit-nlx-start node block (continuation-value info-cont) nil))
(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))
(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
\f
;;;; 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))
(vop* ,name node block (refs) ((first res) nil)
(length args))
(move-continuation-result node block res cont)))))
- (def-frob list)
- (def-frob list*))
+ (def list)
+ (def list*))
\f
;;; Convert the code in a component into VOPs.
(defun ir2-convert (component)
projects / sbcl.git / blobdiff