X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftarget-main.lisp;h=23bfb23c0c6e3e99fffd798e25fe864ed9ec0b32;hb=f569125f053885898e83203324a72e11c9de0f85;hp=81597553ecccf016dc69bca23a50d1d944976396;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/compiler/target-main.lisp b/src/compiler/target-main.lisp index 8159755..23bfb23 100644 --- a/src/compiler/target-main.lisp +++ b/src/compiler/target-main.lisp @@ -13,57 +13,47 @@ (in-package "SB!C") -;;;; COMPILE and UNCOMPILE +;;;; CL:COMPILE -(defun get-lambda-to-compile (definition) - (if (consp definition) - definition - (multiple-value-bind (def env-p) - (function-lambda-expression definition) +(defun get-lambda-to-compile (definition-designator) + (if (consp definition-designator) + definition-designator + (multiple-value-bind (definition env-p) + (function-lambda-expression definition-designator) (when env-p - (error "~S was defined in a non-null environment." definition)) - (unless def - (error "Can't find a definition for ~S." definition)) - def))) + (error "~S was defined in a non-null environment." + definition-designator)) + (unless definition + (error "can't find a definition for ~S" definition-designator)) + definition))) -;;; Find the function that is being compiled by COMPILE and bash its name to -;;; NAME. We also substitute for any references to name so that recursive -;;; calls will be compiled direct. Lambda is the top-level lambda for the -;;; compilation. A REF for the real function is the only thing in the -;;; top-level lambda other than the bind and return, so it isn't too hard to -;;; find. -(defun compile-fix-function-name (lambda name) - (declare (type clambda lambda) (type (or symbol cons) name)) - (when name - (let ((fun (ref-leaf - (continuation-next - (node-cont (lambda-bind lambda)))))) - (setf (leaf-name fun) name) - (let ((old (gethash name *free-functions*))) - (when old (substitute-leaf fun old))) - name))) - -(defun compile (name &optional (definition (fdefinition name))) - #!+sb-doc - "Compiles the function whose name is Name. If Definition is supplied, - it should be a lambda expression that is compiled and then placed in the - function cell of Name. If Name is Nil, the compiled code object is - returned." +;;; Handle the nontrivial case of CL:COMPILE. +(defun actually-compile (name definition) (with-compilation-values (sb!xc:with-compilation-unit () - (let* ((*info-environment* (or *backend-info-environment* - *info-environment*)) + ;; FIXME: These bindings were copied from SUB-COMPILE-FILE with + ;; few changes. Once things are stable, the shared bindings + ;; probably be merged back together into some shared utility + ;; macro, or perhaps both merged into one of the existing utility + ;; macros SB-C::WITH-COMPILATION-VALUES or + ;; CL:WITH-COMPILATION-UNIT. + (let* (;; FIXME: Do we need the *INFO-ENVIRONMENT* rebinding + ;; here? It's a literal translation of the old CMU CL + ;; rebinding to (OR *BACKEND-INFO-ENVIRONMENT* + ;; *INFO-ENVIRONMENT*), and it's not obvious whether the + ;; rebinding to itself is needed now that SBCL doesn't + ;; need *BACKEND-INFO-ENVIRONMENT*. + (*info-environment* *info-environment*) (*lexenv* (make-null-lexenv)) - (form `#',(get-lambda-to-compile definition)) + (form (get-lambda-to-compile definition)) (*source-info* (make-lisp-source-info form)) - (*top-level-lambdas* ()) - (*converting-for-interpreter* nil) + (*toplevel-lambdas* ()) (*block-compile* nil) (*compiler-error-bailout* - #'(lambda () - (compiler-mumble - "~2&fatal error, aborting compilation~%") - (return-from compile (values nil t nil)))) + (lambda () + (compiler-mumble + "~2&fatal error, aborting compilation~%") + (return-from actually-compile (values nil t nil)))) (*current-path* nil) (*last-source-context* nil) (*last-original-source* nil) @@ -71,7 +61,6 @@ (*last-format-string* nil) (*last-format-args* nil) (*last-message-count* 0) - (*compile-object* (make-core-object)) (*gensym-counter* 0) ;; FIXME: ANSI doesn't say anything about CL:COMPILE ;; interacting with these variables, so we shouldn't. As @@ -83,23 +72,28 @@ (*compile-print* nil)) (clear-stuff) (find-source-paths form 0) - (let ((lambda (ir1-top-level form '(original-source-start 0 0) t))) - - (compile-fix-function-name lambda name) - (let* ((component - (block-component (node-block (lambda-bind lambda)))) - (*all-components* (list component))) - (local-call-analyze component)) + (%compile form (make-core-object) + :name name + :path '(original-source-start 0 0)))))) - (multiple-value-bind (components top-components) - (find-initial-dfo (list lambda)) - (let ((*all-components* (append components top-components))) - (dolist (component *all-components*) - (compile-component component)))) - - (let* ((res1 (core-call-top-level-lambda lambda *compile-object*)) - (result (or name res1))) - (fix-core-source-info *source-info* *compile-object* res1) - (when name - (setf (fdefinition name) res1)) - result)))))) +(defun compile (name &optional (definition (or (macro-function name) + (fdefinition name)))) + #!+sb-doc + "Coerce DEFINITION (by default, the function whose name is NAME) + to a compiled function, returning (VALUES THING WARNINGS-P FAILURE-P), + where if NAME is NIL, THING is the result of compilation, and + otherwise THING is NAME. When NAME is not NIL, the compiled function + is also set into (MACRO-FUNCTION NAME) if NAME names a macro, or into + (FDEFINITION NAME) otherwise." + (multiple-value-bind (compiled-definition warnings-p failure-p) + (if (compiled-function-p definition) + (values definition nil nil) + (actually-compile name definition)) + (cond (name + (if (and (symbolp name) + (macro-function name)) + (setf (macro-function name) compiled-definition) + (setf (fdefinition name) compiled-definition)) + (values name warnings-p failure-p)) + (t + (values compiled-definition warnings-p failure-p)))))