X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1tran-lambda.lisp;h=3fcf3556fd1a1959fef628acab6ab31059a00797;hb=304c44d731bea3b9ce3c47d864d90eac92ba604e;hp=c57459a93d82d38cfbc8ef55173514e5e22df2db;hpb=16f848f33e91035457132f704448d2d23c34724e;p=sbcl.git diff --git a/src/compiler/ir1tran-lambda.lisp b/src/compiler/ir1tran-lambda.lisp index c57459a..3fcf355 100644 --- a/src/compiler/ir1tran-lambda.lisp +++ b/src/compiler/ir1tran-lambda.lisp @@ -47,7 +47,7 @@ ;;; Make the default keyword for a &KEY arg, checking that the keyword ;;; isn't already used by one of the VARS. -(declaim (ftype (sfunction (symbol list t) keyword) make-keyword-for-arg)) +(declaim (ftype (sfunction (symbol list t) symbol) make-keyword-for-arg)) (defun make-keyword-for-arg (symbol vars keywordify) (let ((key (if (and keywordify (not (keywordp symbol))) (keywordicate symbol) @@ -202,11 +202,13 @@ ;;; FIXME: This could and probably should be converted to use ;;; SOURCE-NAME and DEBUG-NAME. But I (WHN) don't use &AUX bindings, ;;; so I'm not motivated. Patches will be accepted... -(defun ir1-convert-aux-bindings (start cont body aux-vars aux-vals) - (declare (type continuation start cont) (list body aux-vars aux-vals)) +(defun ir1-convert-aux-bindings (start next result body aux-vars aux-vals) + (declare (type ctran start next) (type (or lvar null) result) + (list body aux-vars aux-vals)) (if (null aux-vars) - (ir1-convert-progn-body start cont body) - (let ((fun-cont (make-continuation)) + (ir1-convert-progn-body start next result body) + (let ((ctran (make-ctran)) + (fun-lvar (make-lvar)) (fun (ir1-convert-lambda-body body (list (first aux-vars)) :aux-vars (rest aux-vars) @@ -214,8 +216,8 @@ :debug-name (debug-namify "&AUX bindings ~S" aux-vars)))) - (reference-leaf start fun-cont fun) - (ir1-convert-combination-args fun-cont cont + (reference-leaf start ctran fun-lvar fun) + (ir1-convert-combination-args fun-lvar ctran next result (list (first aux-vals))))) (values)) @@ -225,32 +227,52 @@ ;;; the body, otherwise we do one special binding and recurse on the ;;; rest. ;;; -;;; We make a cleanup and introduce it into the lexical environment. -;;; If there are multiple special bindings, the cleanup for the blocks -;;; will end up being the innermost one. We force CONT to start a -;;; block outside of this cleanup, causing cleanup code to be emitted -;;; when the scope is exited. -(defun ir1-convert-special-bindings (start cont body aux-vars aux-vals svars) - (declare (type continuation start cont) +;;; We make a cleanup and introduce it into the lexical +;;; environment. If there are multiple special bindings, the cleanup +;;; for the blocks will end up being the innermost one. We force NEXT +;;; to start a block outside of this cleanup, causing cleanup code to +;;; be emitted when the scope is exited. +(defun ir1-convert-special-bindings + (start next result body aux-vars aux-vals svars) + (declare (type ctran start next) (type (or lvar null) result) (list body aux-vars aux-vals svars)) (cond ((null svars) - (ir1-convert-aux-bindings start cont body aux-vars aux-vals)) + (ir1-convert-aux-bindings start next result body aux-vars aux-vals)) (t - (continuation-starts-block cont) + (ctran-starts-block next) (let ((cleanup (make-cleanup :kind :special-bind)) (var (first svars)) - (next-cont (make-continuation)) - (nnext-cont (make-continuation))) - (ir1-convert start next-cont + (bind-ctran (make-ctran)) + (cleanup-ctran (make-ctran))) + (ir1-convert start bind-ctran nil `(%special-bind ',(lambda-var-specvar var) ,var)) - (setf (cleanup-mess-up cleanup) (continuation-use next-cont)) + (setf (cleanup-mess-up cleanup) (ctran-use bind-ctran)) (let ((*lexenv* (make-lexenv :cleanup cleanup))) - (ir1-convert next-cont nnext-cont '(%cleanup-point)) - (ir1-convert-special-bindings nnext-cont cont body aux-vars aux-vals + (ir1-convert bind-ctran cleanup-ctran nil '(%cleanup-point)) + (ir1-convert-special-bindings cleanup-ctran next result + body aux-vars aux-vals (rest svars)))))) (values)) +;;; FIXME: this is the interface of the CMUCL WITH-DYNAMIC-EXTENT +;;; macro. It is slightly confusing, in that START and BODY-START are +;;; already-existing CTRANs (and FIXME: probably deserve a ONCE-ONLY), +;;; whereas NEXT is a variable naming a CTRAN in the body. -- CSR, +;;; 2004-03-30. +(defmacro with-dynamic-extent ((start body-start next kind) &body body) + (with-unique-names (cleanup next-ctran) + `(progn + (ctran-starts-block ,body-start) + (let ((,cleanup (make-cleanup :kind :dynamic-extent)) + (,next-ctran (make-ctran)) + (,next (make-ctran))) + (ir1-convert ,start ,next-ctran nil '(%dynamic-extent-start)) + (setf (cleanup-mess-up ,cleanup) (ctran-use ,next-ctran)) + (let ((*lexenv* (make-lexenv :cleanup ,cleanup))) + (ir1-convert ,next-ctran ,next nil '(%cleanup-point)) + (locally ,@body)))))) + ;;; Create a lambda node out of some code, returning the result. The ;;; bindings are specified by the list of VAR structures VARS. We deal ;;; with adding the names to the LEXENV-VARS for the conversion. The @@ -263,34 +285,36 @@ ;;; the special binding code. ;;; ;;; We ignore any ARG-INFO in the VARS, trusting that someone else is -;;; dealing with &nonsense. +;;; dealing with &NONSENSE, except for &REST vars with DYNAMIC-EXTENT. ;;; ;;; AUX-VARS is a list of VAR structures for variables that are to be ;;; sequentially bound. Each AUX-VAL is a form that is to be evaluated -;;; to get the initial value for the corresponding AUX-VAR. +;;; to get the initial value for the corresponding AUX-VAR. (defun ir1-convert-lambda-body (body vars &key aux-vars aux-vals - result (source-name '.anonymous.) debug-name (note-lexical-bindings t)) - (declare (list body vars aux-vars aux-vals) - (type (or continuation null) result)) + (declare (list body vars aux-vars aux-vals)) ;; We're about to try to put new blocks into *CURRENT-COMPONENT*. (aver-live-component *current-component*) (let* ((bind (make-bind)) (lambda (make-lambda :vars vars - :bind bind - :%source-name source-name - :%debug-name debug-name)) - (result (or result (make-continuation)))) + :bind bind + :%source-name source-name + :%debug-name debug-name)) + (result-ctran (make-ctran)) + (result-lvar (make-lvar)) + (dx-rest nil)) - (continuation-starts-block result) + (awhen (lexenv-lambda *lexenv*) + (push lambda (lambda-children it)) + (setf (lambda-parent lambda) it)) ;; just to check: This function should fail internal assertions if ;; we didn't set up a valid debug name above. @@ -302,12 +326,12 @@ (setf (lambda-home lambda) lambda) (collect ((svars) - (new-venv nil cons)) + (new-venv nil cons)) (dolist (var vars) ;; As far as I can see, LAMBDA-VAR-HOME should never have ;; been set before. Let's make sure. -- WHN 2001-09-29 - (aver (null (lambda-var-home var))) + (aver (not (lambda-var-home var))) (setf (lambda-var-home var) lambda) (let ((specvar (lambda-var-specvar var))) (cond (specvar @@ -316,7 +340,12 @@ (t (when note-lexical-bindings (note-lexical-binding (leaf-source-name var))) - (new-venv (cons (leaf-source-name var) var)))))) + (new-venv (cons (leaf-source-name var) var))))) + (let ((info (lambda-var-arg-info var))) + (when (and info + (eq (arg-info-kind info) :rest) + (leaf-dynamic-extent var)) + (setq dx-rest t)))) (let ((*lexenv* (make-lexenv :vars (new-venv) :lambda lambda @@ -324,27 +353,31 @@ (setf (bind-lambda bind) lambda) (setf (node-lexenv bind) *lexenv*) - (let ((cont1 (make-continuation)) - (cont2 (make-continuation))) - (continuation-starts-block cont1) - (link-node-to-previous-continuation bind cont1) - (use-continuation bind cont2) - (ir1-convert-special-bindings cont2 result body - aux-vars aux-vals (svars))) - - (let ((block (continuation-block result))) - (when block - (let ((return (make-return :result result :lambda lambda)) - (tail-set (make-tail-set :funs (list lambda))) - (dummy (make-continuation))) - (setf (lambda-tail-set lambda) tail-set) - (setf (lambda-return lambda) return) - (setf (continuation-dest result) return) - (flush-continuation-externally-checkable-type result) - (setf (block-last block) return) - (link-node-to-previous-continuation return result) - (use-continuation return dummy)) - (link-blocks block (component-tail *current-component*)))))) + (let ((block (ctran-starts-block result-ctran))) + (let ((return (make-return :result result-lvar :lambda lambda)) + (tail-set (make-tail-set :funs (list lambda)))) + (setf (lambda-tail-set lambda) tail-set) + (setf (lambda-return lambda) return) + (setf (lvar-dest result-lvar) return) + (link-node-to-previous-ctran return result-ctran) + (setf (block-last block) return)) + (link-blocks block (component-tail *current-component*))) + + (with-component-last-block (*current-component* + (ctran-block result-ctran)) + (let ((prebind-ctran (make-ctran)) + (postbind-ctran (make-ctran))) + (ctran-starts-block prebind-ctran) + (link-node-to-previous-ctran bind prebind-ctran) + (use-ctran bind postbind-ctran) + (if dx-rest + (with-dynamic-extent (postbind-ctran result-ctran dx :rest) + (ir1-convert-special-bindings dx result-ctran result-lvar + body aux-vars aux-vals + (svars))) + (ir1-convert-special-bindings postbind-ctran result-ctran + result-lvar body + aux-vars aux-vals (svars))))))) (link-blocks (component-head *current-component*) (node-block bind)) (push lambda (component-new-functionals *current-component*)) @@ -357,8 +390,7 @@ (type optional-dispatch dispatcher)) (setf (functional-kind entry) :optional) (setf (leaf-ever-used entry) t) - (setf (lambda-optional-dispatch entry) - dispatcher) + (setf (lambda-optional-dispatch entry) dispatcher) entry) ;;; Create the actual entry-point function for an optional entry @@ -412,13 +444,12 @@ (defun generate-optional-default-entry (res default-vars default-vals entry-vars entry-vals vars supplied-p-p body - aux-vars aux-vals cont + aux-vars aux-vals source-name debug-name force) (declare (type optional-dispatch res) (list default-vars default-vals entry-vars entry-vals vars body - aux-vars aux-vals) - (type (or continuation null) cont)) + aux-vars aux-vals)) (let* ((arg (first vars)) (arg-name (leaf-source-name arg)) (info (lambda-var-arg-info arg)) @@ -433,7 +464,7 @@ (list* (leaf-source-name supplied-p) arg-name default-vals) (cons arg entry-vars) (list* t arg-name entry-vals) - (rest vars) t body aux-vars aux-vals cont + (rest vars) t body aux-vars aux-vals source-name debug-name force) (ir1-convert-hairy-args @@ -442,7 +473,7 @@ (cons arg-name default-vals) (cons arg entry-vars) (cons arg-name entry-vals) - (rest vars) supplied-p-p body aux-vars aux-vals cont + (rest vars) supplied-p-p body aux-vars aux-vals source-name debug-name force)))) @@ -512,7 +543,8 @@ (arg-vars context-temp count-temp) (when rest - (arg-vals `(%listify-rest-args ,n-context ,n-count))) + (arg-vals `(%listify-rest-args + ,n-context ,n-count ,(leaf-dynamic-extent rest)))) (when morep (arg-vals n-context) (arg-vals n-count)) @@ -615,12 +647,11 @@ ;;; type when computing the type for the main entry's argument. (defun ir1-convert-more (res default-vars default-vals entry-vars entry-vals rest more-context more-count keys supplied-p-p - body aux-vars aux-vals cont + body aux-vars aux-vals source-name debug-name) (declare (type optional-dispatch res) (list default-vars default-vals entry-vars entry-vals keys body - aux-vars aux-vals) - (type (or continuation null) cont)) + aux-vars aux-vals)) (collect ((main-vars (reverse default-vars)) (main-vals default-vals cons) (bind-vars) @@ -676,7 +707,6 @@ body (main-vars) :aux-vars (append (bind-vars) aux-vars) :aux-vals (append (bind-vals) aux-vals) - :result cont :debug-name (debug-namify "varargs entry for ~A" (as-debug-name source-name debug-name)))) @@ -729,25 +759,23 @@ (defun ir1-convert-hairy-args (res default-vars default-vals entry-vars entry-vals vars supplied-p-p body aux-vars - aux-vals cont + aux-vals source-name debug-name force) (declare (type optional-dispatch res) (list default-vars default-vals entry-vars entry-vals vars body - aux-vars aux-vals) - (type (or continuation null) cont)) + aux-vars aux-vals)) (cond ((not vars) (if (optional-dispatch-keyp res) ;; Handle &KEY with no keys... (ir1-convert-more res default-vars default-vals entry-vars entry-vals nil nil nil vars supplied-p-p body aux-vars - aux-vals cont source-name debug-name) + aux-vals source-name debug-name) (let ((fun (ir1-convert-lambda-body body (reverse default-vars) :aux-vars aux-vars :aux-vals aux-vals - :result cont :debug-name (debug-namify "hairy arg processor for ~A" (as-debug-name source-name @@ -767,7 +795,6 @@ (nvals (cons (leaf-source-name arg) default-vals))) (ir1-convert-hairy-args res nvars nvals nvars nvals (rest vars) nil body aux-vars aux-vals - cont source-name debug-name nil))) (t @@ -779,7 +806,7 @@ (let ((ep (generate-optional-default-entry res default-vars default-vals entry-vars entry-vals vars supplied-p-p body - aux-vars aux-vals cont + aux-vars aux-vals source-name debug-name force))) ;; See GENERATE-OPTIONAL-DEFAULT-ENTRY. @@ -797,31 +824,31 @@ (ir1-convert-more res default-vars default-vals entry-vars entry-vals arg nil nil (rest vars) supplied-p-p body - aux-vars aux-vals cont + aux-vars aux-vals source-name debug-name)) (:more-context (ir1-convert-more res default-vars default-vals entry-vars entry-vals nil arg (second vars) (cddr vars) supplied-p-p - body aux-vars aux-vals cont + body aux-vars aux-vals source-name debug-name)) (:keyword (ir1-convert-more res default-vars default-vals entry-vars entry-vals nil nil nil vars supplied-p-p body aux-vars - aux-vals cont source-name debug-name))))))) + aux-vals source-name debug-name))))))) ;;; This function deals with the case where we have to make an ;;; OPTIONAL-DISPATCH to represent a LAMBDA. We cons up the result and ;;; call IR1-CONVERT-HAIRY-ARGS to do the work. When it is done, we ;;; figure out the MIN-ARGS and MAX-ARGS. -(defun ir1-convert-hairy-lambda (body vars keyp allowp aux-vars aux-vals cont +(defun ir1-convert-hairy-lambda (body vars keyp allowp aux-vars aux-vals &key (source-name '.anonymous.) (debug-name (debug-namify "OPTIONAL-DISPATCH ~S" vars))) - (declare (list body vars aux-vars aux-vals) (type continuation cont)) + (declare (list body vars aux-vars aux-vals)) (let ((res (make-optional-dispatch :arglist vars :allowp allowp :keyp keyp @@ -834,7 +861,7 @@ (aver-live-component *current-component*) (push res (component-new-functionals *current-component*)) (ir1-convert-hairy-args res () () () () vars nil body aux-vars aux-vals - cont source-name debug-name nil) + source-name debug-name nil) (setf (optional-dispatch-min-args res) min) (setf (optional-dispatch-max-args res) (+ (1- (length (optional-dispatch-entry-points res))) min)) @@ -843,8 +870,8 @@ ;;; Convert a LAMBDA form into a LAMBDA leaf or an OPTIONAL-DISPATCH leaf. (defun ir1-convert-lambda (form &key (source-name '.anonymous.) - debug-name - allow-debug-catch-tag) + debug-name + allow-debug-catch-tag) (unless (consp form) (compiler-error "A ~S was found when expecting a lambda expression:~% ~S" @@ -864,27 +891,27 @@ (multiple-value-bind (vars keyp allow-other-keys aux-vars aux-vals) (make-lambda-vars (cadr form)) (multiple-value-bind (forms decls) (parse-body (cddr form)) - (let* ((result-cont (make-continuation)) - (*lexenv* (process-decls decls - (append aux-vars vars) - nil result-cont)) - (forms (if (and *allow-debug-catch-tag* - (policy *lexenv* (> debug (max speed space)))) - `((catch (make-symbol "SB-DEBUG-CATCH-TAG") - ,@forms)) - forms)) - (res (if (or (find-if #'lambda-var-arg-info vars) keyp) - (ir1-convert-hairy-lambda forms vars keyp - allow-other-keys - aux-vars aux-vals result-cont - :source-name source-name - :debug-name debug-name) - (ir1-convert-lambda-body forms vars - :aux-vars aux-vars - :aux-vals aux-vals - :result result-cont - :source-name source-name - :debug-name debug-name)))) + (binding* (((*lexenv* result-type) + (process-decls decls (append aux-vars vars) nil)) + (forms (if (and *allow-debug-catch-tag* + (policy *lexenv* (>= insert-debug-catch 2))) + `((catch (make-symbol "SB-DEBUG-CATCH-TAG") + ,@forms)) + forms)) + (forms (if (eq result-type *wild-type*) + forms + `((the ,result-type (progn ,@forms))))) + (res (if (or (find-if #'lambda-var-arg-info vars) keyp) + (ir1-convert-hairy-lambda forms vars keyp + allow-other-keys + aux-vars aux-vals + :source-name source-name + :debug-name debug-name) + (ir1-convert-lambda-body forms vars + :aux-vars aux-vars + :aux-vals aux-vals + :source-name source-name + :debug-name debug-name)))) (setf (functional-inline-expansion res) form) (setf (functional-arg-documentation res) (cadr form)) res))))) @@ -911,11 +938,19 @@ ((named-lambda) (let ((name (cadr thing))) (if (legal-fun-name-p name) - (let ((res (apply #'ir1-convert-lambda `(lambda ,@(cddr thing)) + (let ((defined-fun-res (get-defined-fun name)) + (res (apply #'ir1-convert-lambda `(lambda ,@(cddr thing)) :source-name name :debug-name nil args))) (assert-global-function-definition-type name res) + (setf (defined-fun-functional defined-fun-res) + res) + (unless (eq (defined-fun-inlinep defined-fun-res) :notinline) + (substitute-leaf-if + (lambda (ref) + (policy ref (> recognize-self-calls 0))) + res defined-fun-res)) res) (apply #'ir1-convert-lambda `(lambda ,@(cddr thing)) :debug-name name args)))) @@ -937,7 +972,6 @@ `(() () () . ,(cdr fun))) (let ((*lexenv* (make-lexenv :default (process-decls decls nil nil - (make-continuation) (make-null-lexenv)) :vars (copy-list symbol-macros) :funs (mapcar (lambda (x) @@ -995,7 +1029,7 @@ ;; compilation unit, so we can't do that. -- WHN 2001-02-11 :lossage-fun #'compiler-style-warn :unwinnage-fun (cond (info #'compiler-style-warn) - (for-real #'compiler-note) + (for-real #'compiler-notify) (t nil)) :really-assert (and for-real