; Fix a possible bug with JIT-compiled functions in the call stack

* src/bytecode-jit.c (jit_byte_code__, jit_exec): Insert entry into
`byte_stack_list' from `jit_exec' instead of `jit_byte_code__'.  It seems like
this would be needed for proper stack unwinding in `unwind_to_catch'.
* src/bytecode.c (relocate_byte_stack) [HAVE_LIBJIT]: Skip entries in
`byte_stack_list' with no associated bytecode stack.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index 6567039765d..26860daec10 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -66,6 +66,10 @@ relocate_byte_stack (struct byte_stack *stack)
 {
   for (; stack; stack = stack->next)
     {
+#ifdef HAVE_LIBJIT
+      if (!stack->byte_string_start)
+        continue;
+#endif
       if (stack->byte_string_start != SDATA (stack->byte_string))
         {
           ptrdiff_t offset = stack->pc - stack->byte_string_start;