Skip to content

Commit

Permalink
Merge pull request JuliaLang#39664 from JuliaLang/tb/return_method
Browse files Browse the repository at this point in the history
libjulia: return newly-defined method.
  • Loading branch information
maleadt committed Feb 16, 2021
2 parents ef14131 + 27ce2b3 commit c48ae61
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/julia.h
Original file line number Diff line number Diff line change
Expand Up @@ -1373,7 +1373,7 @@ JL_DLLEXPORT jl_value_t *jl_generic_function_def(jl_sym_t *name,
jl_module_t *module,
jl_value_t **bp, jl_value_t *bp_owner,
jl_binding_t *bnd);
JL_DLLEXPORT void jl_method_def(jl_svec_t *argdata, jl_code_info_t *f, jl_module_t *module);
JL_DLLEXPORT jl_method_t* jl_method_def(jl_svec_t *argdata, jl_code_info_t *f, jl_module_t *module);
JL_DLLEXPORT jl_code_info_t *jl_code_for_staged(jl_method_instance_t *linfo);
JL_DLLEXPORT jl_code_info_t *jl_copy_code_info(jl_code_info_t *src);
JL_DLLEXPORT size_t jl_get_world_counter(void) JL_NOTSAFEPOINT;
Expand Down
8 changes: 5 additions & 3 deletions src/method.c
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,9 @@ JL_DLLEXPORT jl_methtable_t *jl_argument_method_table(jl_value_t *argt JL_PROPAG

jl_array_t *jl_all_methods JL_GLOBALLY_ROOTED;

JL_DLLEXPORT void jl_method_def(jl_svec_t *argdata,
jl_code_info_t *f,
jl_module_t *module)
JL_DLLEXPORT jl_method_t* jl_method_def(jl_svec_t *argdata,
jl_code_info_t *f,
jl_module_t *module)
{
// argdata is svec(svec(types...), svec(typevars...), functionloc)
jl_svec_t *atypes = (jl_svec_t*)jl_svecref(argdata, 0);
Expand Down Expand Up @@ -881,6 +881,8 @@ JL_DLLEXPORT void jl_method_def(jl_svec_t *argdata,
if (jl_newmeth_tracer)
jl_call_tracer(jl_newmeth_tracer, (jl_value_t*)m);
JL_GC_POP();

return m;
}

#ifdef __cplusplus
Expand Down

0 comments on commit c48ae61

Please sign in to comment.