0.pre7.78:

[sbcl.git] / src / code / inspect.lisp

diff --git a/src/code/inspect.lisp b/src/code/inspect.lisp
index 834bf34..4c278b8 100644 (file)
--- a/src/code/inspect.lisp
+++ b/src/code/inspect.lisp
@@ -11,8 +11,6 @@
 
 (in-package "SB-IMPL") ;(SB-IMPL, not SB!IMPL, since we're built in warm load.)
 
-(declaim #.*optimize-byte-compilation*)
-
 (defparameter *inspect-length* 10)
 
 ;;; When *INSPECT-UNBOUND-OBJECT-MARKER* occurs in a parts list, it
@@ -20,7 +18,6 @@
 (defvar *inspect-unbound-object-marker* (gensym "INSPECT-UNBOUND-OBJECT-"))
 
 (defun inspect (object)
-  (declare #.*optimize-external-despite-byte-compilation*)
   (catch 'quit-inspect
     (%inspect object *standard-output*))
   (values))
@@ -165,7 +162,7 @@ evaluated expressions.
     (when (sb-kernel::defstruct-description-p info)
       (dolist (dd-slot (dd-slots info) (nreverse parts-list))
         (push (cons (dsd-%name dd-slot)
-                    (funcall (dsd-accessor dd-slot) object))
+                    (funcall (dsd-accessor-name dd-slot) object))
               parts-list)))))
 
 (defmethod inspected-parts ((object structure-object))
@@ -197,12 +194,12 @@ evaluated expressions.
          (inspected-structure-elements object)))
 
 (defmethod inspected-parts ((object function))
-  (let* ((type (sb-kernel:get-type object))
-        (object (if (= type sb-vm:closure-header-type)
-                    (sb-kernel:%closure-function object)
+  (let* ((type (sb-kernel:widetag-of object))
+        (object (if (= type sb-vm:closure-header-widetag)
+                    (sb-kernel:%closure-fun object)
                     object)))
     (values (format nil "FUNCTION ~S.~@[~%Argument List: ~A~]." object
-                   (sb-kernel:%function-arglist object)
+                   (sb-kernel:%simple-fun-arglist object)
                    ;; Defined-from stuff used to be here. Someone took
                    ;; it out. FIXME: We should make it easy to get
                    ;; to DESCRIBE from the inspector.