Skip to content

Commit 81b04cf

Browse files
committed
Some more work on gf.c
1 parent 2caef76 commit 81b04cf

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/gf.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ static int invalidate_backedges(jl_typemap_entry_t *oldentry, struct typemap_int
14131413
jl_array_t *backedges = def.replaced->backedges;
14141414
if (backedges) {
14151415
size_t i, l = jl_array_len(backedges);
1416-
jl_method_instance_t **replaced = (jl_method_instance_t**)jl_array_data(backedges);
1416+
jl_method_instance_t **replaced = (jl_method_instance_t**)jl_array_ptr_data(backedges);
14171417
for (i = 0; i < l; i++) {
14181418
invalidate_method_instance(replaced[i], closure->max_world, 0);
14191419
}
@@ -1921,6 +1921,7 @@ JL_DLLEXPORT int jl_compile_hint(jl_tupletype_t *types)
19211921
{
19221922
size_t world = jl_world_counter;
19231923
jl_method_instance_t *li = jl_get_specialization1(types, world, 1);
1924+
JL_GC_PROMISE_ROOTED(li); // Rooted via types since mt_cache==1
19241925
if (li == NULL)
19251926
return 0;
19261927
if (jl_generating_output()) {

src/julia_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ jl_llvm_functions_t jl_compile_linfo(
332332
jl_callptr_t jl_compile_method_internal(jl_method_instance_t **pmeth, size_t world);
333333
JL_DLLEXPORT int jl_compile_hint(jl_tupletype_t *types);
334334
jl_code_info_t *jl_code_for_interpreter(jl_method_instance_t *lam);
335-
int jl_code_requires_compiler(jl_code_info_t *src);
335+
int jl_code_requires_compiler(jl_code_info_t *src) JL_NOTSAFEPOINT;
336336
jl_code_info_t *jl_new_code_info_from_ast(jl_expr_t *ast);
337337
JL_DLLEXPORT jl_code_info_t *jl_new_code_info_uninit(void);
338338

0 commit comments

Comments
 (0)