0.8.3.12:

[sbcl.git] / src / compiler / compiler-deftype.lisp

diff --git a/src/compiler/compiler-deftype.lisp b/src/compiler/compiler-deftype.lisp
index 44a0c44..2a1ddce 100644 (file)
--- a/src/compiler/compiler-deftype.lisp
+++ b/src/compiler/compiler-deftype.lisp
@@ -20,8 +20,8 @@
        (error "illegal to redefine standard type: ~S" name)))
     (:instance
      (warn "The class ~S is being redefined to be a DEFTYPE." name)
-     (undefine-structure (layout-info (class-layout (sb!xc:find-class name))))
-     (setf (class-cell-class (find-class-cell name)) nil)
+     (undefine-structure (layout-info (classoid-layout (find-classoid name))))
+     (setf (classoid-cell-classoid (find-classoid-cell name)) nil)
      (setf (info :type :compiler-layout name) nil)
      (setf (info :type :kind name) :defined))
     (:defined
@@ -36,7 +36,7 @@
      ;; since mistakenly redefining a type isn't a common error
      ;; anyway, we just don't worry about trying to warn about it.
      )
-    ((nil)
+    ((nil :forthcoming-defclass-type)
      (setf (info :type :kind name) :defined)))
   (setf (info :type :expander name) expander)
   (when doc