[Guile-commits] 12/13: More various JIT fixen

[Andy Wingo]

wingo pushed a commit to branch lightening
in repository guile.

commit 89de2cb286c2a237f4cc2aa0cbece29c28996cac
Author: Andy Wingo <address@hidden>
Date:   Thu Apr 4 12:10:13 2019 +0200

    More various JIT fixen
    
    * libguile/jit.c (prepare_jit_state): Remove unused function.
    (initialize_thread_jit_state): Since the lightening state is allocated
    using GC memory, trace the JIT state.
    (compute_mcode): Avoid double-compile.
---
 libguile/jit.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/libguile/jit.c b/libguile/jit.c
index a5fe6ee..231113b 100644
--- a/libguile/jit.c
+++ b/libguile/jit.c
@@ -1378,11 +1378,6 @@ allocate_code_arena (size_t size, struct code_arena 
*prev)
   return ret;
 }
 
-static void
-prepare_jit_state (scm_jit_state *j)
-{
-}
-
 static void *
 emit_code (scm_jit_state *j, void (*emit) (scm_jit_state *))
 {
@@ -4748,7 +4743,7 @@ initialize_thread_jit_state (scm_thread *thread)
 
   ASSERT (!thread->jit_state);
 
-  j = scm_gc_malloc_pointerless (sizeof (*j), "jit state");
+  j = scm_gc_malloc (sizeof (*j), "jit state");
   memset (j, 0, sizeof (*j));
   thread->jit_state = j;
   j->jit = jit_new_state (jit_alloc_fn, jit_free_fn);
@@ -4823,9 +4818,6 @@ compute_mcode (scm_thread *thread, uint32_t *entry_ip,
   INFO ("vcode: start=%p,+%zu entry=+%zu\n", j->start, j->end - j->start,
         j->entry - j->start);
 
-  prepare_jit_state (j);
-  compile (j);
-
   data->mcode = emit_code (j, compile);
   if (data->mcode)
     entry_mcode = j->labels[j->entry - j->start];