1.0.42.24: print symbols with fully qualified names in critical places
[sbcl.git] / src / pcl / std-class.lisp
index c95cf63..b1a60df 100644 (file)
@@ -69,8 +69,8 @@
               (the fixnum (logand (the fixnum (lognot mask)) flags)))))
   value)
 
-(defmethod initialize-internal-slot-functions ((slotd
-                                                effective-slot-definition))
+(defmethod initialize-internal-slot-functions
+    ((slotd effective-slot-definition))
   (let* ((name (slot-value slotd 'name))
          (class (slot-value slotd '%class)))
     (dolist (type '(reader writer boundp))
                               (writer '(setf slot-value-using-class))
                               (boundp 'slot-boundp-using-class)))
              (gf (gdefinition gf-name)))
+        ;; KLUDGE: this logic is cut'n'pasted from
+        ;; GET-ACCESSOR-METHOD-FUNCTION, which (for STD-CLASSes) is
+        ;; only called later, because it does things that can't be
+        ;; computed this early in class finalization; however, we need
+        ;; this bit as early as possible.  -- CSR, 2009-11-05
+        (setf (slot-accessor-std-p slotd type)
+              (let* ((std-method (standard-svuc-method type))
+                     (str-method (structure-svuc-method type))
+                     (types1 `((eql ,class) (class-eq ,class) (eql ,slotd)))
+                     (types (if (eq type 'writer) `(t ,@types1) types1))
+                     (methods (compute-applicable-methods-using-types gf types)))
+                (null (cdr methods))))
+        (setf (slot-accessor-function slotd type)
+              (lambda (&rest args)
+                ;; FIXME: a tiny amount of wasted SLOT-ACCESSOR-STD-P
+                ;; work here (see KLUDGE comment above).
+                (let ((fun (compute-slot-accessor-info slotd type gf)))
+                  (apply fun args))))))))
+
+(defmethod finalize-internal-slot-functions ((slotd effective-slot-definition))
+  (let* ((name (slot-value slotd 'name)))
+    (dolist (type '(reader writer boundp))
+      (let* ((gf-name (ecase type
+                              (reader 'slot-value-using-class)
+                              (writer '(setf slot-value-using-class))
+                              (boundp 'slot-boundp-using-class)))
+             (gf (gdefinition gf-name)))
         (compute-slot-accessor-info slotd type gf)))))
 
 ;;; CMUCL (Gerd PCL 2003-04-25) comment:
 (defmethod compute-slot-accessor-info ((slotd effective-slot-definition)
                                        type gf)
   (let* ((name (slot-value slotd 'name))
-         (class (slot-value slotd '%class))
-         (old-slotd (when (class-finalized-p class)
-                      (find-slot-definition class name)))
-         (old-std-p (and old-slotd (slot-accessor-std-p old-slotd 'all))))
+         (class (slot-value slotd '%class)))
     (multiple-value-bind (function std-p)
-        (if (eq *boot-state* 'complete)
+        (if (eq **boot-state** 'complete)
             (get-accessor-method-function gf type class slotd)
             (get-optimized-std-accessor-method-function class slotd type))
       (setf (slot-accessor-std-p slotd type) std-p)
 (defmethod add-direct-method :around ((specializer specializer) method)
   ;; All the actions done under this lock are done in an order
   ;; that is safe to unwind at any point.
-  (sb-thread::with-recursive-spinlock (*specializer-lock*)
+  (sb-thread::with-recursive-system-spinlock (*specializer-lock*)
     (call-next-method)))
 
 (defmethod remove-direct-method :around ((specializer specializer) method)
   ;; All the actions done under this lock are done in an order
   ;; that is safe to unwind at any point.
-  (sb-thread::with-recursive-spinlock (*specializer-lock*)
+  (sb-thread::with-recursive-system-spinlock (*specializer-lock*)
     (call-next-method)))
 
 (defmethod add-direct-method ((specializer class) (method method))
 (setf (gdefinition 'load-defclass) #'real-load-defclass)
 
 (defun ensure-class (name &rest args)
-  (apply #'ensure-class-using-class
-         (let ((class (find-class name nil)))
-           (when (and class (eq name (class-name class)))
-             ;; NAME is the proper name of CLASS, so redefine it
-             class))
-         name
-         args))
+  (with-world-lock ()
+    (apply #'ensure-class-using-class
+           (let ((class (find-class name nil)))
+             (when (and class (eq name (class-name class)))
+               ;; NAME is the proper name of CLASS, so redefine it
+               class))
+           name
+           args)))
 
 (defmethod ensure-class-using-class ((class null) name &rest args &key)
-  (multiple-value-bind (meta initargs)
-      (frob-ensure-class-args args)
-    (setf class (apply #'make-instance meta :name name initargs))
-    (without-package-locks
-      (setf (find-class name) class))
-    (set-class-type-translation class name)
-    class))
+  (with-world-lock ()
+    (multiple-value-bind (meta initargs)
+        (frob-ensure-class-args args)
+      (setf class (apply #'make-instance meta :name name initargs))
+      (without-package-locks
+        (setf (find-class name) class))))
+  ;; After boot (SETF FIND-CLASS) does this.
+  (unless (eq **boot-state** 'complete)
+    (%set-class-type-translation class name))
+  class)
 
 (defmethod ensure-class-using-class ((class pcl-class) name &rest args &key)
-  (multiple-value-bind (meta initargs)
-      (frob-ensure-class-args args)
-    (unless (eq (class-of class) meta)
-      (apply #'change-class class meta initargs))
-    (apply #'reinitialize-instance class initargs)
-    (without-package-locks
-      (setf (find-class name) class))
-    (set-class-type-translation class name)
-    class))
+  (with-world-lock ()
+    (multiple-value-bind (meta initargs)
+        (frob-ensure-class-args args)
+      (unless (eq (class-of class) meta)
+        (apply #'change-class class meta initargs))
+      (apply #'reinitialize-instance class initargs)
+      (without-package-locks
+        (setf (find-class name) class))))
+  ;; After boot (SETF FIND-CLASS) does this.
+  (unless (eq **boot-state** 'complete)
+    (%set-class-type-translation class name))
+  class)
 
 (defun frob-ensure-class-args (args)
   (let (metaclass metaclassp reversed-plist)
   (flet ((compute-preliminary-cpl (root)
            (let ((*allow-forward-referenced-classes-in-cpl-p* t))
              (compute-class-precedence-list root))))
-    (without-package-locks
-     (unless (class-finalized-p class)
-       (let ((name (class-name class)))
-         ;; KLUDGE: This is fairly horrible.  We need to make a
-         ;; full-fledged CLASSOID here, not just tell the compiler that
-         ;; some class is forthcoming, because there are legitimate
-         ;; questions one can ask of the type system, implemented in
-         ;; terms of CLASSOIDs, involving forward-referenced classes. So.
-         (let ((layout (make-wrapper 0 class)))
-           (setf (slot-value class 'wrapper) layout)
-           (let ((cpl (compute-preliminary-cpl class)))
-             (setf (layout-inherits layout)
-                   (order-layout-inherits
-                    (map 'simple-vector #'class-wrapper
-                         (reverse (rest cpl))))))
-           (register-layout layout :invalidate t)
-           (set-class-type-translation class (layout-classoid layout)))))
-     (mapc #'make-preliminary-layout (class-direct-subclasses class)))))
+    (with-world-lock ()
+      (without-package-locks
+        (unless (class-finalized-p class)
+          (let ((name (class-name class)))
+            ;; KLUDGE: This is fairly horrible.  We need to make a
+            ;; full-fledged CLASSOID here, not just tell the compiler that
+            ;; some class is forthcoming, because there are legitimate
+            ;; questions one can ask of the type system, implemented in
+            ;; terms of CLASSOIDs, involving forward-referenced classes. So.
+            (let ((layout (make-wrapper 0 class)))
+              (setf (slot-value class 'wrapper) layout)
+              (let ((cpl (compute-preliminary-cpl class)))
+                (setf (layout-inherits layout)
+                      (order-layout-inherits
+                       (map 'simple-vector #'class-wrapper
+                            (reverse (rest cpl))))))
+              (register-layout layout :invalidate t)
+              (%set-class-type-translation class (layout-classoid layout)))))
+        (mapc #'make-preliminary-layout (class-direct-subclasses class))))))
 
 
 (defmethod shared-initialize :before ((class class) slot-names &key name)
 
 (defmethod compute-slots :around ((class condition-class))
   (let ((eslotds (call-next-method)))
-    (mapc #'initialize-internal-slot-functions eslotds)
+    (mapc #'finalize-internal-slot-functions eslotds)
     eslotds))
 
 (defmethod shared-initialize :after
 (defun make-structure-class-defstruct-form (name direct-slots include)
   (let* ((conc-name (format-symbol *package* "~S structure class " name))
          (constructor (format-symbol *package* "~Aconstructor" conc-name))
-         (defstruct `(defstruct (,name
-                                 ,@(when include
-                                         `((:include ,(class-name include))))
-                                 (:predicate nil)
-                                 (:conc-name ,conc-name)
-                                 (:constructor ,constructor ())
-                                 (:copier nil))
-                      ,@(mapcar (lambda (slot)
-                                  `(,(slot-definition-name slot)
-                                    +slot-unbound+))
-                                direct-slots)))
-         (reader-names (mapcar (lambda (slotd)
-                                 (list 'slot-accessor name
-                                       (slot-definition-name slotd)
-                                       'reader))
-                               direct-slots))
-         (writer-names (mapcar (lambda (slotd)
-                                 (list 'slot-accessor name
-                                       (slot-definition-name slotd)
-                                       'writer))
-                               direct-slots))
-         (readers-init
-           (mapcar (lambda (slotd reader-name)
-                     (let ((accessor
+         (included-name (class-name include))
+         (included-slots
+          (when include
+            (mapcar #'dsd-name (dd-slots (find-defstruct-description included-name)))))
+         (old-slots nil)
+         (new-slots nil)
+         (reader-names nil)
+         (writer-names nil))
+    (dolist (slotd (reverse direct-slots))
+      (let* ((slot-name (slot-definition-name slotd))
+             (initform (slot-definition-initform slotd))
+             (type (slot-definition-type slotd))
+             (desc `(,slot-name ,initform :type ,type)))
+        (push `(slot-accessor ,name ,slot-name reader)
+              reader-names)
+        (push `(slot-accessor ,name ,slot-name writer)
+              writer-names)
+        (if (member slot-name included-slots :test #'eq)
+            (push desc old-slots)
+            (push desc new-slots))))
+    (let* ((defstruct `(defstruct (,name
+                                    ,@(when include
+                                            `((:include ,included-name
+                                                        ,@old-slots)))
+                                    (:constructor ,constructor ())
+                                    (:predicate nil)
+                                    (:conc-name ,conc-name)
+                                    (:copier nil))
+                         ,@new-slots))
+           (readers-init
+            (mapcar (lambda (slotd reader-name)
+                      (let ((accessor
                              (slot-definition-defstruct-accessor-symbol
                               slotd)))
-                       `(defun ,reader-name (obj)
-                         (declare (type ,name obj))
-                         (,accessor obj))))
-                   direct-slots reader-names))
-         (writers-init
-           (mapcar (lambda (slotd writer-name)
-                     (let ((accessor
+                        `(defun ,reader-name (obj)
+                           (declare (type ,name obj))
+                           (,accessor obj))))
+                    direct-slots reader-names))
+           (writers-init
+            (mapcar (lambda (slotd writer-name)
+                      (let ((accessor
                              (slot-definition-defstruct-accessor-symbol
                               slotd)))
-                       `(defun ,writer-name (nv obj)
-                         (declare (type ,name obj))
-                         (setf (,accessor obj) nv))))
-                   direct-slots writer-names))
-         (defstruct-form
-             `(progn
+                        `(defun ,writer-name (nv obj)
+                           (declare (type ,name obj))
+                           (setf (,accessor obj) nv))))
+                    direct-slots writer-names))
+           (defstruct-form
+            `(progn
                ,defstruct
                ,@readers-init ,@writers-init
                (cons nil nil))))
-    (values defstruct-form constructor reader-names writer-names)))
+      (values defstruct-form constructor reader-names writer-names))))
 
 (defun make-defstruct-allocation-function (name)
   ;; FIXME: Why don't we go class->layout->info == dd
 ;;; or reinitialized. The class may or may not be finalized.
 (defun update-class (class finalizep)
   (without-package-locks
-    (when (or finalizep (class-finalized-p class))
-      (update-cpl class (compute-class-precedence-list class))
-      ;; This invocation of UPDATE-SLOTS, in practice, finalizes the
-      ;; class.
-      (update-slots class (compute-slots class))
-      (update-gfs-of-class class)
-      (update-initargs class (compute-default-initargs class))
-      (update-ctors 'finalize-inheritance :class class))
-    (dolist (sub (class-direct-subclasses class))
-      (update-class sub nil))))
+    (with-world-lock ()
+      (when (or finalizep (class-finalized-p class))
+        (%update-cpl class (compute-class-precedence-list class))
+        ;; This invocation of UPDATE-SLOTS, in practice, finalizes the
+        ;; class.
+        (%update-slots class (compute-slots class))
+        (update-gfs-of-class class)
+        (setf (plist-value class 'default-initargs) (compute-default-initargs class))
+        (update-ctors 'finalize-inheritance :class class))
+      (dolist (sub (class-direct-subclasses class))
+        (update-class sub nil)))))
 
 (define-condition cpl-protocol-violation (reference-condition error)
   ((class :initarg :class :reader cpl-protocol-violation-class)
              (find-class 'function)
              (cpl-protocol-violation-cpl c)))))
 
-(defun update-cpl (class cpl)
+(defun %update-cpl (class cpl)
   (when (eq (class-of class) *the-class-standard-class*)
     (when (find (find-class 'function) cpl)
       (error 'cpl-protocol-violation :class class :cpl cpl)))
                                      :key #'slot-definition-allocation)
                        (return nil))))
         ;; comment from the old CMU CL sources:
-        ;;   Need to have the cpl setup before update-lisp-class-layout
+        ;;   Need to have the cpl setup before %update-lisp-class-layout
         ;;   is called on CMU CL.
         (setf (slot-value class '%class-precedence-list) cpl)
         (setf (slot-value class 'cpl-available-p) t)
-        (force-cache-flushes class))
+        (%force-cache-flushes class))
       (progn
         (setf (slot-value class '%class-precedence-list) cpl)
         (setf (slot-value class 'cpl-available-p) t)))
 (defun class-can-precede-p (class1 class2)
   (member class2 (class-can-precede-list class1) :test #'eq))
 
-(defun update-slots (class eslotds)
+(defun %update-slots (class eslotds)
   (let ((instance-slots ())
         (class-slots    ()))
     (dolist (eslotd eslotds)
                    (make-instances-obsolete class)
                    (class-wrapper class)))))
 
-      (update-lisp-class-layout class nwrapper)
+      (%update-lisp-class-layout class nwrapper)
       (setf (slot-value class 'slots) eslotds
             (wrapper-slot-table nwrapper) (make-slot-table class eslotds)
             (wrapper-instance-slots-layout nwrapper) nlayout
               (style-warn
                "~@<slot names with the same SYMBOL-NAME but ~
                   different SYMBOL-PACKAGE (possible package problem) ~
-                  for class ~S:~4I~@:_~<~@{~S~^~:@_~}~:>~@:>"
+                  for class ~S:~4I~@:_~<~@{~/sb-impl::print-symbol-with-prefix/~^~:@_~}~:>~@:>"
                class dupes)))
         (let* ((slot (car slots))
                (oslots (remove (slot-definition-name slot) (cdr slots)
                      :test #'string= :key #'car))))
       (setf (slot-value class 'finalized-p) t)
       (unless (eq owrapper nwrapper)
-        (maybe-update-standard-class-locations class)))))
+        (maybe-update-standard-slot-locations class)))))
 
 (defun compute-class-slots (eslotds)
   (let (collect)
         (aver cell)
         (push cell collect)))))
 
+(defun update-gf-dfun (class gf)
+  (let ((*new-class* class)
+        (arg-info (gf-arg-info gf)))
+    (cond
+      ((special-case-for-compute-discriminating-function-p gf))
+      ((gf-precompute-dfun-and-emf-p arg-info)
+       (multiple-value-bind (dfun cache info) (make-final-dfun-internal gf)
+         (update-dfun gf dfun cache info))))))
+
 (defun update-gfs-of-class (class)
   (when (and (class-finalized-p class)
              (let ((cpl (class-precedence-list class)))
                    (declare (ignore ignore))
                    (update-gf-dfun class gf))
                  gf-table)))))
-
-(defun update-initargs (class inits)
-  (setf (plist-value class 'default-initargs) inits))
 \f
 (defmethod compute-default-initargs ((class slot-class))
   (let ((initargs (loop for c in (class-precedence-list class)
 
 (defmethod compute-slots :around ((class structure-class))
   (let ((eslotds (call-next-method)))
-    (mapc #'initialize-internal-slot-functions eslotds)
+    (mapc #'finalize-internal-slot-functions eslotds)
     eslotds))
 
 (defmethod compute-effective-slot-definition ((class slot-class) name dslotds)
 ;;;                    :UNINITIALIZED)))
 ;;;
 ;;; Thanks to Gerd Moellmann for the explanation.  -- CSR, 2002-10-29
-(defun force-cache-flushes (class)
+(defun %force-cache-flushes (class)
   (let* ((owrapper (class-wrapper class)))
     ;; We only need to do something if the wrapper is still valid. If
     ;; the wrapper isn't valid, state will be FLUSH or OBSOLETE, and
               (wrapper-class-slots owrapper))
         (setf (wrapper-slot-table nwrapper)
               (wrapper-slot-table owrapper))
-        (with-pcl-lock
-          (update-lisp-class-layout class nwrapper)
-          (setf (slot-value class 'wrapper) nwrapper)
-          ;; Use :OBSOLETE instead of :FLUSH if any superclass has
-          ;; been obsoleted.
-          (if (find-if (lambda (x)
-                         (and (consp x) (eq :obsolete (car x))))
-                       (layout-inherits owrapper)
-                       :key #'layout-invalid)
-              (invalidate-wrapper owrapper :obsolete nwrapper)
-              (invalidate-wrapper owrapper :flush nwrapper)))))))
-
-(defun flush-cache-trap (owrapper nwrapper instance)
-  (declare (ignore owrapper))
-  (set-wrapper instance nwrapper))
+        (%update-lisp-class-layout class nwrapper)
+        (setf (slot-value class 'wrapper) nwrapper)
+        ;; Use :OBSOLETE instead of :FLUSH if any superclass has
+        ;; been obsoleted.
+        (if (find-if (lambda (x)
+                       (and (consp x) (eq :obsolete (car x))))
+                     (layout-inherits owrapper)
+                     :key #'layout-invalid)
+            (%invalidate-wrapper owrapper :obsolete nwrapper)
+            (%invalidate-wrapper owrapper :flush nwrapper))))))
 \f
 ;;; MAKE-INSTANCES-OBSOLETE can be called by user code. It will cause
 ;;; the next access to the instance (as defined in 88-002R) to trap
 ;;; through the UPDATE-INSTANCE-FOR-REDEFINED-CLASS mechanism.
 (defmethod make-instances-obsolete ((class std-class))
-  (let* ((owrapper (class-wrapper class))
-         (nwrapper (make-wrapper (layout-length owrapper)
-                                 class)))
-    (unless (class-finalized-p class)
-      (if (class-has-a-forward-referenced-superclass-p class)
-          (return-from make-instances-obsolete class)
-          (update-cpl class (compute-class-precedence-list class))))
-    (setf (wrapper-instance-slots-layout nwrapper)
-          (wrapper-instance-slots-layout owrapper))
-    (setf (wrapper-class-slots nwrapper)
-          (wrapper-class-slots owrapper))
-    (setf (wrapper-slot-table nwrapper)
-          (wrapper-slot-table owrapper))
-    (with-pcl-lock
-        (update-lisp-class-layout class nwrapper)
+  (with-world-lock ()
+    (let* ((owrapper (class-wrapper class))
+           (nwrapper (make-wrapper (layout-length owrapper)
+                                   class)))
+      (unless (class-finalized-p class)
+        (if (class-has-a-forward-referenced-superclass-p class)
+            (return-from make-instances-obsolete class)
+            (%update-cpl class (compute-class-precedence-list class))))
+      (setf (wrapper-instance-slots-layout nwrapper)
+            (wrapper-instance-slots-layout owrapper))
+      (setf (wrapper-class-slots nwrapper)
+            (wrapper-class-slots owrapper))
+      (setf (wrapper-slot-table nwrapper)
+            (wrapper-slot-table owrapper))
+      (%update-lisp-class-layout class nwrapper)
       (setf (slot-value class 'wrapper) nwrapper)
-      (invalidate-wrapper owrapper :obsolete nwrapper)
+      (%invalidate-wrapper owrapper :obsolete nwrapper)
       class)))
 
 (defmethod make-instances-obsolete ((class symbol))
              "~@<obsolete structure error for a structure of type ~2I~_~S~:>"
              (type-of (obsolete-structure-datum condition))))))
 
-(defun obsolete-instance-trap (owrapper nwrapper instance)
+(defun %obsolete-instance-trap (owrapper nwrapper instance)
   (if (not (layout-for-std-class-p owrapper))
       (if *in-obsolete-instance-trap*
           *the-wrapper-of-structure-object*
-           (let ((*in-obsolete-instance-trap* t))
-             (error 'obsolete-structure :datum instance)))
+          (let ((*in-obsolete-instance-trap* t))
+            (error 'obsolete-structure :datum instance)))
       (let* ((class (wrapper-class* nwrapper))
              (copy (allocate-instance class)) ;??? allocate-instance ???
              (olayout (wrapper-instance-slots-layout owrapper))
                       (assq nlocal oclass-slots))
             (push nlocal added)))
 
-        (swap-wrappers-and-slots instance copy)
+        (%swap-wrappers-and-slots instance copy)
 
         (update-instance-for-redefined-class instance
                                              added
                                              plist)
         nwrapper)))
 \f
-(defun change-class-internal (instance new-class initargs)
+(defun %change-class (instance new-class initargs)
   (let* ((old-class (class-of instance))
          (copy (allocate-instance new-class))
          (new-wrapper (get-wrapper copy))
 
     ;; Make the copy point to the old instance's storage, and make the
     ;; old instance point to the new storage.
-    (swap-wrappers-and-slots instance copy)
+    (%swap-wrappers-and-slots instance copy)
 
     (apply #'update-instance-for-different-class copy instance initargs)
+
     instance))
 
 (defmethod change-class ((instance standard-object) (new-class standard-class)
                          &rest initargs)
-  (unless (class-finalized-p new-class)
-    (finalize-inheritance new-class))
-  (let ((cpl (class-precedence-list new-class)))
-    (dolist (class cpl)
-      (macrolet
-          ((frob (class-name)
-             `(when (eq class (find-class ',class-name))
-               (error 'metaobject-initialization-violation
-                :format-control "~@<Cannot ~S objects into ~S metaobjects.~@:>"
-                :format-arguments (list 'change-class ',class-name)
-                :references (list '(:amop :initialization ,class-name))))))
-        (frob class)
-        (frob generic-function)
-        (frob method)
-        (frob slot-definition))))
-  (change-class-internal instance new-class initargs))
+  (with-world-lock ()
+    (unless (class-finalized-p new-class)
+      (finalize-inheritance new-class))
+    (let ((cpl (class-precedence-list new-class)))
+      (dolist (class cpl)
+        (macrolet
+            ((frob (class-name)
+               `(when (eq class (find-class ',class-name))
+                  (error 'metaobject-initialization-violation
+                         :format-control "~@<Cannot ~S objects into ~S metaobjects.~@:>"
+                         :format-arguments (list 'change-class ',class-name)
+                         :references (list '(:amop :initialization ,class-name))))))
+          (frob class)
+          (frob generic-function)
+          (frob method)
+          (frob slot-definition))))
+    (%change-class instance new-class initargs)))
 
 (defmethod change-class ((instance forward-referenced-class)
                          (new-class standard-class) &rest initargs)
-  (let ((cpl (class-precedence-list new-class)))
-    (dolist (class cpl
-             (error 'metaobject-initialization-violation
-                    :format-control
-                    "~@<Cannot ~S ~S objects into non-~S objects.~@:>"
-                    :format-arguments
-                    (list 'change-class 'forward-referenced-class 'class)
-                    :references
-                    (list '(:amop :generic-function ensure-class-using-class)
-                          '(:amop :initialization class))))
-      (when (eq class (find-class 'class))
-        (return nil))))
-  (change-class-internal instance new-class initargs))
+  (with-world-lock ()
+    (let ((cpl (class-precedence-list new-class)))
+      (dolist (class cpl
+               (error 'metaobject-initialization-violation
+                      :format-control
+                      "~@<Cannot ~S ~S objects into non-~S objects.~@:>"
+                      :format-arguments
+                      (list 'change-class 'forward-referenced-class 'class)
+                      :references
+                      (list '(:amop :generic-function ensure-class-using-class)
+                            '(:amop :initialization class))))
+        (when (eq class (find-class 'class))
+          (return nil))))
+    (%change-class instance new-class initargs)))
 
 (defmethod change-class ((instance funcallable-standard-object)
                          (new-class funcallable-standard-class)
                          &rest initargs)
-  (let ((cpl (class-precedence-list new-class)))
-    (dolist (class cpl)
-      (macrolet
-          ((frob (class-name)
-             `(when (eq class (find-class ',class-name))
-               (error 'metaobject-initialization-violation
-                :format-control "~@<Cannot ~S objects into ~S metaobjects.~@:>"
-                :format-arguments (list 'change-class ',class-name)
-                :references (list '(:amop :initialization ,class-name))))))
-        (frob class)
-        (frob generic-function)
-        (frob method)
-        (frob slot-definition))))
-  (change-class-internal instance new-class initargs))
+  (with-world-lock ()
+    (let ((cpl (class-precedence-list new-class)))
+      (dolist (class cpl)
+        (macrolet
+            ((frob (class-name)
+               `(when (eq class (find-class ',class-name))
+                  (error 'metaobject-initialization-violation
+                         :format-control "~@<Cannot ~S objects into ~S metaobjects.~@:>"
+                         :format-arguments (list 'change-class ',class-name)
+                         :references (list '(:amop :initialization ,class-name))))))
+          (frob class)
+          (frob generic-function)
+          (frob method)
+          (frob slot-definition))))
+    (%change-class instance new-class initargs)))
 
 (defmethod change-class ((instance standard-object)
                          (new-class funcallable-standard-class)