diff --git a/racket/src/racket/src/jit.c b/racket/src/racket/src/jit.c
index 8de10f6bfc..fcfdc2ef3f 100644
--- a/racket/src/racket/src/jit.c
+++ b/racket/src/racket/src/jit.c
@@ -3885,17 +3885,26 @@ typedef struct {
   int num_params;
   int has_rest;
   int is_method;
+  int gcable;
 } Generate_Arity_Check_Data;
 
 static int do_generate_lambda_simple_arity_check(mz_jit_state *jitter, void *_data)
 {
   Generate_Arity_Check_Data *data = (Generate_Arity_Check_Data *)_data;
+  void *code;
+  int r;
   
 #ifdef MZ_USE_JIT_PPC
   jitter->js.jitl.nbArgs = 2; /* matches check_arity_code prolog */
 #endif
 
-  return generate_simple_arity_check(jitter, data->num_params, data->has_rest, data->is_method);
+  code = jit_get_ip();
+
+  r = generate_simple_arity_check(jitter, data->num_params, data->has_rest, data->is_method);
+
+  scheme_jit_register_helper_func(jitter, code, data->gcable);
+
+  return r;
 }
 
 static void *generate_lambda_simple_arity_check(int num_params, int has_rest, int is_method, int permanent)
@@ -3905,6 +3914,7 @@ static void *generate_lambda_simple_arity_check(int num_params, int has_rest, in
   data.num_params = num_params;
   data.has_rest = has_rest;
   data.is_method = is_method;
+  data.gcable = !permanent;
 
   return scheme_generate_one(NULL, do_generate_lambda_simple_arity_check, &data, !permanent, NULL, NULL);
 }
@@ -3996,6 +4006,8 @@ static int do_generate_case_lambda_dispatch(mz_jit_state *jitter, void *_data)
       data->ndata->retain_code = jit_unadjust_ip(start_code);
 #endif
 
+      scheme_jit_register_helper_func(jitter, start_code, 1);
+
       return 1;
     }
   }
diff --git a/racket/src/racket/src/jit.h b/racket/src/racket/src/jit.h
index 02977cb1ad..762360933e 100644
--- a/racket/src/racket/src/jit.h
+++ b/racket/src/racket/src/jit.h
@@ -1463,7 +1463,7 @@ int scheme_generate_finish_apply(mz_jit_state *jitter);
 int scheme_generate_finish_multi_apply(mz_jit_state *jitter);
 int scheme_generate_finish_tail_apply(mz_jit_state *jitter);
 void scheme_jit_register_sub_func(mz_jit_state *jitter, void *code, Scheme_Object *protocol);
-void scheme_jit_register_helper_func(mz_jit_state *jitter, void *code);
+void scheme_jit_register_helper_func(mz_jit_state *jitter, void *code, int gcable);
 #ifdef MZ_USE_FUTURES
 Scheme_Object *scheme_noncm_prim_indirect(Scheme_Prim proc, int argc);
 Scheme_Object *scheme_prim_indirect(Scheme_Primitive_Closure_Proc proc, int argc, Scheme_Object *self);
diff --git a/racket/src/racket/src/jitcall.c b/racket/src/racket/src/jitcall.c
index 1fe5a8839c..141e22e020 100644
--- a/racket/src/racket/src/jitcall.c
+++ b/racket/src/racket/src/jitcall.c
@@ -1309,7 +1309,7 @@ typedef struct {
   int direct_prim, direct_native, nontail_self, unboxed_args;
 } Generate_Call_Data;
 
-void scheme_jit_register_sub_func(mz_jit_state *jitter, void *code, Scheme_Object *protocol)
+static void jit_register_sub_func(mz_jit_state *jitter, void *code, Scheme_Object *protocol, int gcable)
 /* protocol: #f => normal lightweight call protocol
              void => next return address is in LOCAL2
              eof => name to use is in LOCAL2 */
@@ -1320,15 +1320,21 @@ void scheme_jit_register_sub_func(mz_jit_state *jitter, void *code, Scheme_Objec
   if (jitter->retain_start)
     scheme_jit_add_symbol((uintptr_t)jit_unadjust_ip(code),
                           (uintptr_t)jit_unadjust_ip(code_end) - 1,
-                          protocol, 0);
+                          protocol,
+                          gcable);
 }
 
-void scheme_jit_register_helper_func(mz_jit_state *jitter, void *code)
+void scheme_jit_register_sub_func(mz_jit_state *jitter, void *code, Scheme_Object *protocol)
+{
+  return jit_register_sub_func(jitter, code, protocol, 0);
+}
+
+void scheme_jit_register_helper_func(mz_jit_state *jitter, void *code, int gcable)
 {
 #if defined(MZ_USE_DWARF_LIBUNWIND) || defined(_WIN64)
   /* Null indicates that there's no function name to report, but the
      stack should be unwound manually using the JJIT-generated convention. */
-  scheme_jit_register_sub_func(jitter, code, scheme_null);
+  jit_register_sub_func(jitter, code, scheme_null, gcable);
 #endif  
 }
 
@@ -1352,7 +1358,7 @@ static int do_generate_shared_call(mz_jit_state *jitter, void *_data)
       ok = scheme_generate_tail_call(jitter, data->num_rands, data->direct_native, 1, 0, 
                                      NULL, NULL);
 
-    scheme_jit_register_helper_func(jitter, code);
+    scheme_jit_register_helper_func(jitter, code, 0);
 
     return ok;
   } else {
diff --git a/racket/src/racket/src/jitcommon.c b/racket/src/racket/src/jitcommon.c
index 58278d05ab..6fdca91c20 100644
--- a/racket/src/racket/src/jitcommon.c
+++ b/racket/src/racket/src/jitcommon.c
@@ -790,7 +790,7 @@ static int common2(mz_jit_state *jitter, void *_data)
   mz_pop_locals();
   jit_ret();
   CHECK_LIMIT();
-  scheme_jit_register_helper_func(jitter, scheme_on_demand_jit_code);
+  scheme_jit_register_helper_func(jitter, scheme_on_demand_jit_code, 0);
 
   /* Used for the state of a function that is being JITted 
      (for a kind of cycle detection) without breaking concurrent 
@@ -819,11 +819,11 @@ static int common2(mz_jit_state *jitter, void *_data)
   sjc.finish_tail_call_code = jit_get_ip();
   scheme_generate_finish_tail_call(jitter, 0);
   CHECK_LIMIT();
-  scheme_jit_register_helper_func(jitter, sjc.finish_tail_call_code);
+  scheme_jit_register_helper_func(jitter, sjc.finish_tail_call_code, 0);
   sjc.finish_tail_call_fixup_code = jit_get_ip();
   scheme_generate_finish_tail_call(jitter, 2);
   CHECK_LIMIT();
-  scheme_jit_register_helper_func(jitter, sjc.finish_tail_call_fixup_code);
+  scheme_jit_register_helper_func(jitter, sjc.finish_tail_call_fixup_code, 0);
 
   /* *** get_stack_pointer_code *** */
   sjc.get_stack_pointer_code = jit_get_ip();