X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcache.lisp;h=627b660c29ee6c64409d5d6659f6a04610c2f119;hb=416152f084604094445a758ff399871132dff2bd;hp=bf3ce0dff87f69fa3892422e6822d45ec306de6d;hpb=cbaa1997bb097a55d108df592ac3b7eb4a703fff;p=sbcl.git

diff --git a/src/pcl/cache.lisp b/src/pcl/cache.lisp
index bf3ce0d..627b660 100644
--- a/src/pcl/cache.lisp
+++ b/src/pcl/cache.lisp
@@ -335,9 +335,9 @@
      (found
       (unless (sb-kernel:class-pcl-class found)
 	(setf (sb-kernel:class-pcl-class found) class))
-      (assert (eq (sb-kernel:class-pcl-class found) class))
+      (aver (eq (sb-kernel:class-pcl-class found) class))
       (let ((layout (sb-kernel:class-layout found)))
-	(assert layout)
+	(aver layout)
 	layout))
      (t
       (make-wrapper-internal
@@ -370,7 +370,7 @@
 		     (let ((found (cl:find-class (slot-value class 'name))))
 		       (unless (sb-kernel:class-pcl-class found)
 			 (setf (sb-kernel:class-pcl-class found) class))
-		       (assert (eq (sb-kernel:class-pcl-class found) class))
+		       (aver (eq (sb-kernel:class-pcl-class found) class))
 		       found))
 		    (t
 		     (sb-kernel:make-standard-class :pcl-class class))))
@@ -381,8 +381,8 @@
 	   (layout (sb-kernel:class-layout found)))
       (unless (sb-kernel:class-pcl-class found)
 	(setf (sb-kernel:class-pcl-class found) class))
-      (assert (eq (sb-kernel:class-pcl-class found) class))
-      (assert layout)
+      (aver (eq (sb-kernel:class-pcl-class found) class))
+      (aver layout)
       layout))))
 
 ;;; FIXME: The immediately following macros could become inline functions.
@@ -579,7 +579,7 @@
 	(values (logxor (the fixnum (1- cache-size)) (the fixnum (1- line-size)))
 		cache-size
 		line-size
-		(the fixnum (floor cache-size line-size))))
+		(the (values fixnum t) (floor cache-size line-size))))
       (let* ((line-size (power-of-two-ceiling (if valuep (1+ nkeys) nkeys)))
 	     (cache-size (if (typep nlines-or-cache-vector 'fixnum)
 			     (the fixnum
@@ -592,7 +592,7 @@
 	(values (logxor (the fixnum (1- cache-size)) (the fixnum (1- line-size)))
 		(the fixnum (1+ cache-size))
 		line-size
-		(the fixnum (floor cache-size line-size))))))
+		(the (values fixnum t) (floor cache-size line-size))))))
 
 ;;; the various implementations of computing a primary cache location from
 ;;; wrappers. Because some implementations of this must run fast there are