0.6.11.42:

[sbcl.git] / src / compiler / generic / genesis.lisp

diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp
index b5d6fe6..72c6be0 100644 (file)
--- a/src/compiler/generic/genesis.lisp
+++ b/src/compiler/generic/genesis.lisp
@@ -1758,7 +1758,7 @@
 ;;;   (2) stores its definition in the *COLD-FOP-FUNCTIONS* vector,
 ;;;       instead of storing in the *FOP-FUNCTIONS* vector.
 (defmacro define-cold-fop ((name &optional (pushp t)) &rest forms)
-  (check-type pushp (member nil t :nope))
+  (aver (member pushp '(nil t :nope)))
   (let ((code (get name 'fop-code))
        (fname (symbolicate "COLD-" name)))
     (unless code
@@ -1771,7 +1771,7 @@
        (setf (svref *cold-fop-functions* ,code) #',fname))))
 
 (defmacro clone-cold-fop ((name &optional (pushp t)) (small-name) &rest forms)
-  (check-type pushp (member nil t :nope))
+  (aver (member pushp '(nil t :nope)))
   `(progn
     (macrolet ((clone-arg () '(read-arg 4)))
       (define-cold-fop (,name ,pushp) ,@forms))
@@ -1784,7 +1784,7 @@
      (error "The fop ~S is not supported in cold load." ',name)))
 
 ;;; COLD-LOAD loads stuff into the core image being built by calling
-;;; FASLOAD with the fop function table rebound to a table of cold
+;;; LOAD-AS-FASL with the fop function table rebound to a table of cold
 ;;; loading functions.
 (defun cold-load (filename)
   #!+sb-doc
@@ -1795,7 +1795,7 @@
                                 (string filename)
                                 (pathname (namestring filename)))))
     (with-open-file (s filename :element-type '(unsigned-byte 8))
-      (fasload s nil nil))))
+      (load-as-fasl s nil nil))))
 \f
 ;;;; miscellaneous cold fops