summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorAlan Wu <XrXr@users.noreply.github.com>2022-11-17 17:33:18 -0500
committerAlan Wu <XrXr@users.noreply.github.com>2022-11-25 16:21:40 -0500
commit790cf4b6d0475614afb127b416e87cfa39044d67 (patch)
treed04089ae209b4c3b27b6ab68097a6065d3583520 /vm.c
parente15cd01149afe4924460f81cb6e27dd96de06657 (diff)
downloadruby-790cf4b6d0475614afb127b416e87cfa39044d67.tar.gz
Fix autoload status of statically linked extensions
Previously, for statically-linked extensions, we used `vm->loading_table` to delay calling the init function until the extensions are required. This caused the extensions to look like they are in the middle of being loaded even before they're required. (`rb_feature_p()` returned true with a loading path output.) Combined with autoload, queries like `defined?(CONST)` and `Module#autoload?` were confused by this and returned nil incorrectly. RubyGems uses `defined?` to detect if OpenSSL is available and failed when OpenSSL was available in builds using `--with-static-linked-ext`. Use a dedicated table for the init functions instead of adding them to the loading table. This lets us remove some logic from non-EXTSTATIC builds. [Bug #19115]
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/vm.c b/vm.c
index 7de6322877..244ec44382 100644
--- a/vm.c
+++ b/vm.c
@@ -4005,6 +4005,9 @@ Init_vm_objects(void)
vm->mark_object_ary = rb_ary_hidden_new(128);
vm->loading_table = st_init_strtable();
vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 10000);
+#if EXTSTATIC
+ vm->static_ext_inits = st_init_strtable();
+#endif
#ifdef HAVE_MMAP
vm->shape_list = (rb_shape_t *)mmap(NULL, rb_size_mul_or_raise(SHAPE_BITMAP_SIZE * 32, sizeof(rb_shape_t), rb_eRuntimeError),