mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run .so init functions in namespaces to be loaded

Browse Source
This commit is contained in:
Satoshi Tagomori 2025-10-31 20:06:33 +09:00 committed by Satoshi Tagomori
parent ba74fcd6e1
commit 961683bcb1
Notes: git 2025-10-31 13:42:50 +00:00 
Merged: https://github.com/ruby/ruby/pull/15014
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
load.c
View File

@ -1212,17 +1212,19 @@ load_ext(VALUE path, VALUE fname)
return (VALUE)dln_load_feature(RSTRING_PTR(loaded), RSTRING_PTR(fname));
}
static bool
run_static_ext_init(rb_vm_t *vm, const char *feature)
static VALUE
run_static_ext_init(VALUE vm_ptr, VALUE feature_value)
{
rb_vm_t *vm = (rb_vm_t *)vm_ptr;
const char *feature = RSTRING_PTR(feature_value);
st_data_t key = (st_data_t)feature;
st_data_t init_func;
if (vm->static_ext_inits && st_delete(vm->static_ext_inits, &key, &init_func)) {
((void (*)(void))init_func)();
return true;
return Qtrue;
}
return false;
return Qfalse;
}
static int
@ -1331,7 +1333,7 @@ require_internal(rb_execution_context_t *ec, VALUE fname, int exception, bool wa
else if (!*ftptr) {
result = TAG_RETURN;
}
else if (found == 's' && run_static_ext_init(th->vm, RSTRING_PTR(path))) {
else if (found == 's' && RTEST(rb_vm_call_cfunc_in_namespace(Qnil, run_static_ext_init, (VALUE)th->vm, path, path, ns))) {
result = TAG_RETURN;
}
else if (RTEST(rb_hash_aref(realpaths,