X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=8fb4657fe01d0db730fc89f107a5e9170abb85f9;hb=da8cb4801a3ab35070f380e22aea3d260f9df8aa;hp=8fb704a943e7cf24a9f3b6e6d9a6e6262aec81d5;hpb=a7409fa0a69f733ea2460a1aeddbe04b5c4c0888;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 8fb704a..8fb4657 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -421,6 +421,14 @@
        (multiple-value-bind (name sb!debug:*stack-top-hint*)
            (find-interrupted-name-and-frame)
          (/show0 "back from FIND-INTERRUPTED-NAME")
+         ;; Unblock trap signal here, we unwound the stack and can't return.
+         ;; FIXME: Should we not reset the _entire_ mask, but just
+         ;; restore it to the state before we got the condition?
+         ;; FIXME 2: Signals are currently unblocked in
+         ;; interrupt.c:internal_error before we do stack unwinding, can this
+         ;; introduce a race condition?
+         #!+(and linux mips)
+         (sb!unix::reset-signal-mask)
          (let ((fp (int-sap (sb!vm:context-register alien-context
                                                     sb!vm::cfp-offset)))
                (handler (and (< -1 error-number (length *internal-errors*))
@@ -485,7 +493,7 @@
 
 ;;; This is SIGTRAP / EXCEPTION_BREAKPOINT that runtime could not deal
 ;;; with. Prior to Windows we just had a Lisp side handler for
-;;; SIGTRAP, but now we need to deal this portably.
+;;; SIGTRAP, but now we need to deal with this portably.
 (defun unhandled-trap-error (context-sap)
   (declare (type system-area-pointer context-sap))
   (infinite-error-protect