X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1tran-lambda.lisp;h=f4fd597c19873cec59e868bff74bb1a110069688;hb=bea5b384106a6734a4b280a76e8ebdd4d51b5323;hp=b7d218e3fb3292c4aaebaa9b30034d15b1e728ea;hpb=d6cacf136631916da0db8bbe32554ca499e17589;p=sbcl.git diff --git a/src/compiler/ir1tran-lambda.lisp b/src/compiler/ir1tran-lambda.lisp index b7d218e..f4fd597 100644 --- a/src/compiler/ir1tran-lambda.lisp +++ b/src/compiler/ir1tran-lambda.lisp @@ -202,20 +202,22 @@ ;;; 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) :aux-vals (rest aux-vals) - :debug-name (debug-namify - "&AUX bindings ~S" - aux-vars)))) - (reference-leaf start fun-cont fun) - (ir1-convert-combination-args fun-cont cont + :debug-name (debug-name + '&aux-bindings + aux-vars)))) + (reference-leaf start ctran fun-lvar fun) + (ir1-convert-combination-args fun-lvar ctran next result (list (first aux-vals))))) (values)) @@ -225,29 +227,31 @@ ;;; 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)) @@ -263,22 +267,20 @@ ;;; 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*) @@ -288,7 +290,12 @@ :bind bind :%source-name source-name :%debug-name debug-name)) - (result (or result (make-continuation)))) + (result-ctran (make-ctran)) + (result-lvar (make-lvar))) + + (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. @@ -300,12 +307,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 @@ -322,27 +329,25 @@ (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 + (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) + (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)) @@ -356,8 +361,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 @@ -369,7 +373,7 @@ ;;; then we mark the corresponding var as EVER-USED to inhibit ;;; "defined but not read" warnings for arguments that are only used ;;; by default forms. -(defun convert-optional-entry (fun vars vals defaults) +(defun convert-optional-entry (fun vars vals defaults name) (declare (type clambda fun) (list vars vals defaults)) (let* ((fvars (reverse vars)) (arg-vars (mapcar (lambda (var) @@ -392,9 +396,13 @@ ,@(reverse vals) ,@(default-vals)))) arg-vars - :debug-name - (debug-namify "&OPTIONAL processor ~D" - (random 100)) + ;; FIXME: Would be nice to + ;; share these names instead + ;; of consing up several + ;; identical ones. Oh well. + :debug-name (debug-name + '&optional-processor + name) :note-lexical-bindings nil)))) (mapc (lambda (var arg-var) (when (cdr (leaf-refs arg-var)) @@ -411,13 +419,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)) @@ -432,7 +439,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 @@ -441,7 +448,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)))) @@ -449,22 +456,22 @@ ;; problems: hidden references should not be established to ;; lambdas of kind NIL should not have (otherwise the compiler ;; might let-convert or delete them) and to variables. - (if (or force - supplied-p-p ; this entry will be of kind NIL - (and (lambda-p ep) (eq (lambda-kind ep) nil))) - (convert-optional-entry ep - default-vars default-vals - (if supplied-p - (list default nil) - (list default))) - (delay - (register-entry-point - (convert-optional-entry (force ep) - default-vars default-vals - (if supplied-p - (list default nil) - (list default))) - res))))) + (let ((name (or debug-name source-name)) + (defaults (if supplied-p (list default nil) (list default)))) + (if (or force + supplied-p-p ; this entry will be of kind NIL + (and (lambda-p ep) (eq (lambda-kind ep) nil))) + (convert-optional-entry ep + default-vars default-vals + defaults + name) + (delay + (register-entry-point + (convert-optional-entry (force ep) + default-vars default-vals + defaults + name) + res)))))) ;;; Create the MORE-ENTRY function for the OPTIONAL-DISPATCH RES. ;;; ENTRY-VARS and ENTRY-VALS describe the fixed arguments. REST is @@ -490,7 +497,7 @@ ;;; ;;; We deal with :ALLOW-OTHER-KEYS by delaying unknown keyword errors ;;; until we have scanned all the keywords. -(defun convert-more-entry (res entry-vars entry-vals rest morep keys) +(defun convert-more-entry (res entry-vars entry-vals rest morep keys name) (declare (type optional-dispatch res) (list entry-vars entry-vals keys)) (collect ((arg-vars) (arg-vals (reverse entry-vals)) @@ -502,7 +509,8 @@ :type (leaf-type var) :where-from (leaf-where-from var)))) - (let* ((n-context (gensym "N-CONTEXT-")) + (let* ((*allow-instrumenting* nil) + (n-context (gensym "N-CONTEXT-")) (context-temp (make-lambda-var :%source-name n-context)) (n-count (gensym "N-COUNT-")) (count-temp (make-lambda-var :%source-name n-count @@ -511,7 +519,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))) (when morep (arg-vals n-context) (arg-vals n-count)) @@ -561,7 +570,7 @@ (tests `((eq ,n-key :allow-other-keys) (setq ,n-allowp ,n-value-temp)))) (tests `(t - (setq ,n-losep ,n-key)))) + (setq ,n-losep (list ,n-key))))) (body `(when (oddp ,n-count) @@ -580,7 +589,7 @@ (unless allowp (body `(when (and ,n-losep (not ,n-allowp)) - (%unknown-key-arg-error ,n-losep))))))) + (%unknown-key-arg-error (car ,n-losep)))))))) (let ((ep (ir1-convert-lambda-body `((let ,(temps) @@ -588,7 +597,7 @@ (%funcall ,(optional-dispatch-main-entry res) ,@(arg-vals)))) (arg-vars) - :debug-name (debug-namify "~S processing" '&more) + :debug-name (debug-name '&more-processor name) :note-lexical-bindings nil))) (setf (optional-dispatch-more-entry res) (register-entry-point ep res))))) @@ -614,12 +623,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) @@ -671,23 +679,23 @@ (main-vals (arg-info-default info)) (bind-vals n-val))))) - (let* ((main-entry (ir1-convert-lambda-body + (let* ((name (or debug-name source-name)) + (main-entry (ir1-convert-lambda-body 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)))) + :debug-name (debug-name 'varargs-entry name))) (last-entry (convert-optional-entry main-entry default-vars - (main-vals) ()))) + (main-vals) () name))) (setf (optional-dispatch-main-entry res) (register-entry-point main-entry res)) - (convert-more-entry res entry-vars entry-vals rest more-context keys) + (convert-more-entry res entry-vars entry-vals rest more-context keys + name) (push (register-entry-point (if supplied-p-p - (convert-optional-entry last-entry entry-vars entry-vals ()) + (convert-optional-entry last-entry entry-vars entry-vals + () name) last-entry) res) (optional-dispatch-entry-points res)) @@ -728,34 +736,32 @@ (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) - (let ((fun (ir1-convert-lambda-body + aux-vals source-name debug-name) + (let* ((name (or debug-name source-name)) + (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 - debug-name))))) + :debug-name (debug-name 'hairy-arg-processor name)))) + (setf (optional-dispatch-main-entry res) fun) (register-entry-point fun res) (push (if supplied-p-p (register-entry-point - (convert-optional-entry fun entry-vars entry-vals ()) + (convert-optional-entry fun entry-vars entry-vals () + name) res) fun) (optional-dispatch-entry-points res)) @@ -766,7 +772,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 @@ -778,14 +783,16 @@ (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. (push (if (lambda-p ep) (register-entry-point (if supplied-p-p - (convert-optional-entry ep entry-vars entry-vals ()) + (convert-optional-entry + ep entry-vars entry-vals nil + (or debug-name source-name)) ep) res) (progn (aver (not supplied-p-p)) @@ -796,31 +803,30 @@ (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)) + (debug-name + (debug-name '&optional-dispatch vars))) + (declare (list body vars aux-vars aux-vals)) (let ((res (make-optional-dispatch :arglist vars :allowp allowp :keyp keyp @@ -833,7 +839,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)) @@ -842,9 +848,7 @@ ;;; 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) (unless (consp form) (compiler-error "A ~S was found when expecting a lambda expression:~% ~S" (type-of form) @@ -859,71 +863,73 @@ "The lambda expression has a missing or non-list lambda list:~% ~S" form)) - (let ((*allow-debug-catch-tag* (and *allow-debug-catch-tag* allow-debug-catch-tag))) - (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* (= insert-debug-catch 3))) - `((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)))) - (setf (functional-inline-expansion res) form) - (setf (functional-arg-documentation res) (cadr form)) - res))))) + (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)) + (binding* (((*lexenv* result-type) + (process-decls decls (append aux-vars vars) nil)) + (forms (if (and *allow-instrumenting* + (policy *lexenv* (>= insert-debug-catch 2))) + `((catch (locally + (declare (optimize (insert-step-conditions 0))) + (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)))) ;;; helper for LAMBDA-like things, to massage them into a form ;;; suitable for IR1-CONVERT-LAMBDA. -;;; -;;; KLUDGE: We cons up a &REST list here, maybe for no particularly -;;; good reason. It's probably lost in the noise of all the other -;;; consing, but it's still inelegant. And we force our called -;;; functions to do full runtime keyword parsing, ugh. -- CSR, -;;; 2003-01-25 -(defun ir1-convert-lambdalike (thing &rest args - &key (source-name '.anonymous.) - debug-name allow-debug-catch-tag) - (declare (ignorable source-name debug-name allow-debug-catch-tag)) +(defun ir1-convert-lambdalike (thing + &key + (source-name '.anonymous.) + debug-name) (ecase (car thing) - ((lambda) (apply #'ir1-convert-lambda thing args)) + ((lambda) + (ir1-convert-lambda thing + :source-name source-name + :debug-name debug-name)) ((instance-lambda) - (let ((res (apply #'ir1-convert-lambda - `(lambda ,@(cdr thing)) args))) + (let ((res (ir1-convert-lambda `(lambda ,@(cdr thing)) + :source-name source-name + :debug-name debug-name))) (setf (getf (functional-plist res) :fin-function) t) res)) ((named-lambda) - (let ((name (cadr thing))) + (let ((name (cadr thing)) + (lambda-expression `(lambda ,@(cddr thing)))) (if (legal-fun-name-p name) (let ((defined-fun-res (get-defined-fun name)) - (res (apply #'ir1-convert-lambda `(lambda ,@(cddr thing)) - :source-name name - :debug-name nil - args))) + (res (ir1-convert-lambda lambda-expression + :source-name name))) (assert-global-function-definition-type name res) - (setf (defined-fun-functional defined-fun-res) - res) + (setf (defined-fun-functional defined-fun-res) res) (unless (eq (defined-fun-inlinep defined-fun-res) :notinline) - (substitute-leaf res defined-fun-res)) + (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)))) - ((lambda-with-lexenv) (apply #'ir1-convert-inline-lambda thing args)))) + (ir1-convert-lambda lambda-expression :debug-name name)))) + ((lambda-with-lexenv) + (ir1-convert-inline-lambda thing + :source-name source-name + :debug-name debug-name)))) ;;;; defining global functions @@ -933,15 +939,13 @@ ;;; reflect the state at the definition site. (defun ir1-convert-inline-lambda (fun &key (source-name '.anonymous.) - debug-name - allow-debug-catch-tag) + debug-name) (destructuring-bind (decls macros symbol-macros &rest body) (if (eq (car fun) 'lambda-with-lexenv) (cdr fun) `(() () () . ,(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) @@ -951,8 +955,7 @@ :policy (lexenv-policy *lexenv*)))) (ir1-convert-lambda `(lambda ,@body) :source-name source-name - :debug-name debug-name - :allow-debug-catch-tag nil)))) + :debug-name debug-name)))) ;;; Get a DEFINED-FUN object for a function we are about to define. If ;;; the function has been forward referenced, then substitute for the @@ -1050,18 +1053,20 @@ ;;; ;;; The INLINE-EXPANSION is a LAMBDA-WITH-LEXENV, or NIL if there is ;;; no inline expansion. -(defun %compiler-defun (name lambda-with-lexenv) - +(defun %compiler-defun (name lambda-with-lexenv compile-toplevel) (let ((defined-fun nil)) ; will be set below if we're in the compiler - - (when (boundp '*lexenv*) ; when in the compiler - (when sb!xc:*compile-print* - (compiler-mumble "~&; recognizing DEFUN ~S~%" name)) + (when compile-toplevel + ;; better be in the compiler + (aver (boundp '*lexenv*)) (remhash name *free-funs*) - (setf defined-fun (get-defined-fun name))) + (setf defined-fun (get-defined-fun name)) + (aver (fasl-output-p *compile-object*)) + (if (member name *fun-names-in-this-file* :test #'equal) + (warn 'duplicate-definition :name name) + (push name *fun-names-in-this-file*))) (become-defined-fun-name name) - + (cond (lambda-with-lexenv (setf (info :function :inline-expansion-designator name) lambda-with-lexenv)