From: Juho Snellman <jsnell@iki.fi>
Date: Tue, 19 Sep 2006 21:35:33 +0000 (+0000)
Subject: 0.9.16.39:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=57fed64f9b9aa96adb66dbe1241d37bd773f638d;p=sbcl.git

0.9.16.39:
        Oops, unblock interrupts while handling a single-stepper trap. Fixes
        GC deadlocks while using the stepper in Slime on a threaded
        SBCL.
---

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 9b7b318..5bbc108 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -189,12 +189,22 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
 void
 handle_single_step_trap (os_context_t *context, int kind, int register_offset)
 {
+    lispobj context_sap;
+
+    /* Allocate the SAP object while the interrupts are still
+     * disabled. */
+    context_sap = alloc_sap(context);
+
     fake_foreign_function_call(context);
 
+#ifndef LISP_FEATURE_WIN32
+    thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
+
     funcall3(SymbolFunction(HANDLE_SINGLE_STEP_TRAP),
-             alloc_sap(context),
+             context_sap,
              make_fixnum(kind),
              make_fixnum(register_offset));
 
-    undo_fake_foreign_function_call(context);
+    undo_fake_foreign_function_call(context); /* blocks signals again */
 }
diff --git a/version.lisp-expr b/version.lisp-expr
index c439599..63f1aa5 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.16.38"
+"0.9.16.39"