0.8.9.16:

[sbcl.git] / src / compiler / ir1final.lisp

diff --git a/src/compiler/ir1final.lisp b/src/compiler/ir1final.lisp
index 94240a0..7fa816e 100644 (file)
--- 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
@@ -59,7 +59,8 @@
   (let* ((leaf (functional-entry-fun fun))
         (defined-ftype (definition-type leaf)))
     (setf (leaf-type leaf) defined-ftype)
-    (when (leaf-has-source-name-p leaf)
+    (when (and (leaf-has-source-name-p leaf)
+              (eq (leaf-source-name leaf) (functional-debug-name leaf)))
       (let ((source-name (leaf-source-name leaf)))
        (let* ((where (info :function :where-from source-name))
               (*compiler-error-context* (lambda-bind (main-entry leaf)))
@@ -86,8 +87,13 @@
                   (type-specifier declared-ftype)
                   (type-specifier defined-ftype)))))
            (:defined
-            (when global-p
-              (setf (info :function :type source-name) defined-ftype))))))))
+            (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*)))))))
   (values))
 
 ;;; Find all calls in COMPONENT to assumed functions and update the
@@ -102,13 +108,34 @@
             (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))
+               (when (values-types-equal-or-intersect
+                      (node-derived-type node)
+                      (cast-asserted-type dest))
+                 ;; 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.
+                 (derive-node-type node (cast-asserted-type dest))))
+              ((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
@@ -130,4 +157,7 @@
   (maphash (lambda (k v)
             (note-assumed-types component k v))
           *free-funs*)
+
+  (ir1-merge-casts component)
+
   (values))