(temps (make-gensym-list (length (lambda-vars fun)))))
`(lambda (,n-supplied ,@temps)
(declare (type index ,n-supplied))
- ,(if (policy nil (zerop safety))
+ ,(if (policy *lexenv* (zerop safety))
`(declare (ignore ,n-supplied))
`(%verify-argument-count ,n-supplied ,nargs))
(%funcall ,fun ,@temps))))
(cond
,@(if more (butlast (entries)) (entries))
,@(when more
- `((,(if (zerop min) 't `(>= ,n-supplied ,max))
+ `((,(if (zerop min) t `(>= ,n-supplied ,max))
,(let ((n-context (gensym))
(n-count (gensym)))
`(multiple-value-bind (,n-context ,n-count)
;;; then associate this lambda with FUN as its XEP. After the
;;; conversion, we iterate over the function's associated lambdas,
;;; redoing local call analysis so that the XEP calls will get
-;;; converted. We also bind *LEXENV* to change the compilation policy
-;;; over to the interface policy.
+;;; converted.
;;;
;;; We set REANALYZE and REOPTIMIZE in the component, just in case we
;;; discover an XEP after the initial local call analyze pass.
(defun make-external-entry-point (fun)
(declare (type functional fun))
- (assert (not (functional-entry-function fun)))
+ (aver (not (functional-entry-function fun)))
(with-ir1-environment (lambda-bind (main-entry fun))
- (let* ((*lexenv* (make-lexenv :policy (make-interface-policy *lexenv*)))
- (res (ir1-convert-lambda (make-xep-lambda fun))))
- (setf (functional-kind res) :external)
- (setf (leaf-ever-used res) t)
- (setf (functional-entry-function res) fun)
- (setf (functional-entry-function fun) res)
- (setf (component-reanalyze *current-component*) t)
- (setf (component-reoptimize *current-component*) t)
+ (let ((res (ir1-convert-lambda (make-xep-lambda fun))))
+ (setf (functional-kind res) :external
+ (leaf-ever-used res) t
+ (functional-entry-function res) fun
+ (functional-entry-function fun) res
+ (component-reanalyze *current-component*) t
+ (component-reoptimize *current-component*) t)
(etypecase fun
(clambda (local-call-analyze-1 fun))
(optional-dispatch
(if (and (policy call
(and (>= speed space) (>= speed compilation-speed)))
(not (eq (functional-kind (node-home-lambda call)) :external))
- (not *converting-for-interpreter*)
(inline-expansion-ok call))
(with-ir1-environment call
(let* ((*lexenv* (functional-lexenv fun))
(won nil)
(res (catch 'local-call-lossage
(prog1
- (ir1-convert-lambda (functional-inline-expansion fun))
+ (ir1-convert-lambda (functional-inline-expansion
+ fun))
(setq won t)))))
(cond (won
(change-ref-leaf ref res)
(let* ((block (node-block call))
(component (block-component block))
(original-fun (ref-leaf ref)))
- (assert (functional-p original-fun))
+ (aver (functional-p original-fun))
(unless (or (member (basic-combination-kind call) '(:local :error))
(block-delete-p block)
(eq (functional-kind (block-home-lambda block)) :deleted)
(rest (leaf-refs original-fun)))
(setq fun (maybe-expand-local-inline fun ref call)))
- (assert (member (functional-kind fun)
- '(nil :escape :cleanup :optional)))
+ (aver (member (functional-kind fun)
+ '(nil :escape :cleanup :optional)))
(cond ((mv-combination-p call)
(convert-mv-call ref call fun))
((lambda-p fun)
\f
;;;; optional, more and keyword calls
-;;; Similar to Convert-Lambda-Call, but deals with Optional-Dispatches. If
-;;; only fixed args are supplied, then convert a call to the correct entry
-;;; point. If keyword args are supplied, then dispatch to a subfunction. We
-;;; don't convert calls to functions that have a more (or rest) arg.
+;;; This is similar to CONVERT-LAMBDA-CALL, but deals with
+;;; OPTIONAL-DISPATCHes. If only fixed args are supplied, then convert
+;;; a call to the correct entry point. If &KEY args are supplied, then
+;;; dispatch to a subfunction. We don't convert calls to functions
+;;; that have a &MORE (or &REST) arg.
(defun convert-hairy-call (ref call fun)
(declare (type ref ref) (type combination call)
(type optional-dispatch fun))
(dolist (ref (leaf-refs entry))
(convert-call-if-possible ref (continuation-dest (node-cont ref))))))
-;;; Use Convert-Hairy-Fun-Entry to convert a more-arg call to a known
-;;; function into a local call to the Main-Entry.
+;;; Use CONVERT-HAIRY-FUN-ENTRY to convert a &MORE-arg call to a known
+;;; function into a local call to the MAIN-ENTRY.
;;;
;;; First we verify that all keywords are constant and legal. If there
;;; aren't, then we warn the user and don't attempt to convert the call.
;;;
-;;; We massage the supplied keyword arguments into the order expected by the
-;;; main entry. This is done by binding all the arguments to the keyword call
-;;; to variables in the introduced lambda, then passing these values variables
-;;; in the correct order when calling the main entry. Unused arguments
-;;; (such as the keywords themselves) are discarded simply by not passing them
-;;; along.
+;;; We massage the supplied &KEY arguments into the order expected
+;;; by the main entry. This is done by binding all the arguments to
+;;; the keyword call to variables in the introduced lambda, then
+;;; passing these values variables in the correct order when calling
+;;; the main entry. Unused arguments (such as the keywords themselves)
+;;; are discarded simply by not passing them along.
;;;
-;;; If there is a rest arg, then we bundle up the args and pass them to LIST.
+;;; If there is a &REST arg, then we bundle up the args and pass them
+;;; to LIST.
(defun convert-more-call (ref call fun)
(declare (type ref ref) (type combination call) (type optional-dispatch fun))
(let* ((max (optional-dispatch-max-args fun))
(ignores dummy val)
(setq loser name)))
(let ((info (lambda-var-arg-info var)))
- (when (eq (arg-info-keyword info) name)
+ (when (eq (arg-info-key info) name)
(ignores dummy)
(supplied (cons var val))
(return)))))))
\f
;;;; LET conversion
;;;;
-;;;; Converting to a LET has differing significance to various parts of the
-;;;; compiler:
-;;;; -- The body of a LET is spliced in immediately after the corresponding
-;;;; combination node, making the control transfer explicit and allowing
-;;;; LETs to be mashed together into a single block. The value of the LET is
-;;;; delivered directly to the original continuation for the call,
-;;;; eliminating the need to propagate information from the dummy result
-;;;; continuation.
-;;;; -- As far as IR1 optimization is concerned, it is interesting in that
-;;;; there is only one expression that the variable can be bound to, and
-;;;; this is easily substitited for.
-;;;; -- LETs are interesting to environment analysis and to the back end
-;;;; because in most ways a LET can be considered to be "the same function"
-;;;; as its home function.
-;;;; -- LET conversion has dynamic scope implications, since control transfers
-;;;; within the same environment are local. In a local control transfer,
-;;;; cleanup code must be emitted to remove dynamic bindings that are no
-;;;; longer in effect.
-
-;;; Set up the control transfer to the called lambda. We split the call
-;;; block immediately after the call, and link the head of FUN to the call
-;;; block. The successor block after splitting (where we return to) is
-;;; returned.
-;;;
-;;; If the lambda is is a different component than the call, then we call
-;;; JOIN-COMPONENTS. This only happens in block compilation before
-;;; FIND-INITIAL-DFO.
+;;;; Converting to a LET has differing significance to various parts
+;;;; of the compiler:
+;;;; -- The body of a LET is spliced in immediately after the
+;;;; corresponding combination node, making the control transfer
+;;;; explicit and allowing LETs to be mashed together into a single
+;;;; block. The value of the LET is delivered directly to the
+;;;; original continuation for the call,eliminating the need to
+;;;; propagate information from the dummy result continuation.
+;;;; -- As far as IR1 optimization is concerned, it is interesting in
+;;;; that there is only one expression that the variable can be bound
+;;;; to, and this is easily substitited for.
+;;;; -- LETs are interesting to environment analysis and to the back
+;;;; end because in most ways a LET can be considered to be "the
+;;;; same function" as its home function.
+;;;; -- LET conversion has dynamic scope implications, since control
+;;;; transfers within the same environment are local. In a local
+;;;; control transfer, cleanup code must be emitted to remove
+;;;; dynamic bindings that are no longer in effect.
+
+;;; Set up the control transfer to the called lambda. We split the
+;;; call block immediately after the call, and link the head of FUN to
+;;; the call block. The successor block after splitting (where we
+;;; return to) is returned.
+;;;
+;;; If the lambda is is a different component than the call, then we
+;;; call JOIN-COMPONENTS. This only happens in block compilation
+;;; before FIND-INITIAL-DFO.
(defun insert-let-body (fun call)
(declare (type clambda fun) (type basic-combination call))
(let* ((call-block (node-block call))
(component (block-component call-block)))
(let ((fun-component (block-component bind-block)))
(unless (eq fun-component component)
- (assert (eq (component-kind component) :initial))
+ (aver (eq (component-kind component) :initial))
(join-components component fun-component)))
(let ((*current-component* component))
;; FIXME: Use PROPER-LIST-OF-LENGTH-P here, and look for other
;; uses of '=.*length' which could also be converted to use
;; PROPER-LIST-OF-LENGTH-P.
- (assert (= (length (block-succ call-block)) 1))
+ (aver (= (length (block-succ call-block)) 1))
(let ((next-block (first (block-succ call-block))))
(unlink-blocks call-block next-block)
(link-blocks call-block bind-block)
(add-continuation-use this-call cont)))
(:deleted)
(:assignment
- (assert (eq called fun))))))))
+ (aver (eq called fun))))))))
(values))
;;; Deal with returning from a LET or assignment that we are
(move-return-uses fun call
(or next-block (node-block call-return)))))
(t
- (assert (node-tail-p call))
+ (aver (node-tail-p call))
(setf (lambda-return call-fun) return)
(setf (return-lambda return) call-fun))))
(move-let-call-cont fun)
(not (functional-entry-function fun)))
(let* ((ref-cont (node-cont (first refs)))
(dest (continuation-dest ref-cont)))
- (when (and (basic-combination-p dest)
+ (when (and dest
+ (basic-combination-p dest)
(eq (basic-combination-fun dest) ref-cont)
(eq (basic-combination-kind dest) :local)
(not (block-delete-p (node-block dest)))
(defun maybe-convert-tail-local-call (call)
(declare (type combination call))
(let ((return (continuation-dest (node-cont call))))
- (assert (return-p return))
+ (aver (return-p return))
(when (and (not (node-tail-p call))
(immediately-used-p (return-result return) call)
(not (eq (functional-kind (node-home-lambda call))
(call-fun nil))
(when (and (dolist (ref (leaf-refs fun) t)
(let ((dest (continuation-dest (node-cont ref))))
- (when (block-delete-p (node-block dest)) (return nil))
+ (when (or (not dest)
+ (block-delete-p (node-block dest)))
+ (return nil))
(let ((home (node-home-lambda ref)))
(unless (eq home fun)
(when call-fun (return nil))
projects / sbcl.git / blobdiff