X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tests%2Fmop.impure.lisp;h=01b2796b7b5b1f24665f1ee2df9a6df1a9920d18;hb=d7875c296a4988e9f27e2776237884deb1984c62;hp=c510eb107412578dcb62f8a9653416fc174eb8fa;hpb=b324caabfa2f0d04e2851a23f7e84dcd3fca5b9b;p=sbcl.git

diff --git a/tests/mop.impure.lisp b/tests/mop.impure.lisp
index c510eb1..01b2796 100644
--- a/tests/mop.impure.lisp
+++ b/tests/mop.impure.lisp
@@ -6,7 +6,7 @@
 ;;;; While most of SBCL is derived from the CMU CL system, the test
 ;;;; files (like this one) were written from scratch after the fork
 ;;;; from CMU CL.
-;;;; 
+;;;;
 ;;;; This software is in the public domain and is provided with
 ;;;; absolutely no warranty. See the COPYING and CREDITS files for
 ;;;; more information.
@@ -15,8 +15,10 @@
 ;;;; However, this seems a good a way as any of ensuring that we have
 ;;;; no regressions.
 
+(load "test-util.lisp")
+
 (defpackage "MOP-TEST"
-  (:use "CL" "SB-MOP"))
+  (:use "CL" "SB-MOP" "ASSERTOID" "TEST-UTIL"))
 
 (in-package "MOP-TEST")
 
