0.pre7.38:

[sbcl.git] / src / compiler / knownfun.lisp

diff --git a/src/compiler/knownfun.lisp b/src/compiler/knownfun.lisp
index e398372..fefd236 100644 (file)
--- a/src/compiler/knownfun.lisp
+++ b/src/compiler/knownfun.lisp
@@ -14,6 +14,8 @@
 
 (in-package "SB!C")
 
+(/show0 "knownfun.lisp 17")
+
 ;;; IR1 boolean function attributes
 ;;;
 ;;; There are a number of boolean attributes of known functions which we like
@@ -116,14 +118,14 @@
 \f
 ;;;; interfaces to defining macros
 
-;;; The TRANSFORM structure represents an IR1 transform.
-(defstruct transform
+;;; an IR1 transform
+(defstruct (transform (:copier nil))
   ;; the function-type which enables this transform
   (type (required-argument) :type ctype)
   ;; the transformation function. Takes the COMBINATION node and returns a
   ;; lambda, or throws out.
   (function (required-argument) :type function)
-  ;; string used in efficency notes
+  ;; string used in efficiency notes
   (note (required-argument) :type string)
   ;; T if we should emit a failure note even if SPEED=INHIBIT-WARNINGS.
   (important nil :type (member t nil))
@@ -167,8 +169,22 @@
        (info (make-function-info :attributes attributes
                                  :derive-type derive-type
                                  :optimizer optimizer))
-       (target-env (or *backend-info-environment* *info-environment*)))
+       (target-env *info-environment*))
     (dolist (name names)
+      (let ((old-function-info (info :function :info name)))
+       (when old-function-info
+         ;; This is handled as an error because it's generally a bad
+         ;; thing to blow away all the old optimization stuff. It's
+         ;; also a potential source of sneaky bugs:
+         ;;    DEFKNOWN FOO
+         ;;    DEFTRANSFORM FOO
+         ;;    DEFKNOWN FOO ; possibly hidden inside some macroexpansion
+         ;;    ; Now the DEFTRANSFORM doesn't exist in the target Lisp.
+         ;; However, it's continuable because it might be useful to do
+         ;; it when testing new optimization stuff interactively.
+         (cerror "Go ahead, overwrite it."
+                 "~@<overwriting old FUNCTION-INFO ~2I~_~S ~I~_for ~S~:>"
+                 old-function-info name)))
       (setf (info :function :type name target-env) ctype)
       (setf (info :function :where-from name target-env) :declared)
       (setf (info :function :kind name target-env) :function)
@@ -176,14 +192,18 @@
   names)
 
 ;;; Return the FUNCTION-INFO for NAME or die trying. Since this is
-;;; used by people who want to modify the info, and the info may be
+;;; used by callers who want to modify the info, and the info may be
 ;;; shared, we copy it. We don't have to copy the lists, since each
 ;;; function that has generators or transforms has already been
 ;;; through here.
 (declaim (ftype (function (t) function-info) function-info-or-lose))
 (defun function-info-or-lose (name)
-  (let ((*info-environment* (or *backend-info-environment*
-                               *info-environment*)))
+  (let (;; FIXME: Do we need this 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 that SBCL doesn't need *BACKEND-INFO-ENVIRONMENT*.
+       (*info-environment* *info-environment*))
     (let ((old (info :function :info name)))
       (unless old (error "~S is not a known function." name))
       (setf (info :function :info name) (copy-function-info old)))))
@@ -233,3 +253,5 @@
     (let ((cont (nth (1- n) (combination-args call))))
       (when (and cont (constant-continuation-p cont))
        (specifier-type (continuation-value cont))))))
+
+(/show0 "knownfun.lisp end of file")