X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-init.lisp;h=e7429a2140d84ad107a3e0b8eb7b7ffdd4940625;hb=6c4d4d984b1af6b2a73568cec3ab9c8795cff2da;hp=f2dca7de812cac3e6ae7ad1e6033ea6618949c7b;hpb=5037c9ac22cbab91eb3cf1ee6261c8589e17e81d;p=sbcl.git

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index f2dca7d..e7429a2 100644
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -22,8 +22,8 @@
 ;;; anything whose name matches a magic character pattern is
 ;;; uninterned.
 ;;;
-;;; FIXME: should also go through globaldb (and perhaps other tables)
-;;; blowing away associated entries
+;;; FIXME: Are there other tables that need to have entries removed?
+;;; What about symbols of the form DEF!FOO?
 (defun !unintern-init-only-stuff ()
   (do ((any-changes? nil nil))
       (nil)
@@ -35,6 +35,13 @@
 			 (string= name "*!" :end1 2 :end2 2)))
 	    (/show0 "uninterning cold-init-only symbol..")
 	    (/primitive-print name)
+	    ;; FIXME: Is this (FIRST (LAST *INFO-ENVIRONMENT*)) really
+	    ;; meant to be an idiom to use?  Is there a more obvious
+	    ;; name for this? [e.g. (GLOBAL-ENVIRONMENT)?]
+	    (do-info ((first (last *info-environment*))
+			    :name entry :class class :type type)
+	      (when (eq entry symbol)
+		(clear-info class type entry)))
 	    (unintern symbol package)
 	    (setf any-changes? t)))))
     (unless any-changes?
@@ -99,7 +106,6 @@
         *cold-init-complete-p* nil
         *type-system-initialized* nil)
 
-  (show-and-call !exhaust-cold-init)
   (show-and-call !typecheckfuns-cold-init)
 
   ;; Anyone might call RANDOM to initialize a hash value or something;