X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fknownfun.lisp;h=fefd236a4ea6dfaace84725ef02a1bd1d488d934;hb=416152f084604094445a758ff399871132dff2bd;hp=839ab4514bad86e71fd3382560b9eed9698eea7c;hpb=b80843eb9c1a6acb15d477f855a6f9d0f1c0b15b;p=sbcl.git

diff --git a/src/compiler/knownfun.lisp b/src/compiler/knownfun.lisp
index 839ab45..fefd236 100644
--- a/src/compiler/knownfun.lisp
+++ b/src/compiler/knownfun.lisp
@@ -125,7 +125,7 @@
   ;; 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))
@@ -169,21 +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)
-      (when (info :function :info name)
-        ;; This is 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.
-	#+nil (cerror "Go ahead, overwrite it."
-		      "overwriting old FUNCTION-INFO for ~S" name)
-	(warn "overwriting old FUNCTION-INFO for ~S" name))
+      (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)
@@ -197,8 +198,12 @@
 ;;; 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)))))