0.6.9.20:

[sbcl.git] / src / code / cold-init.lisp

diff --git a/src/code/cold-init.lisp b/src/code/cold-init.lisp
index 7d607f8..b6dd324 100644 (file)
--- a/src/code/cold-init.lisp
+++ b/src/code/cold-init.lisp
@@ -94,7 +94,7 @@
   (setf *gc-notify-stream* nil)
   (setf *before-gc-hooks* nil)
   (setf *after-gc-hooks* nil)
-  #!+gengc (setf sb!conditions::*handler-clusters* nil)
+  #!+gengc (setf *handler-clusters* nil)
   #!-gengc (setf *already-maybe-gcing* t
                 *gc-inhibit* t
                 *need-to-collect-garbage* nil
@@ -135,9 +135,8 @@
   ;; forms of the corresponding source files.
 
   (show-and-call !package-cold-init)
-
-  ;; Set sane values for our toplevel forms.
-  (show-and-call !set-sane-cookie-defaults)
+  (show-and-call !policy-cold-init-or-resanify)
+  (/show0 "back from !POLICY-COLD-INIT-OR-RESANIFY")
 
   ;; KLUDGE: Why are fixups mixed up with toplevel forms? Couldn't
   ;; fixups be done separately? Wouldn't that be clearer and better?
@@ -190,16 +189,15 @@
        (t (!cold-lose "bogus function in *!REVERSED-COLD-TOPLEVELS*")))))
   (/show0 "done with loop over cold toplevel forms and fixups")
 
-  ;; Set sane values again, so that the user sees sane values instead of
-  ;; whatever is left over from the last DECLAIM.
-  (show-and-call !set-sane-cookie-defaults)
+  ;; Set sane values again, so that the user sees sane values instead
+  ;; of whatever is left over from the last DECLAIM/PROCLAIM.
+  (show-and-call !policy-cold-init-or-resanify)
 
-  ;; Only do this after top level forms have run, 'cause that's where
+  ;; Only do this after toplevel forms have run, 'cause that's where
   ;; DEFTYPEs are.
   (setf *type-system-initialized* t)
 
   (show-and-call os-cold-init-or-reinit)
-  (show-and-call !filesys-cold-init)
 
   (show-and-call stream-cold-init-or-reset)
   (show-and-call !loader-cold-init)
@@ -216,8 +214,8 @@
   (show-and-call !class-finalize)
 
   ;; The reader and printer are initialized very late, so that they
-  ;; can even do hairy things like invoking the compiler as part of
-  ;; their initialization.
+  ;; can do hairy things like invoking the compiler as part of their
+  ;; initialization.
   (show-and-call !reader-cold-init)
   (let ((*readtable* *standard-readtable*))
     (show-and-call !sharpm-cold-init)
@@ -239,10 +237,6 @@
   (/show0 "done initializing")
   (setf *cold-init-complete-p* t)
 
-  ;; Unintern no-longer-needed stuff before we GC.
-  #!-sb-fluid
-  (!unintern-init-only-stuff)
-
   ;; The system is finally ready for GC.
   #!-gengc (setf *already-maybe-gcing* nil)
   (/show0 "enabling GC")