1.0.17.20: NIL is a legal function name (regression 1.0.13.38)

 * Revealed by ansi-tests.

diff --git a/NEWS b/NEWS
index e39f594..7d0fe6e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ changes in sbcl-1.0.18 relative to 1.0.17:
     longer cons.
   * bug fix: EAI_NODATA is deprecated since RFC 3493. Stop using it
     in sb-bsd-sockets.
+  * fixed some bugs revealed by Paul Dietz' test suite:
+    ** NIL is a valid function name (regression at 1.0.13.38)
 
 changes in sbcl-1.0.17 relative to 1.0.16:
   * temporary regression: user code can no longer allocate closure

diff --git a/src/compiler/early-c.lisp b/src/compiler/early-c.lisp
index cafd675..a8e47b0 100644 (file)
--- a/src/compiler/early-c.lisp
+++ b/src/compiler/early-c.lisp
@@ -220,8 +220,6 @@ convention (names like *FOO*) for special variables" symbol))
       *debug-name-ellipsis* (make-debug-name-marker))
 
 (defun debug-name (type thing)
-  ;; We can _always_ do better thing NIL for this.
-  (aver thing)
   (let ((*debug-name-punt* nil))
     (labels ((walk (x)
                (typecase x

diff --git a/tests/compiler.pure.lisp b/tests/compiler.pure.lisp
index a1c0ee8..224fd3d 100644 (file)
--- a/tests/compiler.pure.lisp
+++ b/tests/compiler.pure.lisp
@@ -2376,3 +2376,7 @@
                                              (handler-bind ((error (lambda (&rest args) (return (cons :oops args)))))
                                                (/ 2 x)))))
                                 0))))
+
+;;; NIL is a legal function name
+(assert (eq 'a (flet ((nil () 'a)) (nil))))
+

diff --git a/version.lisp-expr b/version.lisp-expr
index ad35188..b7ed28b 100644 (file)
--- 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".)
-"1.0.17.19"
+"1.0.17.20"