X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmain.lisp;h=871a27c46b52561f301fb73ef5913512efea35ef;hb=dfa55a883f94470267b626dae77ce7e7dfac3df6;hp=d1c14a3acee57a9117bbd8f4ac05685de012391f;hpb=fa8962d732057015fbb9a2f8a08ea8d5299b50dd;p=sbcl.git diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp index d1c14a3..871a27c 100644 --- a/src/compiler/main.lisp +++ b/src/compiler/main.lisp @@ -1,4 +1,6 @@ -;;;; the top-level interfaces to the compiler +;;;; the top-level interfaces to the compiler, plus some other +;;;; compiler-related stuff (e.g. CL:CALL-ARGUMENTS-LIMIT) which +;;;; doesn't obviously belong anywhere else ;;;; This software is part of the SBCL system. See the README file for ;;;; more information. @@ -11,6 +13,20 @@ (in-package "SB!C") +(defconstant sb!xc:call-arguments-limit most-positive-fixnum + #!+sb-doc + "The exclusive upper bound on the number of arguments which may be passed + to a function, including &REST args.") +(defconstant sb!xc:lambda-parameters-limit most-positive-fixnum + #!+sb-doc + "The exclusive upper bound on the number of parameters which may be specifed + in a given lambda list. This is actually the limit on required and &OPTIONAL + parameters. With &KEY and &AUX you can get more.") +(defconstant sb!xc:multiple-values-limit most-positive-fixnum + #!+sb-doc + "The exclusive upper bound on the number of multiple VALUES that you can + return.") + ;;; FIXME: Doesn't this belong somewhere else, like early-c.lisp? (declaim (special *constants* *free-variables* *component-being-compiled* *code-vector* *next-location* *result-fixups* @@ -40,7 +56,8 @@ forms (evaluated at load-time) when the :BYTE-COMPILE argument is :MAYBE (the default.) When true, we decide to byte-compile.") -;;; default value of the :BYTE-COMPILE argument to the compiler +;;; the value of the :BYTE-COMPILE argument which was passed to the +;;; compiler (defvar *byte-compile* :maybe) ;;; Bound by COMPILE-COMPONENT to T when byte-compiling, and NIL when @@ -278,24 +295,42 @@ (setf (component-reanalyze component) nil)) (setf (component-reoptimize component) nil) (ir1-optimize component) - (unless (component-reoptimize component) - (maybe-mumble " ") - (return)) - (incf count) - (when (= count *max-optimize-iterations*) - (event ir1-optimize-maxed-out) - (maybe-mumble "* ") - (setf (component-reoptimize component) nil) - (do-blocks (block component) - (setf (block-reoptimize block) nil)) - (return)) + (cond ((component-reoptimize component) + (incf count) + (when (= count *max-optimize-iterations*) + (maybe-mumble "*") + (cond ((retry-delayed-ir1-transforms :optimize) + (maybe-mumble "+") + (setq count 0)) + (t + (event ir1-optimize-maxed-out) + (setf (component-reoptimize component) nil) + (do-blocks (block component) + (setf (block-reoptimize block) nil)) + (return))))) + ((retry-delayed-ir1-transforms :optimize) + (setf count 0) + (maybe-mumble "+")) + (t + (maybe-mumble " ") + (return))) (maybe-mumble ".")) (when cleared-reanalyze (setf (component-reanalyze component) t))) (values)) (defparameter *constraint-propagate* t) -(defparameter *reoptimize-after-type-check-max* 5) + +;;; KLUDGE: This was bumped from 5 to 10 in a DTC patch ported by MNA +;;; from CMU CL into sbcl-0.6.11.44, the same one which allowed IR1 +;;; transforms to be delayed. Either DTC or MNA or both didn't explain +;;; why, and I don't know what the rationale was. -- WHN 2001-04-28 +;;; +;;; FIXME: It would be good to document why it's important to have a +;;; large value here, and what the drawbacks of an excessively large +;;; value are; and it might also be good to make it depend on +;;; optimization policy. +(defparameter *reoptimize-after-type-check-max* 10) (defevent reoptimize-maxed-out "*REOPTIMIZE-AFTER-TYPE-CHECK-MAX* exceeded.") @@ -317,8 +352,9 @@ (defun ir1-phases (component) (declare (type component component)) (let ((*constraint-number* 0) - (loop-count 1)) - (declare (special *constraint-number*)) + (loop-count 1) + (*delayed-ir1-transforms* nil)) + (declare (special *constraint-number* *delayed-ir1-transforms*)) (loop (ir1-optimize-until-done component) (when (or (component-new-functions component) @@ -329,7 +365,8 @@ (when *constraint-propagate* (maybe-mumble "constraint ") (constraint-propagate component)) - (maybe-mumble "type ") + (when (retry-delayed-ir1-transforms :constraint) + (maybe-mumble "Rtran ")) ;; Delay the generation of type checks until the type ;; constraints have had time to propagate, else the compiler can ;; confuse itself. @@ -337,7 +374,8 @@ (component-reanalyze component) (component-new-functions component) (component-reanalyze-functions component)) - (< loop-count (- *reoptimize-after-type-check-max* 2))) + (< loop-count (- *reoptimize-after-type-check-max* 4))) + (maybe-mumble "type ") (generate-type-checks component) (unless (or (component-reoptimize component) (component-reanalyze component) @@ -379,7 +417,7 @@ (entry-analyze component) (ir2-convert component) - (when (policy nil (>= speed compilation-speed)) + (when (policy *lexenv* (>= speed compilation-speed)) (maybe-mumble "copy ") (copy-propagate component)) @@ -444,11 +482,16 @@ *compile-object*)) (null)))))) - ;; We are done, so don't bother keeping anything around. + ;; We're done, so don't bother keeping anything around. (setf (component-info component) nil) (values)) +(defun policy-byte-compile-p (thing) + (policy thing + (and (zerop speed) + (<= debug 1)))) + ;;; Return our best guess for whether we will byte compile code ;;; currently being IR1 converted. This is only a guess because the ;;; decision is made on a per-component basis. @@ -458,38 +501,38 @@ (defun byte-compiling () (if (eq *byte-compiling* :maybe) (or (eq *byte-compile* t) - (policy nil (and (zerop speed) (<= debug 1)))) + (policy-byte-compile-p *lexenv*)) (and *byte-compile* *byte-compiling*))) ;;; Delete components with no external entry points before we try to ;;; generate code. Unreachable closures can cause IR2 conversion to ;;; puke on itself, since it is the reference to the closure which -;;; normally causes the components to be combined. This doesn't really -;;; cover all cases... +;;; normally causes the components to be combined. +;;; +;;; FIXME: The original CMU CL comment said "This doesn't really cover +;;; all cases..." That's a little scary. (defun delete-if-no-entries (component) (dolist (fun (component-lambdas component) (delete-component component)) (case (functional-kind fun) (:top-level (return)) (:external - (unless (every #'(lambda (ref) - (eq (block-component (node-block ref)) - component)) + (unless (every (lambda (ref) + (eq (block-component (node-block ref)) + component)) (leaf-refs fun)) (return)))))) +(defun byte-compile-this-component-p (component) + (ecase *byte-compile* + ((t) t) + ((nil) nil) + ((:maybe) + (every #'policy-byte-compile-p (component-lambdas component))))) + (defun compile-component (component) (let* ((*component-being-compiled* component) - (*byte-compiling* - (ecase *byte-compile* - ((t) t) - ((nil) nil) - (:maybe - (dolist (fun (component-lambdas component) t) - (unless (policy (lambda-bind fun) - (and (zerop speed) (<= debug 1))) - (return nil))))))) - + (*byte-compiling* (byte-compile-this-component-p component))) (when sb!xc:*compile-print* (compiler-mumble "~&; ~:[~;byte ~]compiling ~A: " *byte-compiling* @@ -592,8 +635,8 @@ (clrhash *id-labels*) (setq *label-id* 0) - ;; Clear some Pack data structures (for GC purposes only). - (assert (not *in-pack*)) + ;; Clear some PACK data structures (for GC purposes only). + (aver (not *in-pack*)) (dolist (sb *backend-sb-list*) (when (finite-sb-p sb) (fill (finite-sb-live-tns sb) nil)))) @@ -645,7 +688,7 @@ ;;; A FILE-INFO structure holds all the source information for a ;;; given file. -(defstruct file-info +(defstruct (file-info (:copier nil)) ;; If a file, the truename of the corresponding source file. If from ;; a Lisp form, :LISP. If from a stream, :STREAM. (name (required-argument) :type (or pathname (member :lisp :stream))) @@ -671,7 +714,8 @@ (defstruct (source-info #-no-ansi-print-object (:print-object (lambda (s stream) - (print-unreadable-object (s stream :type t))))) + (print-unreadable-object (s stream :type t)))) + (:copier nil)) ;; the UT that compilation started at (start-time (get-universal-time) :type unsigned-byte) ;; a list of the FILE-INFO structures for this compilation @@ -885,8 +929,7 @@ ;;; *TOP-LEVEL-LAMBDAS* instead. (defun convert-and-maybe-compile (form path) (declare (list path)) - (let* ((*lexenv* (make-lexenv :policy *policy* - :interface-policy *interface-policy*)) + (let* ((*lexenv* (make-lexenv :policy *policy*)) (tll (ir1-top-level form path nil))) (cond ((eq *block-compile* t) (push tll *top-level-lambdas*)) (t (compile-top-level (list tll) nil))))) @@ -913,7 +956,7 @@ (multiple-value-bind (forms decls) (sb!sys:parse-body (cdr form) nil) (let* ((*lexenv* (process-decls decls nil nil (make-continuation))) - ;; Binding *xxx-POLICY* is pretty much of a hack, since it + ;; Binding *POLICY* is pretty much of a hack, since it ;; causes LOCALLY to "capture" enclosed proclamations. It ;; is necessary because CONVERT-AND-MAYBE-COMPILE uses the ;; value of *POLICY* as the policy. The need for this hack @@ -922,8 +965,7 @@ ;; FIXME: Ideally, something should be done so that DECLAIM ;; inside LOCALLY works OK. Failing that, at least we could ;; issue a warning instead of silently screwing up. - (*policy* (lexenv-policy *lexenv*)) - (*interface-policy* (lexenv-interface-policy *lexenv*))) + (*policy* (lexenv-policy *lexenv*))) (process-top-level-progn forms path)))) ;;; Force any pending top-level forms to be compiled and dumped so @@ -1055,7 +1097,7 @@ ;;; the name. If not in a :TOP-LEVEL component, then don't bother ;;; compiling, because it was merged with a run-time component. (defun compile-load-time-value-lambda (lambdas) - (assert (null (cdr lambdas))) + (aver (null (cdr lambdas))) (let* ((lambda (car lambdas)) (component (block-component (node-block (lambda-bind lambda))))) (when (eq (component-kind component) :top-level) @@ -1113,7 +1155,7 @@ (defvar *constants-created-since-last-init* nil) ;;; FIXME: Shouldn't these^ variables be bound in LET forms? (defun emit-make-load-form (constant) - (assert (fasl-file-p *compile-object*)) + (aver (fasl-file-p *compile-object*)) (unless (or (fasl-constant-already-dumped constant *compile-object*) ;; KLUDGE: This special hack is because I was too lazy ;; to rework DEF!STRUCT so that the MAKE-LOAD-FORM @@ -1349,7 +1391,6 @@ (*block-compile* *block-compile-argument*) (*package* (sane-package)) (*policy* *policy*) - (*interface-policy* *interface-policy*) (*lexenv* (make-null-lexenv)) (*converting-for-interpreter* nil) (*source-info* info)