0.pre7.86.flaky7.21:

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

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index e02b8fb..18e5ae3 100644 (file)
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -118,11 +118,6 @@
         :datum object
         :expected-type 'fixnum))
 
-(deferr object-not-function-or-symbol-error (object)
-  (error 'type-error
-        :datum object
-        :expected-type '(or function symbol)))
-
 (deferr object-not-vector-error (object)
   (error 'type-error
         :datum object
@@ -404,8 +399,8 @@
       (handler-case
          (let* ((*finding-name* t)
                 (frame (sb!di:frame-down (sb!di:frame-down (sb!di:top-frame))))
-                (name (sb!di:debug-function-name
-                       (sb!di:frame-debug-function frame))))
+                (name (sb!di:debug-fun-name
+                       (sb!di:frame-debug-fun frame))))
            (sb!di:flush-frames-above frame)
            (values name frame))
        (error ()
@@ -430,8 +425,8 @@
                         (sb!di::compiled-frame-escaped frame))
                (sb!di:flush-frames-above frame)
                (/show0 "returning from within DO loop")
-               (return (values (sb!di:debug-function-name
-                                (sb!di:frame-debug-function frame))
+               (return (values (sb!di:debug-fun-name
+                                (sb!di:frame-debug-fun frame))
                                frame)))))
        (error ()
          (/show0 "trapped ERROR")
@@ -443,6 +438,8 @@
 \f
 ;;;; INTERNAL-ERROR signal handler
 
+(defvar *internal-error-arguments*)
+
 (defun internal-error (context continuable)
   (declare (type system-area-pointer context))
   (declare (ignore continuable))
@@ -458,8 +455,9 @@
         (sb!vm:internal-error-arguments alien-context)
        (/show0 "back from INTERNAL-ERROR-ARGUMENTS, ERROR-NUMBER=..")
        (/hexstr error-number)
-       (/show0 "ARGUMENTS=..")
+       (/show0 "cold/low ARGUMENTS=..")
        (/hexstr arguments)
+
        (multiple-value-bind (name sb!debug:*stack-top-hint*)
           (find-interrupted-name)
         (/show0 "back from FIND-INTERRUPTED-NAME")