From 912ad07e93e0367650c9377b1b927723fa19a001 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 15 Jan 2023 11:04:12 +0000
Subject: [PATCH] Fix access8 test failure when using JIT code generator

---
 src/cgen.c          | 7 ++-----
 src/jit/jit-exits.c | 2 +-
 src/jit/jit-exits.h | 2 +-
 src/symbols.txt     | 5 -----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/cgen.c b/src/cgen.c
index ab8b0b13..c5e4b513 100644
--- a/src/cgen.c
+++ b/src/cgen.c
@@ -5658,8 +5658,7 @@ static void cgen_async_work(void *context, void *arg)
 
 static void cgen_partition_jobs(unit_list_t *units, workq_t *wq,
                                 const char *base_name, int units_per_job,
-                                tree_t top, cover_tagging_t *cover,
-                                obj_list_t *objs)
+                                tree_t top, obj_list_t *objs)
 {
    int counter = 0;
 
@@ -5680,7 +5679,6 @@ static void cgen_partition_jobs(unit_list_t *units, workq_t *wq,
       job->module_name = module_name;
       job->obj_path    = xstrdup(obj_path);
       job->index       = counter;
-      job->cover       = cover;
 
       for (unsigned j = i; j < units->count && j < i + units_per_job; j++)
          APUSH(job->units, units->items[j]);
@@ -5710,8 +5708,7 @@ void cgen(tree_t top, vcode_unit_t vcode, cover_tagging_t *cover)
    workq_t *wq = workq_new(jit);
 
    obj_list_t objs = AINIT;
-   cgen_partition_jobs(&units, wq, istr(name), UNITS_PER_JOB,
-                       top, cover, &objs);
+   cgen_partition_jobs(&units, wq, istr(name), UNITS_PER_JOB, top, &objs);
 
    workq_start(wq);
    workq_drain(wq);
diff --git a/src/jit/jit-exits.c b/src/jit/jit-exits.c
index b6b6b246..7d675355 100644
--- a/src/jit/jit-exits.c
+++ b/src/jit/jit-exits.c
@@ -493,7 +493,7 @@ void x_assert_fail(const uint8_t *msg, int32_t msg_len, int8_t severity,
       jit_abort(EXIT_FAILURE);
 }
 
-void *x_mspace_alloc(uint32_t size, uint32_t nelems)
+void *x_mspace_alloc(size_t size, uint32_t nelems)
 {
    uint32_t total;
    if (unlikely(__builtin_mul_overflow(nelems, size, &total))) {
diff --git a/src/jit/jit-exits.h b/src/jit/jit-exits.h
index ead965d6..ebbfe84b 100644
--- a/src/jit/jit-exits.h
+++ b/src/jit/jit-exits.h
@@ -92,7 +92,7 @@ void x_resolve_signal2(sig_shared_t *ss, jit_handle_t handle, void *context,
                        int32_t ileft, int32_t nlits, int32_t flags);
 void x_elab_order_fail(tree_t where);
 void x_unreachable(tree_t where);
-void *x_mspace_alloc(uint32_t size, uint32_t nelems);
+void *x_mspace_alloc(size_t size, uint32_t nelems);
 void x_cover_setup_toggle_cb(sig_shared_t *ss, int32_t *toggle_mask);
 
 #endif  // _JIT_EXITS_H
diff --git a/src/symbols.txt b/src/symbols.txt
index ed62efbe..6e6b7537 100644
--- a/src/symbols.txt
+++ b/src/symbols.txt
@@ -3,7 +3,6 @@
 #
 {
   # Exported from src/rt/standard.c
-  _std_hstring_bit_vec;
   _std_standard_now;
   _std_to_hstring_bit_vec;
   _std_to_ostring_bit_vec;
@@ -61,11 +60,8 @@
   __nvc_resolve_signal;
   __nvc_setup_toggle_cb;
   __nvc_tlab;
-  __nvc_trampoline;
   __nvc_unreachable;
-  _assert_fail;
   _canon_value;
-  _convert_signal;
   _debug_dump;
   _debug_out;
   _disconnect;
@@ -81,7 +77,6 @@
   _int_to_string;
   _last_active;
   _last_event;
-  _link_signal;
   _real_to_string;
   _sched_event;
   _sched_process;
-- 
2.39.2