X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1util.lisp;h=538e95a6d005a30bc9c917334a5026978340da13;hb=287475f107626c6c8993b955daa9b19b292e69fd;hp=2dfcfef0fd11ed90b6b9a9150adb857e750b8c56;hpb=64ec717cf13c44fb4571c1fd7fbd508551ecfe01;p=sbcl.git

diff --git a/src/compiler/ir1util.lisp b/src/compiler/ir1util.lisp
index 2dfcfef..538e95a 100644
--- a/src/compiler/ir1util.lisp
+++ b/src/compiler/ir1util.lisp
@@ -1374,8 +1374,8 @@
 		(append before-args inside-args after-args))
 	  (change-ref-leaf (lvar-uses inside-fun)
 			   (find-free-fun 'list "???"))
-	  (setf (combination-kind inside)
-                (info :function :info 'list))
+	  (setf (combination-fun-info inside) (info :function :info 'list)
+		(combination-kind inside) :known)
 	  (setf (node-derived-type inside) *wild-type*)
 	  (flush-dest lvar)
 	  (values))))))
@@ -1458,7 +1458,7 @@
                (flet ((frob (l)
                         (find home l
                               :key #'node-home-lambda
-                              :test-not #'eq)))
+                              :test #'neq)))
                  (or (frob (leaf-refs var))
                      (frob (basic-var-sets var)))))))))
 
@@ -1601,13 +1601,15 @@
   (declare (type combination call))
   (let ((kind (basic-combination-kind call)))
     (or (eq kind :full)
-        (and (fun-info-p kind)
-             (not (fun-info-ir2-convert kind))
-             (dolist (template (fun-info-templates kind) t)
-               (when (eq (template-ltn-policy template) :fast-safe)
-                 (multiple-value-bind (val win)
-                     (valid-fun-use call (template-type template))
-                   (when (or val (not win)) (return nil)))))))))
+        (and (eq kind :known)
+	     (let ((info (basic-combination-fun-info call)))
+	       (and
+		(not (fun-info-ir2-convert info))
+		(dolist (template (fun-info-templates info) t)
+		  (when (eq (template-ltn-policy template) :fast-safe)
+		    (multiple-value-bind (val win)
+		       (valid-fun-use call (template-type template))
+		      (when (or val (not win)) (return nil)))))))))))
 
 ;;;; careful call