X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fknownfun.lisp;h=bd35c9381a873c326363105336f1a25fc3437cf3;hb=2768ed83de59354b21ea61de3dea358c53d1ae05;hp=f3f510c298572d110ead6e2e4a655ceb50ad6c04;hpb=581e3d62de8cb37e13ad9db63e5537c0f962be28;p=sbcl.git

diff --git a/src/compiler/knownfun.lisp b/src/compiler/knownfun.lisp
index f3f510c..bd35c93 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.
@@ -49,15 +49,26 @@
   ;; mark these functions as foldable in this database.
   foldable
   ;; may be eliminated if value is unused. The function has no side
-  ;; effects except possibly CONS. If a function is defined to signal
-  ;; errors, then it is not flushable even if it is movable or
-  ;; foldable.
+  ;; 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. (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
+  ;; in the safe code. If a function MUST signal errors, then it is
+  ;; not unsafely-flushable even if it is movable or foldable.
+  unsafely-flushable
   ;; may be moved with impunity. Has no side effects except possibly
   ;; consing, and is affected only by its arguments.
   movable
   ;; The function is a true predicate likely to be open-coded. Convert
-  ;; any non-conditional uses into (IF <pred> T NIL).
+  ;; any non-conditional uses into (IF <pred> T NIL). Not usually
+  ;; specified to DEFKNOWN, since this is implementation dependent,
+  ;; and is usually automatically set by the DEFINE-VOP :CONDITIONAL
+  ;; option.
   predicate
   ;; Inhibit any warning for compiling a recursive definition.
   ;; (Normally the compiler warns when compiling a recursive
@@ -102,20 +113,18 @@
   (templates nil :type list)
   ;; If non-null, then this function is a unary type predicate for
   ;; this type.
-  (predicate-type nil :type (or ctype null))
-  ;; If non-null, use this function to annotate the known call for the
-  ;; byte compiler. If it returns NIL, then change the call to :full.
-  (byte-annotate nil :type (or function null)))
+  (predicate-type nil :type (or ctype null)))
 
 (defprinter (fun-info)
+  (attributes :test (not (zerop attributes))
+              :prin1 (decode-ir1-attributes attributes))
   (transforms :test transforms)
   (derive-type :test derive-type)
   (optimizer :test optimizer)
   (ltn-annotate :test ltn-annotate)
   (ir2-convert :test ir2-convert)
   (templates :test templates)
-  (predicate-type :test predicate-type)
-  (byte-annotate :test byte-annotate))
+  (predicate-type :test predicate-type))
 
 ;;;; interfaces to defining macros
 
@@ -154,12 +163,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
@@ -172,8 +183,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)))
@@ -201,7 +212,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
@@ -257,6 +268,6 @@
     (declare (type combination call))
     (let ((cont (nth (1- n) (combination-args call))))
       (when (and cont (constant-continuation-p cont))
-	(specifier-type (continuation-value cont))))))
+	(careful-specifier-type (continuation-value cont))))))
 
 (/show0 "knownfun.lisp end of file")