X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=9b6336118dd43240f194c4148b04db476fe6dac2;hb=f980e90c5539626c007de121278e66acdb91d37c;hp=e820d461ec980902921a1375d713c374089407c0;hpb=83659744f9caa97aa83eb562d872b1c0127403c0;p=sbcl.git diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp index e820d46..9b63361 100644 --- a/src/compiler/locall.lisp +++ b/src/compiler/locall.lisp @@ -47,7 +47,7 @@ (declare (type combination call) (type clambda fun)) (loop for arg in (basic-combination-args call) for var in (lambda-vars fun) - for dx = (lambda-var-dynamic-extent var) + for dx = (leaf-dynamic-extent var) when (and dx arg (not (lvar-dynamic-extent arg))) append (handle-nested-dynamic-extent-lvars dx arg) into dx-lvars finally (when dx-lvars @@ -163,9 +163,7 @@ ,(if (policy *lexenv* (zerop verify-arg-count)) `(declare (ignore ,n-supplied)) `(%verify-arg-count ,n-supplied ,nargs)) - (locally - (declare (optimize (merge-tail-calls 3))) - (%funcall ,fun ,@temps))))) + (%funcall ,fun ,@temps)))) (optional-dispatch (let* ((min (optional-dispatch-min-args fun)) (max (optional-dispatch-max-args fun)) @@ -190,9 +188,7 @@ ,(with-unique-names (n-context n-count) `(multiple-value-bind (,n-context ,n-count) (%more-arg-context ,n-supplied ,max) - (locally - (declare (optimize (merge-tail-calls 3))) - (%funcall ,more ,@temps ,n-context ,n-count))))))) + (%funcall ,more ,@temps ,n-context ,n-count)))))) (t (%arg-count-error ,n-supplied))))))))) @@ -494,6 +490,24 @@ (lexenv-policy (node-lexenv call)))))) (values)) +;;; Convenience function to mark local calls as known bad. +(defun transform-call-with-ir1-environment (node lambda default-name) + (aver (combination-p node)) + (with-ir1-environment-from-node node + (transform-call node lambda + (or (combination-fun-source-name node nil) + default-name)))) + +(defun warn-invalid-local-call (node count &rest warn-arguments) + (aver (combination-p node)) + (aver (typep count 'unsigned-byte)) + (apply 'warn warn-arguments) + (transform-call-with-ir1-environment node + `(lambda (&rest args) + (declare (ignore args)) + (%arg-count-error ,count)) + '%arg-count-error)) + ;;; Attempt to convert a call to a lambda. If the number of args is ;;; wrong, we give a warning and mark the call as :ERROR to remove it ;;; from future consideration. If the argcount is O.K. then we just @@ -505,12 +519,11 @@ (cond ((= n-call-args nargs) (convert-call ref call fun)) (t - (warn + (warn-invalid-local-call call n-call-args 'local-argument-mismatch :format-control "function called with ~R argument~:P, but wants exactly ~R" - :format-arguments (list n-call-args nargs)) - (setf (basic-combination-kind call) :error))))) + :format-arguments (list n-call-args nargs)))))) ;;;; &OPTIONAL, &MORE and &KEYWORD calls @@ -526,12 +539,11 @@ (max-args (optional-dispatch-max-args fun)) (call-args (length (combination-args call)))) (cond ((< call-args min-args) - (warn + (warn-invalid-local-call call call-args 'local-argument-mismatch :format-control "function called with ~R argument~:P, but wants at least ~R" - :format-arguments (list call-args min-args)) - (setf (basic-combination-kind call) :error)) + :format-arguments (list call-args min-args))) ((<= call-args max-args) (convert-call ref call (let ((*current-component* (node-component ref))) @@ -540,13 +552,12 @@ ((optional-dispatch-more-entry fun) (convert-more-call ref call fun)) (t - (warn + (warn-invalid-local-call call call-args 'local-argument-mismatch :format-control "function called with ~R argument~:P, but wants at most ~R" :format-arguments - (list call-args max-args)) - (setf (basic-combination-kind call) :error)))) + (list call-args max-args))))) (values)) ;;; This function is used to convert a call to an entry point when @@ -560,14 +571,15 @@ ;;; function that rearranges the arguments and calls the entry point. ;;; We analyze the new function and the entry point immediately so ;;; that everything gets converted during the single pass. -(defun convert-hairy-fun-entry (ref call entry vars ignores args) +(defun convert-hairy-fun-entry (ref call entry vars ignores args indef) (declare (list vars ignores args) (type ref ref) (type combination call) (type clambda entry)) (let ((new-fun (with-ir1-environment-from-node call (ir1-convert-lambda `(lambda ,vars - (declare (ignorable ,@ignores)) + (declare (ignorable ,@ignores) + (indefinite-extent ,@indef)) (%funcall ,entry ,@args)) :debug-name (debug-name 'hairy-function-entry (lvar-fun-debug-name @@ -625,7 +637,12 @@ (when (oddp (length more)) (compiler-warn "function called with odd number of ~ arguments in keyword portion") - (setf (basic-combination-kind call) :error) + (transform-call-with-ir1-environment + call + `(lambda (&rest args) + (declare (ignore args)) + (%odd-key-args-error)) + '%odd-key-args-error) (return-from convert-more-call)) (do ((key more (cddr key)) @@ -666,7 +683,12 @@ (when (and loser (not (optional-dispatch-allowp fun)) (not allowp)) (compiler-warn "function called with unknown argument keyword ~S" (car loser)) - (setf (basic-combination-kind call) :error) + (transform-call-with-ir1-environment + call + `(lambda (&rest args) + (declare (ignore args)) + (%unknown-key-arg-error ',(car loser))) + '%unknown-key-arg-error) (return-from convert-more-call))) (collect ((call-args)) @@ -682,6 +704,22 @@ (call-args t))) (:rest (call-args `(list ,@more-temps)) + ;; &REST arguments may be accompanied by extra + ;; context and count arguments. We know this by + ;; the ARG-INFO-DEFAULT. Supply 0 and 0 or + ;; don't convert at all depending. + (let ((more (arg-info-default info))) + (when more + (unless (eq t more) + (destructuring-bind (context count &optional used) more + (declare (ignore context count)) + (when used + ;; We've already converted to use the more context + ;; instead of the rest list. + (return-from convert-more-call)))) + (call-args 0) + (call-args 0) + (setf (arg-info-default info) t))) (return)) (:keyword (return))) @@ -698,7 +736,9 @@ (convert-hairy-fun-entry ref call (optional-dispatch-main-entry fun) (append temps more-temps) - (ignores) (call-args))))) + (ignores) (call-args) + (when (optional-rest-p fun) + more-temps))))) (values)) @@ -1014,7 +1054,13 @@ ;; with anonymous things, and suppressing inlining ;; for such things can easily give Python acute indigestion, so ;; we don't.) - (when (leaf-has-source-name-p clambda) + ;; + ;; A functional that is already inline-expanded in this componsne definitely + ;; deserves let-conversion -- and in case of main entry points for inline + ;; expanded optional dispatch, the main-etry isn't explicitly marked :INLINE + ;; even if the function really is. + (when (and (leaf-has-source-name-p clambda) + (not (functional-inline-expanded clambda))) ;; ANSI requires that explicit NOTINLINE be respected. (or (eq (lambda-inlinep clambda) :notinline) ;; If (= LET-CONVERSION 0) we can guess that inlining