@@ -25,26 +27,26 @@
 
 (assert (null (class-direct-slots (find-class 'forward-ref))))
 (assert (null (class-direct-default-initargs
-	       (find-class 'forward-ref))))
+               (find-class 'forward-ref))))
 
 ;;; Readers for Generic Function Metaobjects (pp. 216--218 of AMOP)
 (defgeneric fn-with-odd-arg-precedence (a b c)
   (:argument-precedence-order b c a))
 
 (assert (equal
-	 (generic-function-lambda-list #'fn-with-odd-arg-precedence)
-	 '(a b c)))
+         (generic-function-lambda-list #'fn-with-odd-arg-precedence)
+         '(a b c)))
 (assert (equal
-	 (generic-function-argument-precedence-order #'fn-with-odd-arg-precedence)
-	 '(b c a)))
+         (generic-function-argument-precedence-order #'fn-with-odd-arg-precedence)
+         '(b c a)))
 ;;; Test for DOCUMENTATION's order, which was wrong until sbcl-0.7.8.39
 (assert (equal
-	 (generic-function-argument-precedence-order #'documentation)
-	 (let ((ll (generic-function-lambda-list #'documentation)))
-	   (list (nth 1 ll) (nth 0 ll)))))
+         (generic-function-argument-precedence-order #'documentation)
+         (let ((ll (generic-function-lambda-list #'documentation)))
+           (list (nth 1 ll) (nth 0 ll)))))
 
 (assert (null
-	 (generic-function-declarations #'fn-with-odd-arg-precedence)))
+         (generic-function-declarations #'fn-with-odd-arg-precedence)))
 (defgeneric gf-with-declarations (x)
   (declare (optimize (speed 3)))
   (declare (optimize (safety 0))))
@@ -61,13 +63,13 @@
   ((an-instance-slot :accessor an-instance-slot)
    (a-class-slot :allocation :class :accessor a-class-slot)))
 (dolist (m (list (list #'an-instance-slot :instance)
-		 (list #'a-class-slot :class)))
+                 (list #'a-class-slot :class)))
   (let ((methods (generic-function-methods (car m))))
     (assert (= (length methods) 1))
     (assert (eq (slot-definition-allocation
-		 (accessor-method-slot-definition
-		  (car methods)))
-		(cadr m)))))
+                 (accessor-method-slot-definition
+                  (car methods)))
+                (cadr m)))))
 
 ;;; Class Finalization Protocol (see section 5.5.2 of AMOP)
 (let ((finalized-count 0))
@@ -98,9 +100,9 @@
 ;;; not going to change often.
 (dolist (x '(number array sequence character symbol))
   (assert (eq (car (class-direct-superclasses (find-class x)))
-	      (find-class t)))
+              (find-class t)))
   (assert (member (find-class x)
-		  (class-direct-subclasses (find-class t)))))
+                  (class-direct-subclasses (find-class t)))))
 
 ;;; the class-prototype of the NULL class used to be some weird
 ;;; standard-instance-like thing.  Make sure it's actually NIL.
@@ -112,17 +114,17 @@
 ;;; simple consistency checks for the SB-MOP package: all of the
 ;;; functionality specified in AMOP is in functions and classes:
 (assert (null (loop for x being each external-symbol in "SB-MOP"
-		    unless (or (fboundp x) (find-class x)) collect x)))
+                    unless (or (fboundp x) (find-class x)) collect x)))
 ;;; and all generic functions in SB-MOP have at least one specified
 ;;; method, except for UPDATE-DEPENDENT
 (assert (null (loop for x being each external-symbol in "SB-MOP"
-		    unless (or (not (fboundp x))
-			       (eq x 'update-dependent)
-			       (not (typep (fdefinition x) 'generic-function))
-			       (> (length (generic-function-methods
-					   (fdefinition x)))
-				  0))
-		    collect x)))
+                    unless (or (not (fboundp x))
+                               (eq x 'update-dependent)
+                               (not (typep (fdefinition x) 'generic-function))
+                               (> (length (generic-function-methods
+                                           (fdefinition x)))
+                                  0))
+                    collect x)))
 
 ;;; make sure that ENSURE-CLASS-USING-CLASS's arguments are the right
 ;;; way round (!)
@@ -194,17 +196,18 @@
 (defclass class-to-add-instance-slot (dummy-ctais) ())
 (defmethod compute-slots ((c (eql (find-class 'class-to-add-instance-slot))))
   (append (call-next-method)
-	  (list (make-instance 'standard-effective-slot-definition
-			       :name 'y
-			       :allocation :instance))))
+          (list (make-instance 'standard-effective-slot-definition
+                               :name 'y
+                               :allocation :instance))))
 (defclass dummy-ctais () ((x :allocation :class)))
-(assert (equal (mapcar #'slot-definition-allocation 
-		       (class-slots (find-class 'class-to-add-instance-slot)))
-	       ;; FIXME: is the order really guaranteed?
-	       '(:class :instance)))
-(assert (typep (slot-definition-location 
-		(cadr (class-slots (find-class 'class-to-add-instance-slot)))) 
-	       'unsigned-byte))
+(finalize-inheritance (find-class 'class-to-add-instance-slot))
+(assert (equal (mapcar #'slot-definition-allocation
+                       (class-slots (find-class 'class-to-add-instance-slot)))
+               ;; FIXME: is the order really guaranteed?
+               '(:class :instance)))
+(assert (typep (slot-definition-location
+                (cadr (class-slots (find-class 'class-to-add-instance-slot))))
+               'unsigned-byte))
 #| (assert (typep (slot-definition-location (car ...)) '???)) |#
 (let ((x (make-instance 'class-to-add-instance-slot)))
   (assert (not (slot-boundp x 'x)))
@@ -221,13 +224,14 @@
 (defclass class-to-add-class-slot (dummy-ctacs) ())
 (defmethod compute-slots ((c (eql (find-class 'class-to-add-class-slot))))
   (append (call-next-method)
-	  (list (make-instance 'standard-effective-slot-definition
-			       :name 'y
-			       :allocation :class))))
+          (list (make-instance 'standard-effective-slot-definition
+                               :name 'y
+                               :allocation :class))))
 (defclass dummy-ctacs () ((x :allocation :class)))
-(assert (equal (mapcar #'slot-definition-allocation 
-		       (class-slots (find-class 'class-to-add-class-slot)))
-	       '(:class :class)))
+(finalize-inheritance (find-class 'class-to-add-class-slot))
+(assert (equal (mapcar #'slot-definition-allocation
+                       (class-slots (find-class 'class-to-add-class-slot)))
+               '(:class :class)))
 (let ((x (make-instance 'class-to-add-class-slot)))
   (assert (not (slot-boundp x 'x)))
   (setf (slot-value x 'x) nil)
@@ -252,8 +256,8 @@
   ((frob-slot :initarg :frob-slot :allocation :frob)))
 (handler-case
     (funcall (compile nil '(lambda ()
-			    (make-instance 'class-with-frob-slot
-			     :frob-slot 1))))
+                            (make-instance 'class-with-frob-slot
+                             :frob-slot 1))))
   (sb-int:bug (c) (error c))
   (error () "Probably OK: haven't implemented SLOT-BOUNDP-USING-CLASS"))
 ;;; secondly, it failed to take account of the fact that we might wish
@@ -265,7 +269,7 @@
     (new-value class (instance class-with-special-ssvuc) slotd)
   (incf *special-ssvuc-counter*))
 (let ((fun (compile nil '(lambda () (make-instance 'class-with-special-ssvuc
-				     :some-slot 1)))))
+                                     :some-slot 1)))))
   (assert (= *special-ssvuc-counter* 0))
   (funcall fun)
   (assert (= *special-ssvuc-counter* 1))
@@ -276,7 +280,7 @@
   ((some-slot :initarg :some-slot)))
 (defvar *special-ssvuc-counter-2* 0)
 (let ((fun (compile nil '(lambda () (make-instance 'class-with-special-ssvuc-2
-				     :some-slot 1)))))
+                                     :some-slot 1)))))
   (assert (= *special-ssvuc-counter-2* 0))
   (funcall fun)
   (assert (= *special-ssvuc-counter-2* 0))
@@ -298,7 +302,7 @@
 (defclass auto-accessors-class (standard-class)
   ())
 (defmethod direct-slot-definition-class ((class auto-accessors-class)
-					 &rest initargs)
+                                         &rest initargs)
   (let ((dsd-class-name (gensym)))
     (sb-pcl:ensure-class
      dsd-class-name
@@ -306,21 +310,21 @@
      :direct-superclasses (list (find-class 'standard-direct-slot-definition))
      :containing-class-name (class-name class))
     (eval `(defmethod initialize-instance :after ((dsd ,dsd-class-name)
-						  &rest args)
-	    (when (and (null (slot-definition-readers dsd))
-		       (null (slot-definition-writers dsd)))
-	      (let* ((containing-class-name
-		      (slot-value (class-of dsd) 'containing-class-name))
-		     (accessor-name
-		      (intern
-		       (concatenate 'string
-				    (symbol-name containing-class-name)
-				    "-"
-				    (symbol-name (slot-definition-name dsd)))
-		       (symbol-package containing-class-name))))
-		(setf (slot-definition-readers dsd) (list accessor-name))
-		(setf (slot-definition-writers dsd)
-		      (list (list 'setf accessor-name)))))))
+                                                  &rest args)
+            (when (and (null (slot-definition-readers dsd))
+                       (null (slot-definition-writers dsd)))
+              (let* ((containing-class-name
+                      (slot-value (class-of dsd) 'containing-class-name))
+                     (accessor-name
+                      (intern
+                       (concatenate 'string
+                                    (symbol-name containing-class-name)
+                                    "-"
+                                    (symbol-name (slot-definition-name dsd)))
+                       (symbol-package containing-class-name))))
+                (setf (slot-definition-readers dsd) (list accessor-name))
+                (setf (slot-definition-writers dsd)
+                      (list (list 'setf accessor-name)))))))
     (find-class dsd-class-name)))
 (defmethod validate-superclass ((c1 auto-accessors-class) (c2 standard-class))
   t)
@@ -329,7 +333,7 @@
   (:metaclass auto-accessors-class))
 (let ((inst (make-instance 'testclass15 :x 12)))
   (assert (equal (list (testclass15-x inst) (setf (testclass15-y inst) 13))
-		 '(12 13))))
+                 '(12 13))))
 
 ;;; bug reported by Bruno Haible on sbcl-devel 2004-11-17: incorrect
 ;;; handling of multiple values for non-standard slot-options
@@ -338,19 +342,19 @@
     ((option :accessor sl-option :initarg :my-option)))
   (defclass option-slot-class (standard-class)
     ())
-  (defmethod sb-mop:direct-slot-definition-class 
+  (defmethod sb-mop:direct-slot-definition-class
       ((c option-slot-class) &rest args)
     (declare (ignore args))
     (find-class 'option-slot-definition))
-  (defmethod sb-mop:validate-superclass 
+  (defmethod sb-mop:validate-superclass
       ((c1 option-slot-class) (c2 standard-class))
     t)
   (eval '(defclass test-multiple-slot-option-bug ()
           ((x :my-option bar :my-option baz))
           (:metaclass option-slot-class)))
-  (assert (null (set-difference 
+  (assert (null (set-difference
                  '(bar baz)
-                 (sl-option (first (sb-mop:class-direct-slots 
+                 (sl-option (first (sb-mop:class-direct-slots
                                     (find-class 'test-multiple-slot-option-bug))))))))
 
 ;;; bug reported by Bruno Haibel on sbcl-devel 2004-11-19: AMOP requires
@@ -382,7 +386,308 @@
 (let ((subs (sb-mop:class-direct-subclasses (find-class 'bug-331-super))))
   (assert (= 1 (length subs)))
   (assert (eq (car subs) (find-class 'bug-331-sub))))
+;;; (addendum to test for #331: conditions suffered the same problem)
+(define-condition condition-bug-331-super () ())
+(define-condition condition-bug-331-sub (condition-bug-331-super) ())
+(let ((subs (sb-mop:class-direct-subclasses
+             (find-class 'condition-bug-331-super))))
+  (assert (= 1 (length subs)))
+  (assert (eq (car subs) (find-class 'condition-bug-331-sub))))
+;;; (addendum to the addendum: the fix for this revealed breakage in
+;;; REINITIALIZE-INSTANCE)
+(define-condition condition-bug-331a () ((slot331a :reader slot331a)))
+(reinitialize-instance (find-class 'condition-bug-331a))
+(let* ((gf #'slot331a)
+       (methods (sb-mop:generic-function-methods gf)))
+  (assert (= (length methods) 1))
+  (assert (eq (car methods)
+              (find-method #'slot331a nil
+                           (list (find-class 'condition-bug-331a))))))
+
+;;; detection of multiple class options in defclass, reported by Bruno Haible
+(defclass option-class (standard-class)
+  ((option :accessor cl-option :initarg :my-option)))
+(defmethod sb-pcl:validate-superclass ((c1 option-class) (c2 standard-class))
+  t)
+(multiple-value-bind (result error)
+    (ignore-errors (eval '(defclass option-class-instance ()
+                           ()
+                           (:my-option bar)
+                           (:my-option baz)
+                           (:metaclass option-class))))
+  (assert (not result))
+  (assert error))
+
+;;; class as :metaclass
+(assert (typep
+         (sb-mop:ensure-class-using-class
+          nil 'class-as-metaclass-test
+          :metaclass (find-class 'standard-class)
+          :name 'class-as-metaclass-test
+          :direct-superclasses (list (find-class 'standard-object)))
+         'class))
+
+;;; COMPUTE-DEFAULT-INITARGS protocol mismatch reported by Bruno
+;;; Haible
+(defparameter *extra-initarg-value* 'extra)
+(defclass custom-default-initargs-class (standard-class)
+  ())
+(defmethod compute-default-initargs ((class custom-default-initargs-class))
+  (let ((original-default-initargs
+         (remove-duplicates
+          (reduce #'append
+                  (mapcar #'class-direct-default-initargs
+                          (class-precedence-list class)))
+          :key #'car
+          :from-end t)))
+    (cons (list ':extra '*extra-initarg-value* #'(lambda () *extra-initarg-value*))
+          (remove ':extra original-default-initargs :key #'car))))
+(defmethod validate-superclass ((c1 custom-default-initargs-class)
+                                (c2 standard-class))
+  t)
+(defclass extra-initarg ()
+  ((slot :initarg :extra))
+  (:metaclass custom-default-initargs-class))
+(assert (eq (slot-value (make-instance 'extra-initarg) 'slot) 'extra))
+
+;;; STANDARD-CLASS valid as a superclass for FUNCALLABLE-STANDARD-CLASS
+(defclass standard-class-for-fsc ()
+  ((scforfsc-slot :initarg :scforfsc-slot :accessor scforfsc-slot)))
+(defvar *standard-class-for-fsc*
+  (make-instance 'standard-class-for-fsc :scforfsc-slot 1))
+(defclass fsc-with-standard-class-superclass
+    (standard-class-for-fsc funcallable-standard-object)
+  ((fsc-slot :initarg :fsc-slot :accessor fsc-slot))
+  (:metaclass funcallable-standard-class))
+(defvar *fsc/scs*
+  (make-instance 'fsc-with-standard-class-superclass
+                 :scforfsc-slot 2
+                 :fsc-slot 3))
+(assert (= (scforfsc-slot *standard-class-for-fsc*) 1))
+(assert (= (scforfsc-slot *fsc/scs*) 2))
+(assert (= (fsc-slot *fsc/scs*) 3))
+(assert (subtypep 'fsc-with-standard-class-superclass 'function))
+(assert (not (subtypep 'standard-class-for-fsc 'function)))
+
+;;; also check that our sanity check for functionness is good
+(assert (raises-error?
+         (progn
+           (defclass bad-standard-class (funcallable-standard-object)
+             ()
+             (:metaclass standard-class))
+           (make-instance 'bad-standard-class))))
+(assert (raises-error?
+         (progn
+           (defclass bad-funcallable-standard-class (standard-object)
+             ()
+             (:metaclass funcallable-standard-class))
+           (make-instance 'bad-funcallable-standard-class))))
+
+;;; we should be able to make classes with silly names
+(make-instance 'standard-class :name 3)
+(defclass foo () ())
+(reinitialize-instance (find-class 'foo) :name '(a b))
+
+;;; classes (including anonymous ones) and eql-specializers should be
+;;; allowed to be specializers.
+(defvar *anonymous-class*
+  (make-instance 'standard-class
+                 :direct-superclasses (list (find-class 'standard-object))))
+(defvar *object-of-anonymous-class*
+  (make-instance *anonymous-class*))
+(eval `(defmethod method-on-anonymous-class ((obj ,*anonymous-class*)) 41))
+(assert (eql (method-on-anonymous-class *object-of-anonymous-class*) 41))
+(eval `(defmethod method-on-anonymous-class
+        ((obj ,(intern-eql-specializer *object-of-anonymous-class*)))
+        42))
+(assert (eql (method-on-anonymous-class *object-of-anonymous-class*) 42))
+
+;;; accessors can cause early finalization, which caused confusion in
+;;; the system, leading to uncompileable TYPEP problems.
+(defclass funcallable-class-for-typep ()
+  ((some-slot-with-accessor :accessor some-slot-with-accessor))
+  (:metaclass funcallable-standard-class))
+(compile nil '(lambda (x) (typep x 'funcallable-class-for-typep)))
+
+;;; even anonymous classes should be valid types
+(let* ((class1 (make-instance 'standard-class :direct-superclasses (list (find-class 'standard-object))))
+       (class2 (make-instance 'standard-class :direct-superclasses (list class1))))
+  (assert (subtypep class2 class1))
+  (assert (typep (make-instance class2) class1)))
+
+;;; ensure-class got its treatment of :metaclass wrong.
+(ensure-class 'better-be-standard-class :direct-superclasses '(standard-object)
+              :metaclass 'standard-class
+              :metaclass 'funcallable-standard-class)
+(assert (eq (class-of (find-class 'better-be-standard-class))
+            (find-class 'standard-class)))
+
+;;; CLASS-SLOTS should signal an error for classes that are not yet
+;;; finalized. Reported by Levente Meszaros on sbcl-devel.
+(defclass has-slots-but-isnt-finalized () (a b c))
+(let ((class (find-class 'has-slots-but-isnt-finalized)))
+  (assert (not (sb-mop:class-finalized-p class)))
+  (assert (raises-error? (sb-mop:class-slots class) sb-kernel::reference-condition)))
+
+;;; Check that MAKE-METHOD-LAMBDA which wraps the original body doesn't
+;;; break RETURN-FROM.
+(defclass wrapped-generic (standard-generic-function)
+  ()
+  (:metaclass sb-mop:funcallable-standard-class))
+
+(defmethod sb-mop:make-method-lambda ((gf wrapped-generic) method lambda env)
+  (call-next-method gf method
+                    `(lambda ,(second lambda)
+                       (flet ((default () :default))
+                         ,@(cddr lambda)))
+                    env))
+
+(defgeneric wrapped (x)
+  (:generic-function-class wrapped-generic))
+
+(defmethod wrapped ((x cons))
+  (return-from wrapped (default)))
+
+(with-test (:name :make-method-lambda-wrapping+return-from)
+  (assert (eq :default (wrapped (cons t t)))))
+
+(with-test (:name :slow-method-is-fboundp)
+  (assert (fboundp '(sb-pcl::slow-method wrapped (cons))))
+  (assert (eq :default (funcall #'(sb-pcl::slow-method wrapped (cons)) (list (cons t t)) nil))))
+
+;;; Check that SLOT-BOUNDP-USING-CLASS doesn't confuse MAKE-INSTANCE
+;;; optimizations.
+(defclass sbuc-mio-test-class (standard-class)
+  ())
+(defmethod validate-superclass ((class sbuc-mio-test-class)
+                                (superclass standard-class))
+  t)
+(defvar *sbuc-counter* 0)
+(defmethod slot-boundp-using-class ((class sbuc-mio-test-class)
+                                    (object t)
+                                    (slot standard-effective-slot-definition))
+  (incf *sbuc-counter*)
+  (call-next-method))
+(defclass sbuc-mio-test-object ()
+  ((slot :initform 5 :accessor a-slot))
+  (:metaclass sbuc-mio-test-class))
+(with-test (:name :sbuc-mio-test)
+  (assert (= 5 (funcall
+                (compile
+                 nil
+                 `(lambda ()
+                    (let ((object (make-instance 'sbuc-mio-test-object)))
+                      (slot-value object 'slot)))))))
+  (assert (= 1 *sbuc-counter*)))
+
+;;; Redefining classes so that slot definition class changes.
+(defclass func-slot-class (standard-class)
+  ())
+
+(defmethod sb-mop:validate-superclass ((class func-slot-class) (super standard-class))
+  t)
+
+(defclass func-slot-definition ()
+  ((function :initform nil :initarg :function :reader slotd-function)))
+
+(defclass effective-func-slot-definition (sb-mop:standard-effective-slot-definition
+                                          func-slot-definition)
+  ())
+
+(defclass direct-func-slot-definition (sb-mop:standard-direct-slot-definition
+                                       func-slot-definition)
+  ())
+
+(defmethod sb-mop:slot-value-using-class ((class func-slot-class)
+                                          instance
+                                          (slotd effective-func-slot-definition))
+  (funcall (slotd-function slotd) (call-next-method)))
+
+(defvar *func-slot*)
+
+(defmethod sb-mop:effective-slot-definition-class ((class func-slot-class) &key)
+  (if *func-slot*
+      (find-class 'effective-func-slot-definition)
+      (call-next-method)))
+
+(defmethod sb-mop:direct-slot-definition-class ((class func-slot-class) &key)
+  (find-class 'direct-func-slot-definition))
+
+(defmethod sb-mop:compute-effective-slot-definition ((class func-slot-class) name dslotds)
+  (let* ((*func-slot* (some #'slotd-function dslotds))
+         (slotd (call-next-method)))
+    (when *func-slot*
+      (setf (slot-value slotd 'function) (fdefinition *func-slot*)))
+    slotd))
+
+(with-test (:name :class-redefinition-changes-custom-slot-type)
+  (eval `(defclass func-slot-object ()
+           ((foo :initarg :foo :reader foofoo))
+           (:metaclass func-slot-class)))
+  (let ((x (cons t t)))
+    (assert (eq x (foofoo (make-instance 'func-slot-object :foo x)))))
+  (eval `(defclass func-slot-object ()
+           ((foo :initarg :foo :reader foofoo :function car))
+           (:metaclass func-slot-class)))
+  (let* ((x (cons t t))
+         (y (list x)))
+    (assert (eq x (foofoo (make-instance 'func-slot-object :foo y))))))
+
+(with-test (:name :class-redefinition-changes-custom-slot-type-mio)
+  (eval `(defclass func-slot-object2 ()
+           ((foo :initarg :foo :reader foofoo))
+           (:metaclass func-slot-class)))
+  (let* ((x (cons t t))
+         (y (cons x x))
+         (o (make-instance 'func-slot-object2 :foo y)))
+    (assert (eq y (foofoo o)))
+    (eval `(defclass func-slot-object2 ()
+           ((foo :initarg :foo :reader foofoo :function car))
+           (:metaclass func-slot-class)))
+    (assert (eq x (foofoo o)))))
+
+(defclass class-slot-removal-test ()
+  ((instance :initform 1)
+   (class :allocation :class :initform :ok)))
+
+(defmethod update-instance-for-redefined-class ((x class-slot-removal-test) added removed plist &rest inits)
+  (throw 'update-instance
+    (list added removed plist inits)))
+
+(with-test (:name :class-redefinition-removes-class-slot)
+  (let ((o (make-instance 'class-slot-removal-test)))
+    (assert (equal '(nil nil nil nil)
+                   (catch 'update-instance
+                     (eval `(defclass class-slot-removal-test ()
+                              ((instance :initform 2))))
+                     (slot-value o 'instance))))))
+
+(defclass class-slot-add-test ()
+  ((instance :initform 1)))
+
+(defmethod update-instance-for-redefined-class ((x class-slot-add-test) added removed plist &rest inits)
+  (throw 'update-instance
+    (list added removed plist inits)))
+
+(with-test (:name :class-redefinition-adds-class-slot)
+  (let ((o (make-instance 'class-slot-add-test)))
+    (assert (equal '(nil nil nil nil)
+                   (catch 'update-instance
+                     (eval `(defclass class-slot-add-test ()
+                              ((instance :initform 2)
+                               (class :allocation :class :initform :ok))))
+                     (slot-value o 'instance))))))
+
+(defgeneric definitely-a-funcallable-instance (x))
+(with-test (:name (set-funcallable-instance-function :typechecking))
+  (assert (raises-error? (set-funcallable-instance-function
+                          (lambda (y) nil)
+                          #'definitely-a-funcallable-instance)
+                         type-error)))
 
+(with-test (:name (defstruct :nil-slot-name :bug-633911))
+  (defstruct nil-slot-name nil)
+  (let ((fun (compile nil '(lambda (x) (slot-value x 'nil)))))
+    (assert (= 3 (funcall fun (make-nil-slot-name :nil 3))))))
 
 ;;;; success
-(sb-ext:quit :unix-status 104)