X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fknownfun.lisp;h=001c66940d97776fe0b6d4cf7f90312dececeed7;hb=d0552bdb80b50eb2c600de19b89b2d7139c4841c;hp=78433e06e66387ab08a69364beac06e3bea07064;hpb=b8fe7c0afeb9901091ce781ba351d0513f2ee86d;p=sbcl.git

diff --git a/src/compiler/knownfun.lisp b/src/compiler/knownfun.lisp
index 78433e0..001c669 100644
--- a/src/compiler/knownfun.lisp
+++ b/src/compiler/knownfun.lisp
@@ -25,7 +25,7 @@
 ;;; breakdown of side effects, since we do very little code motion on
 ;;; IR1. We are interested in some deeper semantic properties such as
 ;;; whether it is safe to pass stack closures to.
-(def-boolean-attribute ir1
+(!def-boolean-attribute ir1
   ;; may call functions that are passed as arguments. In order to
   ;; determine what other effects are present, we must find the
   ;; effects of all arguments that may be functions.
@@ -51,7 +51,10 @@
   ;; may be eliminated if value is unused. The function has no side
   ;; effects except possibly cons. If a function might signal errors,
   ;; then it is not flushable even if it is movable, foldable or
-  ;; unsafely-flushable. Implies UNSAFELY-FLUSHABLE.
+  ;; unsafely-flushable. Implies UNSAFELY-FLUSHABLE. (In safe code
+  ;; type checking of arguments is always performed by the caller, so
+  ;; a function which SHOULD signal an error if arguments are not of
+  ;; declared types may be FLUSHABLE.)
   flushable
   ;; unsafe call may be eliminated if value is unused. The function
   ;; has no side effects except possibly cons and signalling an error
@@ -158,12 +161,14 @@
 			      (string-equal (transform-note x) note)
 			      (eq (transform-important x) important)))
 		       (fun-info-transforms info))))
-    (if old
-	(setf (transform-function old) fun
-	      (transform-note old) note)
-	(push (make-transform :type ctype :function fun :note note
-			      :important important)
-	      (fun-info-transforms info)))
+    (cond (old
+           (style-warn "Overwriting ~S" old)
+           (setf (transform-function old) fun
+                 (transform-note old) note))
+          (t
+           (push (make-transform :type ctype :function fun :note note
+                                 :important important)
+                 (fun-info-transforms info))))
     name))
 
 ;;; Make a FUN-INFO structure with the specified type, attributes
@@ -176,8 +181,8 @@
 (defun %defknown (names type attributes &key derive-type optimizer)
   (let ((ctype (specifier-type type))
 	(info (make-fun-info :attributes attributes
-				  :derive-type derive-type
-				  :optimizer optimizer))
+                             :derive-type derive-type
+                             :optimizer optimizer))
 	(target-env *info-environment*))
     (dolist (name names)
       (let ((old-fun-info (info :function :info name)))
@@ -205,7 +210,7 @@
 ;;; 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) fun-info) fun-info-or-lose))
+(declaim (ftype (sfunction (t) fun-info) fun-info-or-lose))
 (defun fun-info-or-lose (name)
   (let (;; FIXME: Do we need this rebinding here? It's a literal
 	;; translation of the old CMU CL rebinding to