X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1tran-lambda.lisp;h=3fcf3556fd1a1959fef628acab6ab31059a00797;hb=304c44d731bea3b9ce3c47d864d90eac92ba604e;hp=95fc019d370c721dca3be16aa5bed23c1430f191;hpb=28ce7a00cbce6d27b127fd6a2783325c8198a568;p=sbcl.git diff --git a/src/compiler/ir1tran-lambda.lisp b/src/compiler/ir1tran-lambda.lisp index 95fc019..3fcf355 100644 --- a/src/compiler/ir1tran-lambda.lisp +++ b/src/compiler/ir1tran-lambda.lisp @@ -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,11 +285,11 @@ ;;; 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 @@ -286,7 +308,13 @@ :bind bind :%source-name source-name :%debug-name debug-name)) - (result (make-continuation))) + (result-ctran (make-ctran)) + (result-lvar (make-lvar)) + (dx-rest nil)) + + (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. @@ -298,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 @@ -312,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 @@ -320,28 +353,31 @@ (setf (bind-lambda bind) lambda) (setf (node-lexenv bind) *lexenv*) - (let ((block (continuation-starts-block result))) - (let ((return (make-return :result result :lambda lambda)) - (tail-set (make-tail-set :funs (list lambda))) - (dummy (make-continuation))) + (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 (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)) + (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* - (continuation-block result)) - (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)))))) + (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*)) @@ -354,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 @@ -508,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))