Some more work on gf.c

Keno · Keno · commit 81b04cf170b2 · 2018-08-21T12:26:02.000-04:00
diff --git a/src/gf.c b/src/gf.c
@@ -1413,7 +1413,7 @@ static int invalidate_backedges(jl_typemap_entry_t *oldentry, struct typemap_int
         jl_array_t *backedges = def.replaced->backedges;
         if (backedges) {
             size_t i, l = jl_array_len(backedges);
-            jl_method_instance_t **replaced = (jl_method_instance_t**)jl_array_data(backedges);
+            jl_method_instance_t **replaced = (jl_method_instance_t**)jl_array_ptr_data(backedges);
             for (i = 0; i < l; i++) {
                 invalidate_method_instance(replaced[i], closure->max_world, 0);
             }
@@ -1921,6 +1921,7 @@ JL_DLLEXPORT int jl_compile_hint(jl_tupletype_t *types)
 {
     size_t world = jl_world_counter;
     jl_method_instance_t *li = jl_get_specialization1(types, world, 1);
+    JL_GC_PROMISE_ROOTED(li); // Rooted via types since mt_cache==1
     if (li == NULL)
         return 0;
     if (jl_generating_output()) {
diff --git a/src/julia_internal.h b/src/julia_internal.h
@@ -332,7 +332,7 @@ jl_llvm_functions_t jl_compile_linfo(
 jl_callptr_t jl_compile_method_internal(jl_method_instance_t **pmeth, size_t world);
 JL_DLLEXPORT int jl_compile_hint(jl_tupletype_t *types);
 jl_code_info_t *jl_code_for_interpreter(jl_method_instance_t *lam);
-int jl_code_requires_compiler(jl_code_info_t *src);
+int jl_code_requires_compiler(jl_code_info_t *src) JL_NOTSAFEPOINT;
 jl_code_info_t *jl_new_code_info_from_ast(jl_expr_t *ast);
 JL_DLLEXPORT jl_code_info_t *jl_new_code_info_uninit(void);
 
