From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Mon, 16 Jun 2003 13:46:59 +0000 (+0000)
Subject: 0.8.0.73:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=245101f127d61e28b9c864c720eb17973469a904;p=sbcl.git

0.8.0.73:
	Restore type derivation for known/declared functions, even
	when their use is declared NOTINLINE.
---

diff --git a/src/compiler/ir1tran.lisp b/src/compiler/ir1tran.lisp
index d2b0c96..542dfe0 100644
--- a/src/compiler/ir1tran.lisp
+++ b/src/compiler/ir1tran.lisp
@@ -1017,7 +1017,8 @@
   (let ((res (make-defined-fun
 	      :%source-name (leaf-source-name var)
 	      :where-from (leaf-where-from var)
-	      :type (if (eq inlinep :notinline)
+	      :type (if (and (eq inlinep :notinline)
+			     (not (eq (leaf-where-from var) :declared)))
 			(specifier-type 'function)
 			(leaf-type var))
 	      :inlinep inlinep)))
diff --git a/tests/compiler.test.sh b/tests/compiler.test.sh
index 87ca1c1..149ab19 100644
--- a/tests/compiler.test.sh
+++ b/tests/compiler.test.sh
@@ -186,6 +186,16 @@ cat > $tmpfilename <<EOF
 EOF
 expect_clean_compile $tmpfilename
 
+# NOTINLINE on known functions shouldn't inhibit type inference
+# (spotted by APD sbcl-devel 2003-06-14)
+cat > $tmpfilename <<EOF
+    (in-package :cl-user)
+    (defun foo (x)
+      (declare (notinline list))
+      (1+ (list x)))
+EOF
+expect_failed_compile $tmpfilename
+
 rm $tmpfilename
 rm $compiled_tmpfilename
 
diff --git a/version.lisp-expr b/version.lisp-expr
index 36e1709..42f97f2 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.0.72"
+"0.8.0.73"