X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmain.lisp;h=a39204fd2d5f80152e9e107f62b973674f8285d5;hb=986ce2596822cc0871b609346aaf592348aca596;hp=6b094daa3b220abf3660dbffd3357bc4ff12237f;hpb=a40c4adfd7837230109cdb1f054b44fe0b15371a;p=sbcl.git diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp index 6b094da..a39204f 100644 --- a/src/compiler/main.lisp +++ b/src/compiler/main.lisp @@ -30,29 +30,6 @@ *last-source-form* *last-format-string* *last-format-args* *last-message-count* *lexenv*)) -(defvar *byte-compile-default* :maybe - #!+sb-doc - "the default value for the :BYTE-COMPILE argument to COMPILE-FILE") - -(defvar *byte-compile-top-level* - #-sb-xc-host t - #+sb-xc-host nil ; since the byte compiler isn't supported in cross-compiler - #!+sb-doc - "Similar to *BYTE-COMPILE-DEFAULT*, but controls the compilation of top-level - forms (evaluated at load-time) when the :BYTE-COMPILE argument is :MAYBE - (the default.) When true, we decide to byte-compile.") - -;;; 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 -;;; native compiling. During IR1 conversion this can also be :MAYBE, -;;; in which case we must look at the policy, see (byte-compiling). -(defvar *byte-compiling* :maybe) -(declaim (type (member t nil :maybe) *byte-compile* *byte-compiling* - *byte-compile-default*)) - (defvar *check-consistency* nil) (defvar *all-components*) @@ -191,21 +168,19 @@ (if (symbolp x) (symbol-name x) (prin1-to-string x))))))) - (unless *converting-for-interpreter* - (dolist (undef undefs) - (let ((name (undefined-warning-name undef)) - (kind (undefined-warning-kind undef)) - (warnings (undefined-warning-warnings undef)) - (undefined-warning-count (undefined-warning-count undef))) - (dolist (*compiler-error-context* warnings) - (compiler-style-warning "undefined ~(~A~): ~S" kind name)) - - (let ((warn-count (length warnings))) - (when (and warnings (> undefined-warning-count warn-count)) - (let ((more (- undefined-warning-count warn-count))) - (compiler-style-warning - "~D more use~:P of undefined ~(~A~) ~S" - more kind name))))))) + (dolist (undef undefs) + (let ((name (undefined-warning-name undef)) + (kind (undefined-warning-kind undef)) + (warnings (undefined-warning-warnings undef)) + (undefined-warning-count (undefined-warning-count undef))) + (dolist (*compiler-error-context* warnings) + (compiler-style-warning "undefined ~(~A~): ~S" kind name)) + (let ((warn-count (length warnings))) + (when (and warnings (> undefined-warning-count warn-count)) + (let ((more (- undefined-warning-count warn-count))) + (compiler-style-warning + "~D more use~:P of undefined ~(~A~) ~S" + more kind name)))))) (dolist (kind '(:variable :function :type)) (let ((summary (mapcar #'undefined-warning-name @@ -217,13 +192,12 @@ ~% ~{~<~% ~1:;~S~>~^ ~}" (cdr summary) kind summary))))))) - (unless (or *converting-for-interpreter* - (and (not abort-p) - (zerop *aborted-compilation-unit-count*) - (zerop *compiler-error-count*) - (zerop *compiler-warning-count*) - (zerop *compiler-style-warning-count*) - (zerop *compiler-note-count*))) + (unless (and (not abort-p) + (zerop *aborted-compilation-unit-count*) + (zerop *compiler-error-count*) + (zerop *compiler-warning-count*) + (zerop *compiler-style-warning-count*) + (zerop *compiler-note-count*)) (format *error-output* "~&") (pprint-logical-block (*error-output* nil :per-line-prefix "; ") (compiler-mumble "compilation unit ~:[finished~;aborted~]~ @@ -376,7 +350,7 @@ (ir1-finalize component) (values)) -(defun native-compile-component (component) +(defun %compile-component (component) (let ((*code-segment* nil) (*elsewhere* nil)) (maybe-mumble "GTN ") @@ -470,33 +444,14 @@ (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. -;;; -;;; FIXME: This should be called something more mnemonic, e.g. -;;; PROBABLY-BYTE-COMPILING -(defun byte-compiling () - (if (eq *byte-compiling* :maybe) - (or (eq *byte-compile* t) - (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. -;;; -;;; 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)) + (dolist (fun (component-lambdas component) (delete-component component)) + (when (functional-has-external-references-p fun) + (return)) (case (functional-kind fun) (:top-level (return)) (:external @@ -506,35 +461,23 @@ (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* (byte-compile-this-component-p component))) + (let* ((*component-being-compiled* component)) (when sb!xc:*compile-print* - (compiler-mumble "~&; ~:[~;byte ~]compiling ~A: " - *byte-compiling* - (component-name component))) + (compiler-mumble "~&; compiling ~A: " (component-name component))) (ir1-phases component) ;; FIXME: What is MAYBE-MUMBLE for? Do we need it any more? (maybe-mumble "env ") - (environment-analyze component) + (physenv-analyze component) (dfo-as-needed component) (delete-if-no-entries component) (unless (eq (block-next (component-head component)) (component-tail component)) - (if *byte-compiling* - (byte-compile-component component) - (native-compile-component component)))) + (%compile-component component))) (clear-constant-info) @@ -674,7 +617,7 @@ (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))) + (name (missing-arg) :type (or pathname (member :lisp :stream))) ;; the defaulted, but not necessarily absolute file name (i.e. prior ;; to TRUENAME call.) Null if not a file. This is used to set ;; *COMPILE-FILE-PATHNAME*, and if absolute, is dumped in the @@ -794,7 +737,6 @@ (file-info-source-root file-info)))) (vector-push-extend form forms) (vector-push-extend pos (file-info-positions file-info)) - (clrhash *source-paths*) (find-source-paths form current-idx) (process-top-level-form form `(original-source-start 0 ,current-idx) @@ -824,10 +766,14 @@ ;;; Macroexpand FORM in the current environment with an error handler. ;;; We only expand one level, so that we retain all the intervening ;;; forms in the source path. -(defun preprocessor-macroexpand (form) +(defun preprocessor-macroexpand-1 (form) (handler-case (sb!xc:macroexpand-1 form *lexenv*) (error (condition) - (compiler-error "(during macroexpansion)~%~A" condition)))) + (compiler-error "(during macroexpansion of ~A)~%~A" + (let ((*print-level* 1) + (*print-length* 2)) + (format nil "~S" form)) + condition)))) ;;; Process a PROGN-like portion of a top-level form. FORMS is a list of ;;; the forms, and PATH is the source path of the FORM they came out of. @@ -858,21 +804,6 @@ (*policy* (lexenv-policy *lexenv*))) (process-top-level-progn forms path compile-time-too)))) -;;; Force any pending top-level forms to be compiled and dumped so -;;; that they will be evaluated in the correct package environment. -;;; Dump the form to be evaled at (cold) load time, and if EVAL is -;;; true, eval the form immediately. -(defun process-cold-load-form (form path eval) - (let ((object *compile-object*)) - (etypecase object - (fasl-output - (compile-top-level-lambdas () t) - (fasl-dump-cold-load-form form object)) - ((or null core-object) - (convert-and-maybe-compile form path))) - (when eval - (eval form)))) - ;;; Parse an EVAL-WHEN situations list, returning three flags, ;;; (VALUES COMPILE-TOPLEVEL LOAD-TOPLEVEL EXECUTE), indicating ;;; the types of situations present in the list. @@ -895,6 +826,120 @@ (intersection '(:load-toplevel load) situations) (intersection '(:execute eval) situations))) + +;;; utilities for extracting COMPONENTs of FUNCTIONALs +(defun clambda-component (clambda) + (block-component (node-block (lambda-bind clambda)))) +(defun functional-components (f) + (declare (type functional f)) + (etypecase f + (clambda (list (clambda-component f))) + (optional-dispatch (let ((result nil)) + (labels ((frob (clambda) + (pushnew (clambda-component clambda) + result)) + (maybe-frob (maybe-clambda) + (when maybe-clambda + (frob maybe-clambda)))) + (mapc #'frob (optional-dispatch-entry-points f)) + (maybe-frob (optional-dispatch-more-entry f)) + (maybe-frob (optional-dispatch-main-entry f))))))) + +(defun make-functional-from-top-level-lambda (definition + &key + name + (path + ;; I'd thought NIL should + ;; work, but it doesn't. + ;; -- WHN 2001-09-20 + (missing-arg))) + (let* ((*current-path* path) + (component (make-empty-component)) + (*current-component* component)) + (setf (component-name component) + (format nil "~S initial component" name)) + (setf (component-kind component) :initial) + (let* ((locall-fun (ir1-convert-lambda definition + (format nil "locall ~S" name))) + (fun (ir1-convert-lambda (make-xep-lambda locall-fun) name))) + (setf (functional-entry-function fun) locall-fun + (functional-kind fun) :external + (functional-has-external-references-p fun) t) + fun))) + +;;; Compile LAMBDA-EXPRESSION into *COMPILE-OBJECT*, returning a +;;; description of the result. +;;; * If *COMPILE-OBJECT* is a CORE-OBJECT, then write the function +;;; into core and return the compiled FUNCTION value. +;;; * If *COMPILE-OBJECT* is a fasl file, then write the function +;;; into the fasl file and return a dump handle. +;;; +;;; If NAME is provided, then we try to use it as the name of the +;;; function for debugging/diagnostic information. +(defun %compile (lambda-expression + *compile-object* + &key + name + (path + ;; This magical idiom seems to be the appropriate + ;; path for compiling standalone LAMBDAs, judging + ;; from the CMU CL code and experiment, so it's a + ;; nice default for things where we don't have a + ;; real source path (as in e.g. inside CL:COMPILE). + '(original-source-start 0 0))) + (unless (or (null name) (legal-fun-name-p name)) + (error "not a legal function name: ~S" name)) + (let* ((*lexenv* (make-lexenv :policy *policy*)) + (fun (make-functional-from-top-level-lambda lambda-expression + :name name + :path path))) + + ;; FIXME: The compile-it code from here on is sort of a + ;; twisted version of the code in COMPILE-TOP-LEVEL. It'd be + ;; better to find a way to share the code there; or + ;; alternatively, to use this code to replace the code there. + ;; (The second alternative might be pretty easy if we used + ;; the :LOCALL-ONLY option to IR1-FOR-LAMBDA. Then maybe the + ;; whole FUNCTIONAL-KIND=:TOP-LEVEL case could go away..) + + (local-call-analyze-until-done (list fun)) + + (multiple-value-bind (components-from-dfo top-components hairy-top) + (find-initial-dfo (list fun)) + + (let ((*all-components* (append components-from-dfo top-components))) + (mapc #'preallocate-physenvs-for-top-levelish-lambdas + (append hairy-top top-components)) + (dolist (component-from-dfo components-from-dfo) + (compile-component component-from-dfo) + (replace-top-level-xeps component-from-dfo))) + + (prog1 + (let ((entry-table (etypecase *compile-object* + (fasl-output (fasl-output-entry-table + *compile-object*)) + (core-object (core-object-entry-table + *compile-object*))))) + (multiple-value-bind (result found-p) + (gethash (leaf-info fun) entry-table) + (aver found-p) + result)) + (mapc #'clear-ir1-info components-from-dfo) + (clear-stuff))))) + +(defun process-top-level-cold-fset (name lambda-expression path) + (unless (producing-fasl-file) + (error "can't COLD-FSET except in a fasl file")) + (unless (legal-fun-name-p name) + (error "not a legal function name: ~S" name)) + (fasl-dump-cold-fset name + (%compile lambda-expression + *compile-object* + :name name + :path path) + *compile-object*) + (values)) + ;;; Process a top-level FORM with the specified source PATH. ;;; * If this is a magic top-level form, then do stuff. ;;; * If this is a macro, then expand it. @@ -927,17 +972,16 @@ (car form) form)))) (case (car form) - ;; FIXME: It's not clear to me why we would want this - ;; special case; it might have been needed for some - ;; variation of the old GENESIS system, but it certainly - ;; doesn't seem to be needed for ours. Sometime after the - ;; system is running I'd like to remove it tentatively and - ;; see whether anything breaks, and if nothing does break, - ;; remove it permanently. (And if we *do* want special - ;; treatment of all these, we probably want to treat WARN - ;; the same way..) - ((error cerror break signal) - (process-cold-load-form form path nil)) + ;; In the cross-compiler, top level COLD-FSET arranges + ;; for static linking at cold init time. + #+sb-xc-host + ((cold-fset) + (aver (not compile-time-too)) + (destructuring-bind (cold-fset fun-name lambda-expression) form + (declare (ignore cold-fset)) + (process-top-level-cold-fset fun-name + lambda-expression + path))) ((eval-when macrolet symbol-macrolet);things w/ 1 arg before body (need-at-least-one-arg form) (destructuring-bind (special-operator magic &rest body) form @@ -972,8 +1016,8 @@ (process-top-level-locally (rest form) path compile-time-too)) ((progn) (process-top-level-progn (rest form) path compile-time-too)) - #+sb-xc-host - ;; Consider: What should we do when we hit e.g. + ;; When we're cross-compiling, consider: what should we + ;; do when we hit e.g. ;; (EVAL-WHEN (:COMPILE-TOPLEVEL) ;; (DEFUN FOO (X) (+ 7 X)))? ;; DEFUN has a macro definition in the cross-compiler, @@ -985,19 +1029,40 @@ ;; cross-compilation time. So make sure we do the EVAL ;; here, before we macroexpand. ;; + ;; Then things get even dicier with something like + ;; (DEFCONSTANT-EQX SB!XC:LAMBDA-LIST-KEYWORDS ..) + ;; where we have to make sure that we don't uncross + ;; the SB!XC: prefix before we do EVAL, because otherwise + ;; we'd be trying to redefine the cross-compilation host's + ;; constants. + ;; ;; (Isn't it fun to cross-compile Common Lisp?:-) + #+sb-xc-host (t (when compile-time-too (eval form)) ; letting xc host EVAL do its own macroexpansion - (let* ((uncrossed (uncross form)) - ;; letting our cross-compiler do its macroexpansion too - (expanded (preprocessor-macroexpand uncrossed))) - (if (eq expanded uncrossed) + (let* (;; (We uncross the operator name because things + ;; like SB!XC:DEFCONSTANT and SB!XC:DEFTYPE + ;; should be equivalent to their CL: counterparts + ;; when being compiled as target code. We leave + ;; the rest of the form uncrossed because macros + ;; might yet expand into EVAL-WHEN stuff, and + ;; things inside EVAL-WHEN can't be uncrossed + ;; until after we've EVALed them in the + ;; cross-compilation host.) + (slightly-uncrossed (cons (uncross (first form)) + (rest form))) + (expanded (preprocessor-macroexpand-1 slightly-uncrossed))) + (if (eq expanded slightly-uncrossed) + ;; (Now that we're no longer processing toplevel + ;; forms, and hence no longer need to worry about + ;; EVAL-WHEN, we can uncross everything.) (convert-and-maybe-compile expanded path) - ;; Note that we also have to demote - ;; COMPILE-TIME-TOO to NIL, no matter what it was - ;; before, since otherwise we'd tend to EVAL - ;; subforms more than once. + ;; (We have to demote COMPILE-TIME-TOO to NIL + ;; here, no matter what it was before, since + ;; otherwise we'd tend to EVAL subforms more than + ;; once, because of WHEN COMPILE-TIME-TOO form + ;; above.) (process-top-level-form expanded path nil)))) ;; When we're not cross-compiling, we only need to ;; macroexpand once, so we can follow the 1-thru-6 @@ -1005,7 +1070,7 @@ ;; Top Level Forms". #-sb-xc-host (t - (let ((expanded (preprocessor-macroexpand form))) + (let ((expanded (preprocessor-macroexpand-1 form))) (cond ((eq expanded form) (when compile-time-too (eval form)) @@ -1021,11 +1086,10 @@ ;;;; ;;;; (See EMIT-MAKE-LOAD-FORM.) -;;; Returns T if we are currently producing a fasl file and hence +;;; Return T if we are currently producing a fasl file and hence ;;; constants need to be dumped carefully. (defun producing-fasl-file () - (unless *converting-for-interpreter* - (fasl-output-p *compile-object*))) + (fasl-output-p *compile-object*)) ;;; Compile FORM and arrange for it to be called at load-time. Return ;;; the dumper handle and our best guess at the type of the object. @@ -1041,8 +1105,8 @@ (values (fasl-dump-load-time-value-lambda lambda *compile-object*) (let ((type (leaf-type lambda))) - (if (function-type-p type) - (single-value-type (function-type-returns type)) + (if (fun-type-p type) + (single-value-type (fun-type-returns type)) *wild-type*))))) ;;; Compile the FORMS and arrange for them to be called (for effect, @@ -1061,7 +1125,7 @@ (compile-top-level (list lambda) t) lambda))) -;;; Called by COMPILE-TOP-LEVEL when it was pased T for +;;; This is called by COMPILE-TOP-LEVEL when it was passed T for ;;; LOAD-TIME-VALUE-P (which happens in COMPILE-LOAD-TIME-STUFF). We ;;; don't try to combine this component with anything else and frob ;;; the name. If not in a :TOP-LEVEL component, then don't bother @@ -1070,7 +1134,7 @@ (aver (null (cdr lambdas))) (let* ((lambda (car lambdas)) (component (block-component (node-block (lambda-bind lambda))))) - (when (eq (component-kind component) :top-level) + (when (eql (component-kind component) :top-level) (setf (component-name component) (leaf-name lambda)) (compile-component component) (clear-ir1-info component)))) @@ -1130,10 +1194,7 @@ force-p)) (multiple-value-bind (component tll) (merge-top-level-lambdas pending) (setq *pending-top-level-lambdas* ()) - (let ((*byte-compile* (if (eq *byte-compile* :maybe) - *byte-compile-top-level* - *byte-compile*))) - (compile-component component)) + (compile-component component) (clear-ir1-info component) (object-call-top-level-lambda tll)))) (values)) @@ -1165,25 +1226,16 @@ (object-call-top-level-lambda (elt lambdas loser)))))) (values)) -;;; Compile LAMBDAS (a list of the lambdas for top-level forms) into -;;; the object file. We loop doing local call analysis until it -;;; converges, since a single pass might miss something due to -;;; components being joined by LET conversion. +;;; Compile LAMBDAS (a list of CLAMBDAs for top-level forms) into the +;;; object file. ;;; ;;; LOAD-TIME-VALUE-P seems to control whether it's MAKE-LOAD-FORM and ;;; COMPILE-LOAD-TIME-VALUE stuff. -- WHN 20000201 (defun compile-top-level (lambdas load-time-value-p) (declare (list lambdas)) + (maybe-mumble "locall ") - (loop - (let ((did-something nil)) - (dolist (lambda lambdas) - (let* ((component (block-component (node-block (lambda-bind lambda)))) - (*all-components* (list component))) - (when (component-new-functions component) - (setq did-something t) - (local-call-analyze component)))) - (unless did-something (return)))) + (local-call-analyze-until-done lambdas) (maybe-mumble "IDFO ") (multiple-value-bind (components top-components hairy-top) @@ -1195,28 +1247,23 @@ (check-ir1-consistency *all-components*)) (dolist (component (append hairy-top top-components)) - (when (pre-environment-analyze-top-level component) + (when (pre-physenv-analyze-top-level component) (setq top-level-closure t))) - (let ((*byte-compile* - (if (and top-level-closure (eq *byte-compile* :maybe)) - nil - *byte-compile*))) - (dolist (component components) - (compile-component component) - (when (replace-top-level-xeps component) - (setq top-level-closure t))) + (dolist (component components) + (compile-component component) + (when (replace-top-level-xeps component) + (setq top-level-closure t))) - (when *check-consistency* - (maybe-mumble "[check]~%") - (check-ir1-consistency *all-components*)) + (when *check-consistency* + (maybe-mumble "[check]~%") + (check-ir1-consistency *all-components*)) - (if load-time-value-p - (compile-load-time-value-lambda lambdas) - (compile-top-level-lambdas lambdas top-level-closure))) + (if load-time-value-p + (compile-load-time-value-lambda lambdas) + (compile-top-level-lambdas lambdas top-level-closure)) - (dolist (component components) - (clear-ir1-info component)) + (mapc #'clear-ir1-info components) (clear-stuff))) (values)) @@ -1234,16 +1281,10 @@ ;;; Return (VALUES NIL WARNINGS-P FAILURE-P). (defun sub-compile-file (info) (declare (type source-info info)) - (let* (;; These are bound in WITH-COMPILATION-UNIT now. -- WHN 20000308 - #+nil (*compiler-error-count* 0) - #+nil (*compiler-warning-count* 0) - #+nil (*compiler-style-warning-count* 0) - #+nil (*compiler-note-count* 0) - (*block-compile* *block-compile-argument*) + (let* ((*block-compile* *block-compile-argument*) (*package* (sane-package)) (*policy* *policy*) (*lexenv* (make-null-lexenv)) - (*converting-for-interpreter* nil) (*source-info* info) (sb!xc:*compile-file-pathname* nil) (sb!xc:*compile-file-truename* nil) @@ -1353,8 +1394,7 @@ ;; extensions (trace-file nil) - ((:block-compile *block-compile-argument*) nil) - ((:byte-compile *byte-compile*) *byte-compile-default*)) + ((:block-compile *block-compile-argument*) nil)) #!+sb-doc "Compile INPUT-FILE, producing a corresponding fasl file and returning @@ -1364,14 +1404,6 @@ If given, internal data structures are dumped to the specified file, or if a value of T is given, to a file of *.trace type derived from the input file name. - :BYTE-COMPILE {T | NIL | :MAYBE} - Determines whether to compile into interpreted byte code instead of - machine instructions. Byte code is several times smaller, but much - slower. If :MAYBE, then only byte-compile when SPEED is 0 and - DEBUG <= 1. The default is the value of SB-EXT:*BYTE-COMPILE-DEFAULT*, - which is initially :MAYBE. (This option will probably become - formally deprecated starting around sbcl-0.7.0, when various - cleanups related to the byte interpreter are planned.) Also, as a workaround for vaguely-non-ANSI behavior, the :BLOCK-COMPILE argument is quasi-supported, to determine whether multiple functions are compiled together as a unit, resolving function @@ -1405,8 +1437,7 @@ :output-file output-file)) (setq fasl-output (open-fasl-output output-file-name - (namestring input-pathname) - (eq *byte-compile* t)))) + (namestring input-pathname)))) (when trace-file (let* ((default-trace-file-pathname (make-pathname :type "trace" :defaults input-pathname)) @@ -1460,8 +1491,7 @@ ;;; compiled files. (defun cfp-output-file-default (input-file) (let* ((defaults (merge-pathnames input-file *default-pathname-defaults*)) - (retyped (make-pathname :type *backend-fasl-file-type* - :defaults defaults))) + (retyped (make-pathname :type *fasl-file-type* :defaults defaults))) retyped)) ;;; KLUDGE: Part of the ANSI spec for this seems contradictory: