X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fir1final.lisp;h=b2c55f085aafcc1f97004c6e7eb5b67ea552ed95;hb=16a6592367eec7c5e9da668ec42fd260e7705b0c;hp=b4a1dbbc570abe3861723280d347511436249a79;hpb=2d4a0df3457bcd50916b33d374da592d8776db0a;p=sbcl.git

diff --git a/src/compiler/ir1final.lisp b/src/compiler/ir1final.lisp
index b4a1dbb..b2c55f0 100644
--- a/src/compiler/ir1final.lisp
+++ b/src/compiler/ir1final.lisp
@@ -20,15 +20,15 @@
 (defun note-failed-optimization (node failures)
   (declare (type combination node) (list failures))
   (unless (or (node-deleted node)
-	      (not (fun-info-p (combination-kind node))))
+	      (not (eq :known (combination-kind node))))
     (let ((*compiler-error-context* node))
       (dolist (failure failures)
 	(let ((what (cdr failure))
 	      (note (transform-note (car failure))))
 	  (cond
 	   ((consp what)
-	    (compiler-note "~@<unable to ~2I~_~A ~I~_because: ~2I~_~?~:>"
-			   note (first what) (rest what)))
+	    (compiler-notify "~@<unable to ~2I~_~A ~I~_because: ~2I~_~?~:>"
+			     note (first what) (rest what)))
 	   ((valid-fun-use node what
 			   :argument-test #'types-equal-or-intersect
 			   :result-test #'values-types-equal-or-intersect)
@@ -39,10 +39,10 @@
 		(valid-fun-use node what
 			       :unwinnage-fun #'give-grief
 			       :lossage-fun #'give-grief))
-	      (compiler-note "~@<unable to ~
-                              ~2I~_~A ~
-                              ~I~_due to type uncertainty: ~
-			      ~2I~_~{~?~^~@:_~}~:>"
+	      (compiler-notify "~@<unable to ~
+                                ~2I~_~A ~
+                                ~I~_due to type uncertainty: ~
+                                ~2I~_~{~?~^~@:_~}~:>"
 			     note (messages))))
 	   ;; As best I can guess, it's OK to fall off the end here
 	   ;; because if it's not a VALID-FUNCTION-USE, the user
@@ -87,13 +87,7 @@
                   (type-specifier declared-ftype)
                   (type-specifier defined-ftype)))))
 	    (:defined
-	     (setf (info :function :type source-name) defined-ftype)))
-	  (when (fasl-output-p *compile-object*)
-	    (if (member source-name *fun-names-in-this-file* :test #'equal)
-		(compiler-warn "~@<Duplicate definition for ~S found in ~
-                                one static unit (usually a file).~@:>"
-			       source-name)
-		(push source-name *fun-names-in-this-file*)))))))
+	     (setf (info :function :type source-name) defined-ftype)))))))
   (values))
 
 ;;; Find all calls in COMPONENT to assumed functions and update the
@@ -108,13 +102,39 @@
 	     (eq (info :function :kind name) :function))
     (let ((atype (info :function :assumed-type name)))
       (dolist (ref (leaf-refs var))
-	(let ((dest (continuation-dest (node-cont ref))))
+	(let ((dest (node-dest ref)))
 	  (when (and (eq (node-component ref) component)
 		     (combination-p dest)
-		     (eq (continuation-use (basic-combination-fun dest)) ref))
+		     (eq (lvar-uses (basic-combination-fun dest)) ref))
 	    (setq atype (note-fun-use dest atype)))))
       (setf (info :function :assumed-type name) atype))))
 
+;;; Merge CASTs with preceding/following nodes.
+(defun ir1-merge-casts (component)
+  (do-blocks-backwards (block component)
+    (do-nodes-backwards (node lvar block)
+      (let ((dest (when lvar (lvar-dest lvar))))
+        (cond ((and (cast-p dest)
+                    (not (cast-type-check dest))
+                    (immediately-used-p lvar node))
+               (let ((dtype (node-derived-type node))
+                     (atype (node-derived-type dest)))
+                 (when (values-types-equal-or-intersect
+                        dtype atype)
+                   ;; FIXME: We do not perform pathwise CAST->type-error
+                   ;; conversion, and type errors can later cause
+                   ;; backend failures. On the other hand, this version
+                   ;; produces less efficient code.
+                   ;;
+                   ;; This is sorta DERIVE-NODE-TYPE, but does not try
+                   ;; to optimize the node.
+                   (setf (node-derived-type node)
+                         (values-type-intersection dtype atype)))))
+              ((and (cast-p node)
+                    (eq (cast-type-check node) :external))
+               (aver (basic-combination-p dest))
+               (delete-filter node lvar (cast-value node))))))))
+
 ;;; Do miscellaneous things that we want to do once all optimization
 ;;; has been done:
 ;;;  -- Record the derived result type before the back-end trashes the
@@ -136,4 +156,7 @@
   (maphash (lambda (k v)
 	     (note-assumed-types component k v))
 	   *free-funs*)
+
+  (ir1-merge-casts component)
+
   (values))