Don't warn when #'(setf fun) is used in the presence of a setf-macro.

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

diff --git a/src/compiler/ir1final.lisp b/src/compiler/ir1final.lisp
index 8d0e0ca..a921fc8 100644 (file)
--- a/src/compiler/ir1final.lisp
+++ b/src/compiler/ir1final.lisp
@@ -77,7 +77,7 @@
                (setf (info :function :type source-name) defined-ftype)
                (setf (info :function :assumed-type source-name) nil))
              (setf (info :function :where-from source-name) :defined))
-            (:declared
+            ((:declared :defined-method)
              (let ((declared-ftype (info :function :type source-name)))
                (unless (defined-ftype-matches-declared-ftype-p
                          defined-ftype declared-ftype)
@@ -147,7 +147,7 @@
     (case (functional-kind fun)
       (:external
        (finalize-xep-definition fun))
-      ((nil)
+      ((nil :toplevel)
        (setf (leaf-type fun) (definition-type fun)))))
 
   (maphash #'note-failed-optimization