X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1final.lisp;h=b4a1dbbc570abe3861723280d347511436249a79;hb=7f13323739a0d2b474bfd5c740942db5a78349d6;hp=7f2024631e1d6dcc4dd5d7121571ccbc49400907;hpb=d40a76606c86722b0aef8179155f9f2840739b72;p=sbcl.git

diff --git a/src/compiler/ir1final.lisp b/src/compiler/ir1final.lisp
index 7f20246..b4a1dbb 100644
--- a/src/compiler/ir1final.lisp
+++ b/src/compiler/ir1final.lisp
@@ -20,7 +20,7 @@
 (defun note-failed-optimization (node failures)
   (declare (type combination node) (list failures))
   (unless (or (node-deleted node)
-	      (not (function-info-p (combination-kind node))))
+	      (not (fun-info-p (combination-kind node))))
     (let ((*compiler-error-context* node))
       (dolist (failure failures)
 	(let ((what (cdr failure))
@@ -29,16 +29,16 @@
 	   ((consp what)
 	    (compiler-note "~@<unable to ~2I~_~A ~I~_because: ~2I~_~?~:>"
 			   note (first what) (rest what)))
-	   ((valid-function-use node what
-				:argument-test #'types-equal-or-intersect
-				:result-test #'values-types-equal-or-intersect)
+	   ((valid-fun-use node what
+			   :argument-test #'types-equal-or-intersect
+			   :result-test #'values-types-equal-or-intersect)
 	    (collect ((messages))
 	      (flet ((give-grief (string &rest stuff)
 		       (messages string)
 		       (messages stuff)))
-		(valid-function-use node what
-				    :unwinnage-fun #'give-grief
-				    :lossage-fun #'give-grief))
+		(valid-fun-use node what
+			       :unwinnage-fun #'give-grief
+			       :lossage-fun #'give-grief))
 	      (compiler-note "~@<unable to ~
                               ~2I~_~A ~
                               ~I~_due to type uncertainty: ~
@@ -53,21 +53,22 @@
 
 ;;; For each named function with an XEP, note the definition of that
 ;;; name, and add derived type information to the INFO environment. We
-;;; also delete the FUNCTIONAL from *FREE-FUNCTIONS* to eliminate the
+;;; also delete the FUNCTIONAL from *FREE-FUNS* to eliminate the
 ;;; possibility that new references might be converted to it.
 (defun finalize-xep-definition (fun)
   (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)))
-	       (global-def (gethash source-name *free-functions*))
+	       (global-def (gethash source-name *free-funs*))
 	       (global-p (defined-fun-p global-def)))
 	  (note-name-defined source-name :function)
 	  (when global-p
-	    (remhash source-name *free-functions*))
+	    (remhash source-name *free-funs*))
 	  (ecase where
 	    (:assumed
 	     (let ((approx-type (info :function :assumed-type source-name)))
@@ -80,13 +81,19 @@
 	     (let ((declared-ftype (info :function :type source-name)))
 	       (unless (defined-ftype-matches-declared-ftype-p
 			 defined-ftype declared-ftype)
-		 (note-lossage "~@<The previously declared FTYPE~2I ~_~S~I ~_~
-                              conflicts with the definition type ~2I~_~S~:>"
-			       (type-specifier declared-ftype)
-			       (type-specifier defined-ftype)))))
+		 (compiler-style-warn
+                  "~@<The previously declared FTYPE~2I ~_~S~I ~_~
+                   conflicts with the definition type ~2I~_~S~:>"
+                  (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
@@ -128,5 +135,5 @@
 
   (maphash (lambda (k v)
 	     (note-assumed-types component k v))
-	   *free-functions*)
+	   *free-funs*)
   (values))