[Guile-commits] 01/01: Fix emergency aborts to not expand the stack

[Andy Wingo]

wingo pushed a commit to branch lightning
in repository guile.

commit 883bdc74530f1e602488f69f68cb8aa31199f951
Author: Andy Wingo <address@hidden>
Date:   Sat Sep 15 10:41:35 2018 +0200

    Fix emergency aborts to not expand the stack
    
    * libguile/vm.c (scm_i_vm_emergency_abort): New helper: an abort that
      doesn't allocate, not even stack.
    * libguile/throw.c (abort_to_prompt): Use scm_i_vm_emergency_abort.
    * libguile/vm.h: Declare helper.
---
 libguile/throw.c |  8 ++-----
 libguile/vm.c    | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 libguile/vm.h    |  1 +
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/libguile/throw.c b/libguile/throw.c
index e0149df..2fd25fc 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -198,12 +198,8 @@ abort_to_prompt (SCM prompt_tag, SCM tag, SCM args)
   for (i = 2; i < n; i++, args = scm_cdr (args))
     tag_and_argv[i] = scm_car (args);
 
-  scm_i_vm_abort (tag_and_argv, n);
-
-  /* Oh, what, you're still here? The abort must have been reinstated. 
Actually,
-     that's quite impossible, given that we're already in C-land here, so...
-     abort! */
-
+  scm_i_vm_emergency_abort (tag_and_argv, n);
+  /* Unreachable.  */
   abort ();
 }
 
diff --git a/libguile/vm.c b/libguile/vm.c
index a8ebabb..10db757 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1339,6 +1339,76 @@ scm_i_vm_abort (SCM *tag_and_argv, size_t n)
   abort ();
 }
 
+/* The same as scm_i_vm_abort(), but possibly called in response to
+   resource allocation failures, so we might not be able to make a
+   call, as that might require stack expansion.  Grrr.  */
+void
+scm_i_vm_emergency_abort (SCM *tag_and_argv, size_t n)
+{
+  scm_thread *thread = SCM_I_CURRENT_THREAD;
+  struct scm_vm *vp = &thread->vm;
+  scm_t_dynstack *dynstack = &thread->dynstack;
+  SCM tag, cont;
+  size_t nargs;
+  scm_t_bits *prompt;
+  scm_t_dynstack_prompt_flags flags;
+  ptrdiff_t fp_offset, sp_offset;
+  union scm_vm_stack_element *fp, *sp;
+  SCM *argv;
+  uint32_t *vra;
+  uint8_t *mra;
+  jmp_buf *registers;
+
+  tag = tag_and_argv[0];
+  argv = tag_and_argv + 1;
+  nargs = n - 1;
+
+  prompt = scm_dynstack_find_prompt (dynstack, tag,
+                                     &flags, &fp_offset, &sp_offset,
+                                     &vra, &mra, &registers);
+
+  if (!prompt)
+    {
+      fprintf (stderr, "guile: fatal: emergency abort to unknown prompt\n");
+      abort ();
+    }
+
+  fp = vp->stack_top - fp_offset;
+  sp = vp->stack_top - sp_offset;
+
+  if (!(flags & SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY))
+    {
+      fprintf (stderr, "guile: fatal: emergency abort to non-linear prompt\n");
+      abort ();
+    }
+
+  cont = SCM_BOOL_F;
+
+  /* Unwind.  */
+  scm_dynstack_unwind (dynstack, prompt);
+
+  /* Continuation gets nargs+1 values: the one more is for the cont.  */
+  sp = sp - nargs - 1;
+
+  /* Shuffle abort arguments down to the prompt continuation.  We have
+     to be jumping to an older part of the stack.  */
+  if (sp < vp->sp)
+    abort ();
+  sp[nargs].as_scm = cont;
+
+  while (nargs--)
+    sp[nargs].as_scm = *argv++;
+
+  /* Restore VM regs */
+  vp->fp = fp;
+  vp->sp = sp;
+  vp->ip = vra;
+
+  /* Jump! */
+  vp->mra_after_abort = mra;
+  longjmp (*registers, 1);
+}
+
 static uint8_t *
 abort_to_prompt (scm_thread *thread, uint8_t *saved_mra)
 {
diff --git a/libguile/vm.h b/libguile/vm.h
index 5f1c638..d227f26 100644
--- a/libguile/vm.h
+++ b/libguile/vm.h
@@ -123,6 +123,7 @@ SCM_API SCM scm_load_compiled_with_vm (SCM file);
 SCM_INTERNAL SCM scm_i_call_with_current_continuation (SCM proc);
 SCM_INTERNAL SCM scm_i_capture_current_stack (void);
 SCM_INTERNAL void scm_i_vm_abort (SCM *tag_and_argv, size_t n) SCM_NORETURN;
+SCM_INTERNAL void scm_i_vm_emergency_abort (SCM *tag_and_argv, size_t n) 
SCM_NORETURN;
 SCM_INTERNAL int scm_i_vm_cont_to_frame (SCM cont, struct scm_frame *frame);
 SCM_INTERNAL void scm_i_vm_cont_print (SCM x, SCM port,
                                        scm_print_state *pstate);