X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fseqtran.lisp;h=7fc4474106f28cff0e78c440f6f28b89b9d60e5f;hb=4fc9d21ae1d8a6a2f8ff70f589d5da103203de13;hp=3bd162c522fdc2362c9325ce7ae761ec775d902f;hpb=95a6db7329b91dd90d165dd4057b9b5098d34aa2;p=sbcl.git

diff --git a/src/compiler/seqtran.lisp b/src/compiler/seqtran.lisp
index 3bd162c..7fc4474 100644
--- a/src/compiler/seqtran.lisp
+++ b/src/compiler/seqtran.lisp
@@ -366,8 +366,10 @@
 		(eq (global-var-kind leaf) :global-function)
 		(not (null (member (leaf-name leaf) names :test #'equal))))))))
 
-;;; If Cont is a constant continuation, the return the constant value. If
-;;; it is null, then return default, otherwise quietly GIVE-UP.
+;;; If CONT is a constant continuation, the return the constant value.
+;;; If it is null, then return default, otherwise quietly give up the
+;;; IR1 transform.
+;;;
 ;;; ### Probably should take an ARG and flame using the NAME.
 (defun constant-value-or-lose (cont &optional default)
   (declare (type (or continuation null) cont))
@@ -378,10 +380,10 @@
 	 (give-up-ir1-transform))))
 
 #|
-;;; This is a frob whose job it is to make it easier to pass around the
-;;; arguments to IR1 transforms. It bundles together the name of the argument
-;;; (which should be referenced in any expansion), and the continuation for
-;;; that argument (or NIL if unsupplied.)
+;;; This is a frob whose job it is to make it easier to pass around
+;;; the arguments to IR1 transforms. It bundles together the name of
+;;; the argument (which should be referenced in any expansion), and
+;;; the continuation for that argument (or NIL if unsupplied.)
 (defstruct (arg (:constructor %make-arg (name cont)))
   (name nil :type symbol)
   (cont nil :type (or continuation null)))
@@ -539,7 +541,8 @@
 		   ,body))
 	       ((not (csubtypep (continuation-type fun-cont)
 				(specifier-type 'function)))
-		(when (policy *compiler-error-context* (> speed brevity))
+		(when (policy *compiler-error-context*
+			      (> speed inhibit-warnings))
 		  (compiler-note
 		   "~S may not be a function, so must coerce at run-time."
 		   n-fun))
@@ -704,3 +707,21 @@
 	 (declare (type index start ,@(all-lengths)))
 	 ,@(forms)
 	 res))))
+
+;;;; CONS accessor DERIVE-TYPE optimizers
+
+(defoptimizer (car derive-type) ((cons))
+  (let ((type (continuation-type cons))
+	(null-type (specifier-type 'null)))
+    (cond ((eq type null-type)
+	   null-type)
+	  ((cons-type-p type)
+	   (cons-type-car-type type)))))
+
+(defoptimizer (cdr derive-type) ((cons))
+  (let ((type (continuation-type cons))
+	(null-type (specifier-type 'null)))
+    (cond ((eq type null-type)
+	   null-type)
+	  ((cons-type-p type)
+	   (cons-type-cdr-type type)))))